From 92befc4e7cff8780345d589407cf5636b656ce54 Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Fri, 16 Dec 2022 16:58:02 -0700 Subject: [PATCH] Fix release-it config - Move the deps to the root of the repo. - Switch to the new plugin system. - Add the workspaces plugin. - Configure each package appropriately. --- addon/package.json | 15 -- package-lock.json | 386 +++++++++++++++++++++++++++--------------- package.json | 31 +++- test-app/package.json | 8 +- 4 files changed, 285 insertions(+), 155 deletions(-) diff --git a/addon/package.json b/addon/package.json index 29e8d9c7..394ba2b6 100644 --- a/addon/package.json +++ b/addon/package.json @@ -43,21 +43,6 @@ "ember": { "edition": "octane" }, - "release-it": { - "plugins": { - "release-it-lerna-changelog": { - "infile": "CHANGELOG.md", - "launchEditor": true - } - }, - "git": { - "tagName": "v${version}" - }, - "github": { - "release": true, - "tokenRef": "GITHUB_AUTH" - } - }, "volta": { "extends": "../package.json" } diff --git a/package-lock.json b/package-lock.json index 4da866c8..01d86af9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,8 @@ "test-app" ], "devDependencies": { + "@release-it-plugins/lerna-changelog": "5.0.0", + "@release-it-plugins/workspaces": "^3.2.0", "ember-template-lint": "^5.2.0", "eslint": "^7.32.0", "eslint-plugin-ember": "^11.2.1", @@ -16,7 +18,8 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-qunit": "^7.3.0", "npm-run-all": "^4.1.5", - "prettier": "^2.8.1" + "prettier": "^2.8.1", + "release-it": "^15.5.1" } }, "addon": { @@ -2881,6 +2884,139 @@ "node": ">=12" } }, + "node_modules/@release-it-plugins/lerna-changelog": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@release-it-plugins/lerna-changelog/-/lerna-changelog-5.0.0.tgz", + "integrity": "sha512-nMhAUptKSfIsiY0c//HuBcd2VT7D/IoxAQNwRgPx+jf3FM7HA5KD4KSl3oLoz4uA4GjvypWQP4ODX8UbWjmUZA==", + "dev": true, + "dependencies": { + "execa": "^5.1.1", + "lerna-changelog": "^2.2.0", + "lodash.template": "^4.5.0", + "mdast-util-from-markdown": "^1.2.0", + "tmp": "^0.2.1", + "validate-peer-dependencies": "^2.0.0", + "which": "^2.0.2" + }, + "engines": { + "node": "^14.13.1 || >= 16" + }, + "peerDependencies": { + "release-it": "^14.0.0 || ^15.1.3" + } + }, + "node_modules/@release-it-plugins/lerna-changelog/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@release-it-plugins/lerna-changelog/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@release-it-plugins/lerna-changelog/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" + } + }, + "node_modules/@release-it-plugins/lerna-changelog/node_modules/validate-peer-dependencies": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz", + "integrity": "sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ==", + "dev": true, + "dependencies": { + "resolve-package-path": "^4.0.0", + "semver": "^7.3.2" + }, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@release-it-plugins/workspaces": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@release-it-plugins/workspaces/-/workspaces-3.2.0.tgz", + "integrity": "sha512-ooEIgwb4qwGFQa9kXoTaQDHgD2Vymy5Z/aKL1JefnVUg1hiKL8Lh5fEfkDXggeXetTYk+SaFm2YNLrVOarX+Kw==", + "dev": true, + "dependencies": { + "detect-indent": "^6.0.0", + "detect-newline": "^3.1.0", + "semver": "^7.1.3", + "url-join": "^4.0.1", + "validate-peer-dependencies": "^1.0.0", + "walk-sync": "^2.0.2", + "yaml": "^2.1.1" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "release-it": "^14.0.0 || ^15.2.0" + } + }, + "node_modules/@release-it-plugins/workspaces/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@release-it-plugins/workspaces/node_modules/url-join": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz", + "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==", + "dev": true + }, + "node_modules/@release-it-plugins/workspaces/node_modules/walk-sync": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz", + "integrity": "sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==", + "dev": true, + "dependencies": { + "@types/minimatch": "^3.0.3", + "ensure-posix-path": "^1.1.0", + "matcher-collection": "^2.0.0", + "minimatch": "^3.0.4" + }, + "engines": { + "node": "8.* || >= 10.*" + } + }, "node_modules/@simple-dom/interface": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@simple-dom/interface/-/interface-1.4.0.tgz", @@ -21448,83 +21584,6 @@ "node": ">=14.9" } }, - "node_modules/release-it-lerna-changelog": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/release-it-lerna-changelog/-/release-it-lerna-changelog-5.0.0.tgz", - "integrity": "sha512-s/rHzwAwp878bivWKsJKNya9SRVKYZjgpyyGzg5ddBKZY5u5lhTWhxHtld7mHTRg4azIN7YypPH3rGaOfVmNVw==", - "deprecated": "This package has been renamed to @release-it-plugins/lerna-changelog", - "dev": true, - "dependencies": { - "execa": "^5.1.1", - "lerna-changelog": "^2.2.0", - "lodash.template": "^4.5.0", - "mdast-util-from-markdown": "^1.2.0", - "tmp": "^0.2.1", - "validate-peer-dependencies": "^2.0.0", - "which": "^2.0.2" - }, - "engines": { - "node": "^14.13.1 || >= 16" - }, - "peerDependencies": { - "release-it": "^14.0.0 || ^15.1.3" - } - }, - "node_modules/release-it-lerna-changelog/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/release-it-lerna-changelog/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/release-it-lerna-changelog/node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dev": true, - "dependencies": { - "rimraf": "^3.0.0" - }, - "engines": { - "node": ">=8.17.0" - } - }, - "node_modules/release-it-lerna-changelog/node_modules/validate-peer-dependencies": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz", - "integrity": "sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ==", - "dev": true, - "dependencies": { - "resolve-package-path": "^4.0.0", - "semver": "^7.3.2" - }, - "engines": { - "node": ">= 12" - } - }, "node_modules/release-it/node_modules/@sindresorhus/is": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz", @@ -26561,6 +26620,15 @@ "node": ">= 4.0.0" } }, + "node_modules/yaml": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.3.tgz", + "integrity": "sha512-AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg==", + "dev": true, + "engines": { + "node": ">= 14" + } + }, "node_modules/yargs": { "version": "17.6.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", @@ -26635,8 +26703,6 @@ "prettier": "^2.8.1", "qunit": "^2.19.1", "qunit-dom": "^2.0.0", - "release-it": "^15.5.1", - "release-it-lerna-changelog": "^5.0.0", "webpack": "^5.73.0" }, "engines": { @@ -28733,6 +28799,104 @@ "config-chain": "^1.1.11" } }, + "@release-it-plugins/lerna-changelog": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@release-it-plugins/lerna-changelog/-/lerna-changelog-5.0.0.tgz", + "integrity": "sha512-nMhAUptKSfIsiY0c//HuBcd2VT7D/IoxAQNwRgPx+jf3FM7HA5KD4KSl3oLoz4uA4GjvypWQP4ODX8UbWjmUZA==", + "dev": true, + "requires": { + "execa": "^5.1.1", + "lerna-changelog": "^2.2.0", + "lodash.template": "^4.5.0", + "mdast-util-from-markdown": "^1.2.0", + "tmp": "^0.2.1", + "validate-peer-dependencies": "^2.0.0", + "which": "^2.0.2" + }, + "dependencies": { + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "requires": { + "rimraf": "^3.0.0" + } + }, + "validate-peer-dependencies": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz", + "integrity": "sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ==", + "dev": true, + "requires": { + "resolve-package-path": "^4.0.0", + "semver": "^7.3.2" + } + } + } + }, + "@release-it-plugins/workspaces": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@release-it-plugins/workspaces/-/workspaces-3.2.0.tgz", + "integrity": "sha512-ooEIgwb4qwGFQa9kXoTaQDHgD2Vymy5Z/aKL1JefnVUg1hiKL8Lh5fEfkDXggeXetTYk+SaFm2YNLrVOarX+Kw==", + "dev": true, + "requires": { + "detect-indent": "^6.0.0", + "detect-newline": "^3.1.0", + "semver": "^7.1.3", + "url-join": "^4.0.1", + "validate-peer-dependencies": "^1.0.0", + "walk-sync": "^2.0.2", + "yaml": "^2.1.1" + }, + "dependencies": { + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "url-join": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz", + "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==", + "dev": true + }, + "walk-sync": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz", + "integrity": "sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==", + "dev": true, + "requires": { + "@types/minimatch": "^3.0.3", + "ensure-posix-path": "^1.1.0", + "matcher-collection": "^2.0.0", + "minimatch": "^3.0.4" + } + } + } + }, "@simple-dom/interface": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@simple-dom/interface/-/interface-1.4.0.tgz", @@ -44044,60 +44208,6 @@ } } }, - "release-it-lerna-changelog": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/release-it-lerna-changelog/-/release-it-lerna-changelog-5.0.0.tgz", - "integrity": "sha512-s/rHzwAwp878bivWKsJKNya9SRVKYZjgpyyGzg5ddBKZY5u5lhTWhxHtld7mHTRg4azIN7YypPH3rGaOfVmNVw==", - "dev": true, - "requires": { - "execa": "^5.1.1", - "lerna-changelog": "^2.2.0", - "lodash.template": "^4.5.0", - "mdast-util-from-markdown": "^1.2.0", - "tmp": "^0.2.1", - "validate-peer-dependencies": "^2.0.0", - "which": "^2.0.2" - }, - "dependencies": { - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dev": true, - "requires": { - "rimraf": "^3.0.0" - } - }, - "validate-peer-dependencies": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz", - "integrity": "sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ==", - "dev": true, - "requires": { - "resolve-package-path": "^4.0.0", - "semver": "^7.3.2" - } - } - } - }, "remote-git-tags": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz", @@ -45878,8 +45988,6 @@ "prettier": "^2.8.1", "qunit": "^2.19.1", "qunit-dom": "^2.0.0", - "release-it": "^15.5.1", - "release-it-lerna-changelog": "^5.0.0", "webpack": "^5.73.0" } }, @@ -47533,6 +47641,12 @@ } } }, + "yaml": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.3.tgz", + "integrity": "sha512-AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg==", + "dev": true + }, "yargs": { "version": "17.6.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz", diff --git a/package.json b/package.json index ffb80a9b..42e1abc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,13 @@ { "private": true, - "workspaces": ["addon", "test-app"], + "workspaces": [ + "addon", + "test-app" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/ember-cli/ember-resolver.git" + }, "scripts": { "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"", "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix", @@ -10,6 +17,8 @@ "lint:js:fix": "eslint . --fix" }, "devDependencies": { + "@release-it-plugins/lerna-changelog": "5.0.0", + "@release-it-plugins/workspaces": "^3.2.0", "ember-template-lint": "^5.2.0", "eslint": "^7.32.0", "eslint-plugin-ember": "^11.2.1", @@ -17,7 +26,25 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-qunit": "^7.3.0", "npm-run-all": "^4.1.5", - "prettier": "^2.8.1" + "prettier": "^2.8.1", + "release-it": "^15.5.1" + }, + "release-it": { + "plugins": { + "@release-it-plugins/workspaces": true, + "@release-it-plugins/lerna-changelog": { + "infile": "CHANGELOG.md", + "launchEditor": true + } + }, + "git": { + "tagName": "v${version}" + }, + "npm": false, + "github": { + "release": true, + "tokenRef": "GITHUB_AUTH" + } }, "volta": { "node": "14.19.3", diff --git a/test-app/package.json b/test-app/package.json index ad3f5940..8f76c631 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -50,8 +50,6 @@ "prettier": "^2.8.1", "qunit": "^2.19.1", "qunit-dom": "^2.0.0", - "release-it": "^15.5.1", - "release-it-lerna-changelog": "^5.0.0", "webpack": "^5.73.0" }, "engines": { @@ -63,6 +61,12 @@ "ember": { "edition": "octane" }, + "release-it": { + "plugins": { + "@release-it-plugins/workspaces": true + }, + "npm": false + }, "volta": { "extends": "../package.json" }