Skip to content

Commit

Permalink
chore: fix inconsistent workspace prefixes
Browse files Browse the repository at this point in the history
  • Loading branch information
bmish committed Sep 7, 2022
1 parent 396b3fa commit b96d18a
Show file tree
Hide file tree
Showing 20 changed files with 96 additions and 98 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

### Chore & Maintenance

- `[*]` Fix inconsistent workspace prefixes ([#13217](https://github.com/facebook/jest/pull/13217))

### Performance

## 29.0.2
Expand Down
4 changes: 0 additions & 4 deletions constraints.pro
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ gen_enforced_dependency(WorkspaceCwd, DependencyIdent, DependencyRange2, Depende
% Ignore peer dependencies
DependencyType \= 'peerDependencies',
DependencyType2 \= 'peerDependencies',
% Ignore workspace:*: we use both `workspace:*` and real version such as `^28.0.0-alpha.8` to reference package in monorepo
% TODO: in the future we should make it consistent and remove this ignore
DependencyRange \= 'workspace:*',
DependencyRange2 \= 'workspace:*',
% A list of exception to same version rule
\+ member(DependencyIdent, [
% Allow enzyme example workspace use a older version react and react-dom, because enzyme don't support react 17
Expand Down
4 changes: 2 additions & 2 deletions examples/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"@babel/preset-env": "^7.1.0",
"@babel/preset-typescript": "^7.0.0",
"@types/jest": "^27.4.0",
"babel-jest": "workspace:*",
"babel-jest": "workspace:^",
"babel-plugin-transform-typescript-metadata": "*",
"jest": "workspace:*",
"jest": "workspace:^",
"jest-zone-patch": "*"
}
}
4 changes: 2 additions & 2 deletions examples/async/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
4 changes: 2 additions & 2 deletions examples/automatic-mocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
4 changes: 2 additions & 2 deletions examples/enzyme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.12.1",
"babel-jest": "workspace:*",
"babel-jest": "workspace:^",
"enzyme": "*",
"enzyme-adapter-react-16": "*",
"jest": "workspace:*"
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
8 changes: 4 additions & 4 deletions examples/expect-extend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"@babel/preset-typescript": "^7.0.0",
"@jest/globals": "workspace:*",
"babel-jest": "workspace:*",
"expect": "workspace:*",
"jest": "workspace:*",
"@jest/globals": "workspace:^",
"babel-jest": "workspace:^",
"expect": "workspace:^",
"jest": "workspace:^",
"typescript": "^4.8.2"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/getting-started/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
4 changes: 2 additions & 2 deletions examples/jquery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"dependencies": {
"jquery": "^3.2.1"
Expand Down
4 changes: 2 additions & 2 deletions examples/manual-mocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
4 changes: 2 additions & 2 deletions examples/module-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
6 changes: 3 additions & 3 deletions examples/mongodb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"main": "./index.js",
"private": true,
"dependencies": {
"jest-environment-node": "workspace:*",
"jest-environment-node": "workspace:^",
"mongodb": "^4.3.1",
"mongodb-memory-server": "^8.3.0"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
4 changes: 2 additions & 2 deletions examples/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*",
"babel-jest": "workspace:^",
"jest": "workspace:^",
"metro-react-native-babel-preset": "0.70.3",
"react-test-renderer": "18.0.0"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/react-testing-library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.12.1",
"@testing-library/react": "^12.1.5",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
4 changes: 2 additions & 2 deletions examples/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.12.1",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
4 changes: 2 additions & 2 deletions examples/snapshot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.12.1",
"babel-jest": "workspace:*",
"jest": "workspace:*",
"babel-jest": "workspace:^",
"jest": "workspace:^",
"react-test-renderer": "17.0.2"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/timer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.1.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
4 changes: 2 additions & 2 deletions examples/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@babel/preset-react": "^7.12.1",
"@babel/preset-typescript": "^7.0.0",
"@types/jest": "^27.4.0",
"babel-jest": "workspace:*",
"jest": "workspace:*"
"babel-jest": "workspace:^",
"jest": "workspace:^"
},
"scripts": {
"test": "jest"
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"@babel/preset-typescript": "^7.0.0",
"@babel/register": "^7.0.0",
"@crowdin/cli": "^3.5.2",
"@jest/globals": "workspace:*",
"@jest/test-utils": "workspace:*",
"@jest/globals": "workspace:^",
"@jest/test-utils": "workspace:^",
"@lerna-lite/cli": "^1.10.0",
"@microsoft/api-extractor": "^7.29.0",
"@tsconfig/node14": "^1.0.3",
Expand Down Expand Up @@ -51,14 +51,14 @@
"istanbul-lib-coverage": "^3.0.0",
"istanbul-lib-report": "^3.0.0",
"istanbul-reports": "^3.1.3",
"jest": "workspace:*",
"jest-changed-files": "workspace:*",
"jest": "workspace:^",
"jest-changed-files": "workspace:^",
"jest-junit": "^14.0.0",
"jest-mock": "workspace:*",
"jest-mock": "workspace:^",
"jest-runner-tsd": "^4.0.0",
"jest-serializer-ansi-escapes": "^2.0.1",
"jest-silent-reporter": "^0.5.0",
"jest-snapshot": "workspace:*",
"jest-snapshot": "workspace:^",
"jest-watch-typeahead": "^2.1.1",
"jquery": "^3.2.1",
"js-yaml": "^4.1.0",
Expand Down Expand Up @@ -172,10 +172,10 @@
"resolutions": {
"@types/node": "~14.14.45",
"ansi-escapes/type-fest": "^2.0.0",
"babel-jest": "workspace:*",
"babel-jest": "workspace:^",
"enzyme/cheerio": "=1.0.0-rc.3",
"jest": "workspace:*",
"jest-environment-node": "workspace:*",
"jest": "workspace:^",
"jest-environment-node": "workspace:^",
"react-native@0.69.2": "patch:react-native@npm:0.69.2#.yarn/patches/react-native-npm-0.68.1-8830b7be0d.patch"
},
"packageManager": "yarn@3.2.3"
Expand Down
Loading

0 comments on commit b96d18a

Please sign in to comment.