diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ac0850b6..081db5d4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -112,11 +112,10 @@ Here are some guidelines to help you and everyone else. GITHUB_TOKEN= pnpm release:changelog ``` -1. The workspace root's version (e.g. `0.1.3`) is more of an identifier than a (semantic) version. We will use it to name the tag that will be published. - - In the root `package.json`, update the version following the "highest-version" formula: + The `release:changelog` script also updated the workspace root's version (by following the highest version formula). We will use it to name the tag that will be published. ``` + # Highest version formula workspace root version = max( max(all package versions), workspace root version + 0.0.1, diff --git a/package.json b/package.json index f5386cd2..8b30b582 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "lint": "pnpm --filter '*' lint", "lint:fix": "pnpm --filter '*' lint:fix", "prepare": "pnpm --filter './packages/**' --filter my-v2-addon build", - "release:changelog": "changeset version", + "release:changelog": "changeset version; update-workspace-root-version", "release:publish": "pnpm build && changeset publish", "start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", "start:embroider-css-modules": "pnpm --filter embroider-css-modules start", @@ -29,7 +29,8 @@ "devDependencies": { "@changesets/cli": "^2.27.7", "@changesets/get-github-info": "^0.6.0", - "concurrently": "^8.2.2" + "concurrently": "^8.2.2", + "update-workspace-root-version": "^0.3.0" }, "packageManager": "pnpm@9.7.0", "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3f538591..b9e715f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,6 +20,9 @@ importers: concurrently: specifier: ^8.2.2 version: 8.2.2 + update-workspace-root-version: + specifier: ^0.3.0 + version: 0.3.0 configs/ember-template-lint: dependencies: @@ -8466,6 +8469,11 @@ packages: peerDependencies: browserslist: '>= 4.21.0' + update-workspace-root-version@0.3.0: + resolution: {integrity: sha512-cfeT8Oo7bU11UCPxq8dEV+yUlPjdHmDeEc8iSsqhiiVoe1nGLaLwLtAR6cmjLJ6urZakYqdXx/beSXYZYlRiZg==} + engines: {node: 18.* || >= 20} + hasBin: true + uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} @@ -11455,27 +11463,6 @@ snapshots: '@types/css-tree@2.3.8': {} - '@types/ember@4.0.11': - dependencies: - '@types/ember__application': 4.0.11(@babel/core@7.25.2) - '@types/ember__array': 4.0.10(@babel/core@7.25.2) - '@types/ember__component': 4.0.22(@babel/core@7.25.2) - '@types/ember__controller': 4.0.12(@babel/core@7.25.2) - '@types/ember__debug': 4.0.8(@babel/core@7.25.2) - '@types/ember__engine': 4.0.11(@babel/core@7.25.2) - '@types/ember__error': 4.0.6 - '@types/ember__object': 4.0.12(@babel/core@7.25.2) - '@types/ember__polyfills': 4.0.6 - '@types/ember__routing': 4.0.22(@babel/core@7.25.2) - '@types/ember__runloop': 4.0.10 - '@types/ember__service': 4.0.9(@babel/core@7.25.2) - '@types/ember__string': 3.0.15 - '@types/ember__template': 4.0.7 - '@types/ember__test': 4.0.6(@babel/core@7.25.2) - '@types/ember__utils': 4.0.7(@babel/core@7.25.2) - '@types/rsvp': 4.0.9 - optional: true - '@types/ember@4.0.11(@babel/core@7.25.2)': dependencies: '@types/ember__application': 4.0.11(@babel/core@7.25.2) @@ -11503,7 +11490,7 @@ snapshots: '@types/ember__application@4.0.11(@babel/core@7.25.2)': dependencies: '@glimmer/component': 1.1.2(@babel/core@7.25.2) - '@types/ember': 4.0.11 + '@types/ember': 4.0.11(@babel/core@7.25.2) '@types/ember__engine': 4.0.11(@babel/core@7.25.2) '@types/ember__object': 4.0.12(@babel/core@7.25.2) '@types/ember__owner': 4.0.9 @@ -11586,11 +11573,6 @@ snapshots: - supports-color optional: true - '@types/ember__runloop@4.0.10': - dependencies: - '@types/ember': 4.0.11 - optional: true - '@types/ember__runloop@4.0.10(@babel/core@7.25.2)': dependencies: '@types/ember': 4.0.11(@babel/core@7.25.2) @@ -18685,6 +18667,12 @@ snapshots: escalade: 3.1.2 picocolors: 1.0.1 + update-workspace-root-version@0.3.0: + dependencies: + '@codemod-utils/files': 2.0.4 + '@codemod-utils/json': 1.1.9 + yargs: 17.7.2 + uri-js@4.4.1: dependencies: punycode: 2.3.1