Skip to content

Commit

Permalink
Use pnpm workspace protocol everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
@ef4
ef4 committed May 11, 2023
1 parent 40cebb2 commit 2fad1ba
Show file tree
Hide file tree
Showing 18 changed files with 54 additions and 55 deletions.
4 changes: 2 additions & 2 deletions packages/addon-dev/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/addon-shim/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-loader-8/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"babel-loader": "8"
},
"peerDependencies": {
"@embroider/core": "^2.0.0"
"@embroider/core": "workspace:^"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
8 changes: 4 additions & 4 deletions packages/compat/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -86,7 +86,7 @@
"typescript": "*"
},
"peerDependencies": {
"@embroider/core": "^2.0.0"
"@embroider/core": "workspace:^"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand Down
8 changes: 4 additions & 4 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/hbs-loader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"typescript": "*"
},
"peerDependencies": {
"@embroider/core": "^2.0.0",
"@embroider/core": "workspace:^",
"webpack": "^5"
},
"engines": {
Expand Down
6 changes: 3 additions & 3 deletions packages/macros/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/router/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
},
"dependencies": {
"@ember/test-waiters": "^3.0.0",
"@embroider/addon-shim": "^1.8.4"
"@embroider/addon-shim": "workspace:^"
},
"devDependencies": {
"@babel/core": "^7.17.0",
"@babel/preset-typescript": "^7.18.6",
"@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",
Expand All @@ -59,7 +59,7 @@
"typescript": "^4.7.4"
},
"peerDependencies": {
"@embroider/core": "^2.0.0"
"@embroider/core": "workspace:^"
},
"peerDependenciesMeta": {
"@embroider/core": {
Expand Down
2 changes: 1 addition & 1 deletion packages/shared-internals/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions packages/util/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/webpack/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -53,7 +53,7 @@
"webpack": "^5.38.1"
},
"peerDependencies": {
"@embroider/core": "^2.0.0",
"@embroider/core": "workspace:^",
"webpack": "^5.0.0"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion test-packages/sample-transforms/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/addon-template/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions tests/app-template/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions tests/scenarios/inter-version-test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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:`
);
}
}
Expand Down
16 changes: 8 additions & 8 deletions tests/scenarios/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions tests/ts-app-template/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/v2-addon-template/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"ember-addon"
],
"dependencies": {
"@embroider/addon-shim": "1.8.4"
"@embroider/addon-shim": "workspace:*"
},
"private": true,
"ember-addon": {
Expand Down

0 comments on commit 2fad1ba

Please sign in to comment.