From 2fad1ba49d8c2779cfdbdf1ce5c4e832805270c8 Mon Sep 17 00:00:00 2001 From: Edward Faulkner Date: Thu, 11 May 2023 14:42:53 -0400 Subject: [PATCH] Use pnpm workspace protocol everywhere --- packages/addon-dev/package.json | 4 ++-- packages/addon-shim/package.json | 2 +- packages/babel-loader-8/package.json | 2 +- packages/compat/package.json | 8 ++++---- packages/core/package.json | 8 ++++---- packages/hbs-loader/package.json | 2 +- packages/macros/package.json | 6 +++--- packages/router/package.json | 6 +++--- packages/shared-internals/package.json | 2 +- packages/util/package.json | 12 ++++++------ packages/webpack/package.json | 8 ++++---- test-packages/sample-transforms/package.json | 2 +- tests/addon-template/package.json | 2 +- tests/app-template/package.json | 12 ++++++------ tests/scenarios/inter-version-test.ts | 5 ++--- tests/scenarios/package.json | 16 ++++++++-------- tests/ts-app-template/package.json | 10 +++++----- tests/v2-addon-template/package.json | 2 +- 18 files changed, 54 insertions(+), 55 deletions(-) diff --git a/packages/addon-dev/package.json b/packages/addon-dev/package.json index 370a3466da..638dce04a8 100644 --- a/packages/addon-dev/package.json +++ b/packages/addon-dev/package.json @@ -26,7 +26,7 @@ "test": "jest" }, "dependencies": { - "@embroider/core": "^2.0.0", + "@embroider/core": "workspace:^", "@rollup/pluginutils": "^4.1.1", "assert-never": "^1.2.1", "fs-extra": "^10.0.0", @@ -37,7 +37,7 @@ "yargs": "^17.0.1" }, "devDependencies": { - "@embroider/test-support": "0.36.0", + "@embroider/test-support": "workspace:*", "@glimmer/syntax": "^0.84.2", "@types/fs-extra": "^9.0.12", "@types/minimatch": "^3.0.4", diff --git a/packages/addon-shim/package.json b/packages/addon-shim/package.json index d191538510..8c7211e572 100644 --- a/packages/addon-shim/package.json +++ b/packages/addon-shim/package.json @@ -17,7 +17,7 @@ }, "scripts": {}, "dependencies": { - "@embroider/shared-internals": "^2.0.0", + "@embroider/shared-internals": "workspace:^", "broccoli-funnel": "^3.0.8", "semver": "^7.3.8" }, diff --git a/packages/babel-loader-8/package.json b/packages/babel-loader-8/package.json index 2e4bb781ea..6523ae67f4 100644 --- a/packages/babel-loader-8/package.json +++ b/packages/babel-loader-8/package.json @@ -13,7 +13,7 @@ "babel-loader": "8" }, "peerDependencies": { - "@embroider/core": "^2.0.0" + "@embroider/core": "workspace:^" }, "engines": { "node": "12.* || 14.* || >= 16" diff --git a/packages/compat/package.json b/packages/compat/package.json index 5174e5a22c..c2e7f86eb5 100644 --- a/packages/compat/package.json +++ b/packages/compat/package.json @@ -28,7 +28,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/preset-env": "^7.14.5", "@babel/traverse": "^7.14.5", - "@embroider/macros": "1.10.0", + "@embroider/macros": "workspace:*", "@types/babel__code-frame": "^7.0.2", "@types/yargs": "^17.0.3", "assert-never": "^1.1.0", @@ -62,8 +62,8 @@ "yargs": "^17.0.1" }, "devDependencies": { - "@embroider/sample-transforms": "0.0.0", - "@embroider/test-support": "0.36.0", + "@embroider/sample-transforms": "workspace:*", + "@embroider/test-support": "workspace:*", "@glimmer/syntax": "^0.84.2", "@glint/template": "^1.0.0", "@types/babel__core": "^7.1.14", @@ -86,7 +86,7 @@ "typescript": "*" }, "peerDependencies": { - "@embroider/core": "^2.0.0" + "@embroider/core": "workspace:^" }, "engines": { "node": "12.* || 14.* || >= 16" diff --git a/packages/core/package.json b/packages/core/package.json index 11951d2085..b428de2477 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -26,8 +26,8 @@ "@babel/plugin-transform-runtime": "^7.14.5", "@babel/runtime": "^7.14.5", "@babel/traverse": "^7.14.5", - "@embroider/macros": "1.10.0", - "@embroider/shared-internals": "2.0.0", + "@embroider/macros": "workspace:*", + "@embroider/shared-internals": "workspace:*", "assert-never": "^1.2.1", "babel-plugin-ember-template-compilation": "^2.0.0", "broccoli-node-api": "^1.7.0", @@ -50,8 +50,8 @@ "walk-sync": "^3.0.0" }, "devDependencies": { - "@embroider/sample-transforms": "0.0.0", - "@embroider/test-support": "0.36.0", + "@embroider/sample-transforms": "workspace:*", + "@embroider/test-support": "workspace:*", "@glimmer/syntax": "^0.84.2", "@glint/template": "^1.0.0", "@types/babel__core": "^7.1.14", diff --git a/packages/hbs-loader/package.json b/packages/hbs-loader/package.json index 4ef15dafbd..8e3adfca4c 100644 --- a/packages/hbs-loader/package.json +++ b/packages/hbs-loader/package.json @@ -23,7 +23,7 @@ "typescript": "*" }, "peerDependencies": { - "@embroider/core": "^2.0.0", + "@embroider/core": "workspace:^", "webpack": "^5" }, "engines": { diff --git a/packages/macros/package.json b/packages/macros/package.json index 3d058b853a..abbb30b43e 100644 --- a/packages/macros/package.json +++ b/packages/macros/package.json @@ -23,7 +23,7 @@ "test": "jest" }, "dependencies": { - "@embroider/shared-internals": "2.0.0", + "@embroider/shared-internals": "workspace:*", "assert-never": "^1.2.1", "babel-import-util": "^1.1.0", "ember-cli-babel": "^7.26.6", @@ -36,8 +36,8 @@ "@babel/core": "^7.14.5", "@babel/plugin-transform-modules-amd": "^7.19.6", "@babel/traverse": "^7.14.5", - "@embroider/core": "2.1.1", - "@embroider/test-support": "0.36.0", + "@embroider/core": "workspace:*", + "@embroider/test-support": "workspace:*", "@glint/template": "^1.0.0", "@types/babel__core": "^7.1.14", "@types/babel__generator": "^7.6.2", diff --git a/packages/router/package.json b/packages/router/package.json index e399f2f09f..4c7cc1c527 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@ember/test-waiters": "^3.0.0", - "@embroider/addon-shim": "^1.8.4" + "@embroider/addon-shim": "workspace:^" }, "devDependencies": { "@babel/core": "^7.17.0", @@ -39,7 +39,7 @@ "@babel/plugin-proposal-class-properties": "^7.16.7", "@babel/plugin-proposal-decorators": "^7.17.0", "@babel/plugin-syntax-decorators": "^7.17.0", - "@embroider/addon-dev": "^3.0.0", + "@embroider/addon-dev": "workspace:^", "@embroider/macros": "workspace:*", "@tsconfig/ember": "^1.0.0", "@typescript-eslint/eslint-plugin": "^5.30.5", @@ -59,7 +59,7 @@ "typescript": "^4.7.4" }, "peerDependencies": { - "@embroider/core": "^2.0.0" + "@embroider/core": "workspace:^" }, "peerDependenciesMeta": { "@embroider/core": { diff --git a/packages/shared-internals/package.json b/packages/shared-internals/package.json index 4909203eea..0f16a3d6f5 100644 --- a/packages/shared-internals/package.json +++ b/packages/shared-internals/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "broccoli-node-api": "^1.7.0", - "@embroider/test-support": "0.36.0", + "@embroider/test-support": "workspace:*", "@types/babel__core": "^7.1.14", "@types/babel__traverse": "^7.18.5", "@types/fs-extra": "^9.0.12", diff --git a/packages/util/package.json b/packages/util/package.json index c01c1ce5a4..717c1d1cfe 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -27,7 +27,7 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@embroider/macros": "^1.10.0", + "@embroider/macros": "workspace:^", "broccoli-funnel": "^3.0.5", "ember-cli-babel": "^7.26.11" }, @@ -49,11 +49,11 @@ "@ember/jquery": "^2.0.0", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.9.1", - "@embroider/compat": "2.1.1", - "@embroider/core": "2.1.1", - "@embroider/test-setup": "2.1.1", - "@embroider/test-support": "0.36.0", - "@embroider/webpack": "2.1.1", + "@embroider/compat": "workspace:*", + "@embroider/core": "workspace:*", + "@embroider/test-setup": "workspace:*", + "@embroider/test-support": "workspace:*", + "@embroider/webpack": "workspace:*", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@glint/template": "^1.0.0", diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 3ab1b7e2c1..1cc551f09b 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -19,9 +19,9 @@ "scripts": {}, "dependencies": { "@babel/core": "^7.14.5", - "@embroider/babel-loader-8": "2.0.0", - "@embroider/hbs-loader": "2.0.0", - "@embroider/shared-internals": "2.0.0", + "@embroider/babel-loader-8": "workspace:*", + "@embroider/hbs-loader": "workspace:*", + "@embroider/shared-internals": "workspace:*", "@types/supports-color": "^8.1.0", "assert-never": "^1.2.1", "babel-loader": "^8.2.2", @@ -53,7 +53,7 @@ "webpack": "^5.38.1" }, "peerDependencies": { - "@embroider/core": "^2.0.0", + "@embroider/core": "workspace:^", "webpack": "^5.0.0" }, "engines": { diff --git a/test-packages/sample-transforms/package.json b/test-packages/sample-transforms/package.json index 96f2cd3f2a..10af29f42d 100644 --- a/test-packages/sample-transforms/package.json +++ b/test-packages/sample-transforms/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@ember/optional-features": "^0.7.0", "@ember/test-helpers": "^2.9.1", - "@embroider/test-support": "0.36.0", + "@embroider/test-support": "workspace:*", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^2.2.0", "ember-cli": "~3.28.0", diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json index 47e69355e0..b54fa033cd 100644 --- a/tests/addon-template/package.json +++ b/tests/addon-template/package.json @@ -34,7 +34,7 @@ "@babel/core": "^7.19.3", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.9.1", - "@embroider/test-setup": "^2.0.0", + "@embroider/test-setup": "workspace:^", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "babel-eslint": "^10.1.0", diff --git a/tests/app-template/package.json b/tests/app-template/package.json index ab16ea1558..ab0ede8d8a 100644 --- a/tests/app-template/package.json +++ b/tests/app-template/package.json @@ -26,12 +26,12 @@ "devDependencies": { "@babel/core": "^7.19.3", "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.9.1", - "@embroider/compat": "2.1.1", - "@embroider/core": "2.1.1", - "@embroider/router": "2.0.0", - "@embroider/test-setup": "2.1.1", - "@embroider/webpack": "2.1.1", + "@ember/test-helpers": "workspace:^", + "@embroider/compat": "workspace:*", + "@embroider/core": "workspace:*", + "@embroider/router": "workspace:*", + "@embroider/test-setup": "workspace:*", + "@embroider/webpack": "workspace:*", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "babel-eslint": "^10.1.0", diff --git a/tests/scenarios/inter-version-test.ts b/tests/scenarios/inter-version-test.ts index fdd7332414..f62b9024cc 100644 --- a/tests/scenarios/inter-version-test.ts +++ b/tests/scenarios/inter-version-test.ts @@ -2,7 +2,6 @@ import QUnit from 'qunit'; import glob from 'globby'; import { resolve } from 'path'; import { readFileSync, readJSONSync } from 'fs-extra'; -import { satisfies } from 'semver'; import yaml from 'js-yaml'; const { module: Qmodule, test } = QUnit; @@ -22,8 +21,8 @@ Qmodule('package inter-version consistency', () => { let other = packages.get(name); if (other) { assert.ok( - satisfies(other.version, range as string), - `${name} in ${section} ${other.version} does not satisfy ${range}` + (range as string).startsWith('workspace:'), + `${section} refers to ${name} as ${range} instead of workspace:` ); } } diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json index 4547836448..56da14dce3 100644 --- a/tests/scenarios/package.json +++ b/tests/scenarios/package.json @@ -2,11 +2,11 @@ "name": "@embroider/test-scenarios", "version": "0.0.5", "dependencies": { - "@embroider/compat": "2.1.1", - "@embroider/core": "2.1.1", + "@embroider/compat": "workspace:*", + "@embroider/core": "workspace:*", "@embroider/sample-transforms": "workspace:*", - "@embroider/shared-internals": "2.0.0", - "@embroider/test-support": "0.36.0", + "@embroider/shared-internals": "workspace:*", + "@embroider/test-support": "workspace:*", "@embroider/webpack": "workspace:*", "@embroider/addon-dev": "workspace:*", "ember-auto-import": "^2.6.3", @@ -41,10 +41,10 @@ "@babel/runtime": "^7.18.6", "@ember/legacy-built-in-components": "^0.4.1", "@ember/string": "^3.0.0", - "@embroider/addon-shim": "1.8.4", - "@embroider/macros": "1.10.0", - "@embroider/router": "2.0.0", - "@embroider/util": "1.10.0", + "@embroider/addon-shim": "workspace:*", + "@embroider/macros": "workspace:*", + "@embroider/router": "workspace:*", + "@embroider/util": "workspace:*", "@rollup/plugin-babel": "^5.3.1", "@tsconfig/ember": "1.0.1", "@types/fs-extra": "^9.0.12", diff --git a/tests/ts-app-template/package.json b/tests/ts-app-template/package.json index 31da99fa09..5c0d265fd6 100644 --- a/tests/ts-app-template/package.json +++ b/tests/ts-app-template/package.json @@ -31,11 +31,11 @@ "@ember/optional-features": "^2.0.0", "@ember/string": "^3.0.1", "@ember/test-helpers": "^2.9.3", - "@embroider/compat": "2.1.1", - "@embroider/core": "2.1.1", - "@embroider/router": "2.0.0", - "@embroider/test-setup": "2.1.1", - "@embroider/webpack": "2.1.1", + "@embroider/compat": "workspace:*", + "@embroider/core": "workspace:*", + "@embroider/router": "workspace:*", + "@embroider/test-setup": "workspace:*", + "@embroider/webpack": "workspace:*", "@glimmer/component": "^1.1.2", "@glimmer/interfaces": "^0.84.2", "@glimmer/reference": "^0.84.2", diff --git a/tests/v2-addon-template/package.json b/tests/v2-addon-template/package.json index 8bb9c07c69..8fe72de7dc 100644 --- a/tests/v2-addon-template/package.json +++ b/tests/v2-addon-template/package.json @@ -5,7 +5,7 @@ "ember-addon" ], "dependencies": { - "@embroider/addon-shim": "1.8.4" + "@embroider/addon-shim": "workspace:*" }, "private": true, "ember-addon": {