Skip to content

fix: Fix problems with recent releases. #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thet merged 1 commit into from
Sep 5, 2026
Merged

fix: Fix problems with recent releases. #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .release-it.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const path = require("path");

const commits_template = fs
.readFileSync(
path.resolve(__dirname, "release-it", "conventional-changelog-commit.hbs")
path.resolve(__dirname, "release-it", "conventional-changelog-commit.hbs"),
)
.toString();

Expand Down Expand Up @@ -56,6 +56,6 @@ module.exports = {
// the new version number comment in the entry scripts.
// Use the make target which does a check to not build if the package
// is this `@patternslib/dev` package.
"after:bump": "make bundle; make release-zip",
"after:bump": "make bundle && make release-zip",
},
};
28 changes: 15 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ PACKAGE_NAME := $(shell node -p "require('./package.json').name")
BUNDLE_NAME := $(subst @patternslib/,,$(subst @plone/,,$(PACKAGE_NAME)))


.PHONY: install
yarn.lock install: .git/hooks/commit-msg
$(YARN) install

Expand All @@ -29,7 +30,7 @@ yarn.lock install: .git/hooks/commit-msg
chmod u+x .git/hooks/commit-msg


.PHONY: clean
.PHONY: clean-dist
clean-dist:
rm -Rf dist/

Expand Down Expand Up @@ -84,7 +85,7 @@ ifeq ($(BUILDABLE),true)
$(eval PACKAGE_VERSION := $(shell node -p "require('./package.json').version"))
@echo Creating $(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION).zip
mkdir -p $(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION)
-cp -R dist/* $(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION)
cp -R dist/. $(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION)
zip -r $(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION).zip $(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION)/
rm -Rf $(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION)
endif
Expand All @@ -98,7 +99,7 @@ ifeq ($(LEVEL),$(filter $(LEVEL), alpha beta))

@# Changelog for the GitHub release when doing prereleases:
@# Include all the changes since the previous pre- or regular release.
$(eval RELEASE_IT_GITHUB_OPTIONS += "")
$(eval RELEASE_IT_GITHUB_OPTIONS :=)

@# Set level argument for release-it.
$(eval RELEASE_IT_LEVEL := "--preRelease=$(LEVEL)")
Expand All @@ -109,27 +110,28 @@ else
@# Include all changes since the previous regular release, also including
@# changes from pre-releases.
@# See: https://github.com/release-it/release-it/blob/master/docs/pre-releases.md
$(eval RELEASE_IT_GITHUB_OPTIONS += "--git.tagExclude='*[-]*' \\")
$(eval RELEASE_IT_GITHUB_OPTIONS := --git.tagExclude='*[-]*')

@# Set level argument for release-it.
$(eval RELEASE_IT_LEVEL := $(LEVEL))
endif


# Note release-zip is run via the `after:bump` hook from .release-it.js, so
# that the build contains the correct version bump.
.PHONY: release
release: clean install check prepare-release
@# Note: If you want to include the compiled bundle in your npm package you
@# have to allow it in a .npmignore file.
@# Note: The consuming package must include dist/ in its package.json files list.

$(eval PACKAGE_VERSION := $(shell npx release-it $(RELEASE_IT_LEVEL) --release-version))
ifeq ($(BUILDABLE),true)
$(eval RELEASE_IT_GITHUB_OPTIONS += "--github.assets=$(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION).zip \\")
$(eval RELEASE_IT_GITHUB_OPTIONS += --github.assets=$(BUNDLE_NAME)-bundle-$(PACKAGE_VERSION).zip)
endif

npx release-it \
$(RELEASE_IT_LEVEL) \
--github.release \
--github.update \
--no-github.update \
--no-github.draft \
$(RELEASE_IT_GITHUB_OPTIONS)

Expand All @@ -140,25 +142,25 @@ endif

.PHONY: release-major
release-major:
make LEVEL=major release
$(MAKE) LEVEL=major release


.PHONY: release-minor
release-minor:
make LEVEL=minor release
$(MAKE) LEVEL=minor release


.PHONY: release-patch
release-patch:
make LEVEL=patch release
$(MAKE) LEVEL=patch release

.PHONY: prerelease-alpha
prerelease-alpha:
make LEVEL=alpha release
$(MAKE) LEVEL=alpha release

.PHONY: prerelease-beta
prerelease-beta:
make LEVEL=beta release
$(MAKE) LEVEL=beta release


.PHONY: serve
Expand Down
Loading