Skip to content

Commit

Permalink
chore: update nx
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz committed Apr 19, 2021
1 parent b6f3156 commit dd02bf6
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 72 deletions.
1 change: 1 addition & 0 deletions app/angular/src/server/angular-read-workspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const readAngularWorkspaceConfig = async (

const nxWorkspace = require('@nrwl/workspace').readWorkspaceConfig({
format: 'angularCli',
path: dirToSearch,
});

// Use the workspace version of nx when angular looks for the angular.json file
Expand Down
4 changes: 4 additions & 0 deletions lib/core-server/src/core-presets.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ import { executor as managerExecutor } from './manager/builder';
import { buildDevStandalone } from './build-dev';
import { buildStaticStandalone } from './build-static';

// nx-ignore-next-line
import reactOptions from '../../../app/react/src/server/options';
// nx-ignore-next-line
import vue3Options from '../../../app/vue3/src/server/options';
// nx-ignore-next-line
import htmlOptions from '../../../app/html/src/server/options';
// nx-ignore-next-line
import webComponentsOptions from '../../../app/web-components/src/server/options';
import { outputStats } from './utils/output-stats';

Expand Down
6 changes: 2 additions & 4 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{
"npmScope": "storybook",
"implicitDependencies": {
"workspace.json": "*",
"package.json": {
"dependencies": "*",
"devDependencies": "*"
},
"nx.json": "*"
}
},
"tasksRunnerOptions": {
"default": {
Expand Down Expand Up @@ -302,4 +300,4 @@
"affected": {
"defaultBase": "next"
}
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@
"@compodoc/compodoc": "^1.1.11",
"@emotion/snapshot-serializer": "^0.8.2",
"@nicolo-ribaudo/chokidar-2": "^2.1.8",
"@nrwl/cli": "^11.6.1",
"@nrwl/nx-cloud": "^11.2.0",
"@nrwl/tao": "^11.6.1",
"@nrwl/workspace": "^11.6.1",
"@nrwl/cli": "12.0.7",
"@nrwl/nx-cloud": "11.2.0",
"@nrwl/tao": "12.0.7",
"@nrwl/workspace": "12.0.7",
"@storybook/addon-a11y": "workspace:*",
"@storybook/addon-actions": "workspace:*",
"@storybook/addon-backgrounds": "workspace:*",
Expand Down
135 changes: 71 additions & 64 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5128,18 +5128,18 @@ __metadata:
languageName: node
linkType: hard

"@nrwl/cli@npm:11.6.2, @nrwl/cli@npm:^11.6.1":
version: 11.6.2
resolution: "@nrwl/cli@npm:11.6.2"
"@nrwl/cli@npm:12.0.7":
version: 12.0.7
resolution: "@nrwl/cli@npm:12.0.7"
dependencies:
"@nrwl/tao": 11.6.2
"@nrwl/tao": 12.0.7
chalk: 4.1.0
tmp: 0.0.33
v8-compile-cache: 2.3.0
yargs: 15.4.1
yargs-parser: 20.0.0
bin:
nx: bin/nx.js
checksum: fb717fe415fbb0e87e0408403569dcd0ff735277d226f1e280c67fc007076836423ff4fad8b4fbc31f56dac70d79053333de0891d8b629a0e496b22bcac1b2d5
checksum: 71004f6ce548f91aeed839bf929a8ef5762ac047ee4d185592f998d8223e03512a882e2276f8c5db9b52b8cf71849ee662f6275473e3dfd89d26a40da2705935
languageName: node
linkType: hard

Expand All @@ -5157,17 +5157,17 @@ __metadata:
languageName: node
linkType: hard

"@nrwl/devkit@npm:11.6.2":
version: 11.6.2
resolution: "@nrwl/devkit@npm:11.6.2"
"@nrwl/devkit@npm:12.0.7":
version: 12.0.7
resolution: "@nrwl/devkit@npm:12.0.7"
dependencies:
"@nrwl/tao": 11.6.2
"@nrwl/tao": 12.0.7
ejs: ^3.1.5
ignore: ^5.0.4
semver: 7.3.4
strip-json-comments: 2.0.1
strip-json-comments: ^3.1.1
tslib: ^2.0.0
checksum: 061d70f963117abbd7ee0f8af67b4baf543bb7a89437dce3962ff035dc62b1fe5eb57e360030a7b2490257dae5127cd843f4194e27304b6eebe8c001eab41054
checksum: 0f2145c87a33e91958cde916faee8a055080c8b98619be64abb69a596b2f6cbd1a5008cab646a6bf4e97f7a672bd303b6b310ce83be3e3099bdd97c858121826
languageName: node
linkType: hard

Expand All @@ -5184,16 +5184,16 @@ __metadata:
languageName: node
linkType: hard

"@nrwl/jest@npm:11.6.2":
version: 11.6.2
resolution: "@nrwl/jest@npm:11.6.2"
"@nrwl/jest@npm:12.0.7":
version: 12.0.7
resolution: "@nrwl/jest@npm:12.0.7"
dependencies:
"@nrwl/devkit": 11.6.2
"@nrwl/devkit": 12.0.7
jest-resolve: ^26.6.2
rxjs: ^6.5.4
strip-json-comments: 2.0.1
strip-json-comments: ^3.1.1
tslib: ^2.0.0
checksum: ff926a7ec6af472434b44c602f148eef1889b663e0e355b7a87b6c8e40d7e81452ecfde67b0768761d3581f44662ef4371cccdae52bf635050b82c6fee6340f4
checksum: 5748075bf53bc443afe247be3847829060ddbddbe1c0f9cf4e4d16235c5377863267be7ac166a0c0e5ad75d4c42b764a04bbd0d7684578dacb35623cb7fad406
languageName: node
linkType: hard

Expand All @@ -5209,20 +5209,20 @@ __metadata:
languageName: node
linkType: hard

"@nrwl/linter@npm:11.6.2":
version: 11.6.2
resolution: "@nrwl/linter@npm:11.6.2"
"@nrwl/linter@npm:12.0.7":
version: 12.0.7
resolution: "@nrwl/linter@npm:12.0.7"
dependencies:
"@nrwl/devkit": 11.6.2
"@nrwl/devkit": 12.0.7
glob: 7.1.4
minimatch: 3.0.4
tmp: 0.0.33
tmp: ~0.2.1
tslib: ^2.0.0
checksum: 58aa480c100cf7ad547f54310adf9982f1d4d85035cc54299cd875faef1413c80d12ed17159e7655e00eb403da33d6e30b9ff7cc2b2cd7775e43de9d3498104b
checksum: 03b910515d94f7269d5bc5cedee76db792f931ad105eedee3599b41facae5c260005d2b6ba00dfc914b7c6ef2dfd96915330f202ad67af52f7060a00fb9bb0e5
languageName: node
linkType: hard

"@nrwl/nx-cloud@npm:^11.2.0":
"@nrwl/nx-cloud@npm:11.2.0":
version: 11.2.0
resolution: "@nrwl/nx-cloud@npm:11.2.0"
dependencies:
Expand Down Expand Up @@ -5257,73 +5257,73 @@ __metadata:
languageName: node
linkType: hard

"@nrwl/tao@npm:11.6.2, @nrwl/tao@npm:^11.6.1":
version: 11.6.2
resolution: "@nrwl/tao@npm:11.6.2"
"@nrwl/tao@npm:12.0.7":
version: 12.0.7
resolution: "@nrwl/tao@npm:12.0.7"
dependencies:
chalk: 4.1.0
enquirer: ~2.3.6
fs-extra: 7.0.1
inquirer: ^6.3.1
minimist: ^1.2.5
rxjs: ^6.5.4
rxjs-for-await: 0.0.2
semver: 7.3.4
strip-json-comments: 2.0.1
tmp: 0.0.33
strip-json-comments: ^3.1.1
tmp: ~0.2.1
tslib: ^2.0.0
yargs-parser: 20.0.0
bin:
tao: index.js
checksum: b80c8eb702f9e0e2ec4b406d866c600830111de92ce6dc086a6009d69a74d608c88839501065e62b08be2e1f693a667c2e6b23131dd3d5fe6618f9654a0d801a
checksum: 770286d9da4647881af41d8b25dcef0dbc858cb244757b5a6a2be76b1297b54f7ed49e451453f7224d6a06a284eb35302c6ad8a919c783e0d2d79f5ae7f2f13f
languageName: node
linkType: hard

"@nrwl/workspace@npm:^11.1.5":
version: 11.3.1
resolution: "@nrwl/workspace@npm:11.3.1"
"@nrwl/workspace@npm:12.0.7":
version: 12.0.7
resolution: "@nrwl/workspace@npm:12.0.7"
dependencies:
"@nrwl/cli": 11.3.1
"@nrwl/devkit": 11.3.1
"@nrwl/jest": 11.3.1
"@nrwl/linter": 11.3.1
"@nrwl/cli": 12.0.7
"@nrwl/devkit": 12.0.7
"@nrwl/jest": 12.0.7
"@nrwl/linter": 12.0.7
axios: 0.21.1
chalk: 4.1.0
cosmiconfig: ^4.0.0
dotenv: 6.2.0
dotenv: 8.2.0
enquirer: ~2.3.6
flat: ^5.0.2
fs-extra: 7.0.1
ignore: ^5.0.4
inquirer: ^6.3.1
lodash: ^4.17.20
lodash.template: ~4.5.0
minimatch: 3.0.4
npm-run-all: ^4.1.5
opn: ^5.3.0
open: ^7.4.2
resolve: 1.17.0
rxjs: ^6.5.4
semver: 6.3.0
strip-json-comments: 2.0.1
tmp: 0.0.33
semver: 7.3.4
strip-json-comments: ^3.1.1
tmp: ~0.2.1
tslib: ^2.0.0
yargs: 15.4.1
yargs-parser: 20.0.0
peerDependencies:
prettier: ^2.0.4
checksum: 7730bab369e5e2080fc53aba8acda3a706454d0db5b322b6c9e20ef2af253bc7f35fa1a7afe7d9842c34e8462e47986fb9ed5ea2bac309115c2a05b4cdfcb291
checksum: a5ecdff8a9862a81bfda976348eb0c54818cb325bececaf63b574696095ce7a21951ecf6cd468c96ef218a83923b5a66ac3e2e47aa557169cb1edf5d6855aa5d
languageName: node
linkType: hard

"@nrwl/workspace@npm:^11.6.1":
version: 11.6.2
resolution: "@nrwl/workspace@npm:11.6.2"
"@nrwl/workspace@npm:^11.1.5":
version: 11.3.1
resolution: "@nrwl/workspace@npm:11.3.1"
dependencies:
"@nrwl/cli": 11.6.2
"@nrwl/devkit": 11.6.2
"@nrwl/jest": 11.6.2
"@nrwl/linter": 11.6.2
"@nrwl/cli": 11.3.1
"@nrwl/devkit": 11.3.1
"@nrwl/jest": 11.3.1
"@nrwl/linter": 11.3.1
axios: 0.21.1
chalk: 4.1.0
cosmiconfig: ^4.0.0
dotenv: 8.2.0
dotenv: 6.2.0
flat: ^5.0.2
fs-extra: 7.0.1
ignore: ^5.0.4
Expand All @@ -5334,15 +5334,15 @@ __metadata:
opn: ^5.3.0
resolve: 1.17.0
rxjs: ^6.5.4
semver: 7.3.4
semver: 6.3.0
strip-json-comments: 2.0.1
tmp: 0.0.33
tslib: ^2.0.0
yargs: 15.4.1
yargs-parser: 20.0.0
peerDependencies:
prettier: ^2.0.4
checksum: f43117538042fb77caa0a81a98657502271556f8154254b6cae9fe9512b20f6125cf6b99ce0d1573955d1b93997ae238d6f95f6051ea5e6f13d25e781211df28
checksum: 7730bab369e5e2080fc53aba8acda3a706454d0db5b322b6c9e20ef2af253bc7f35fa1a7afe7d9842c34e8462e47986fb9ed5ea2bac309115c2a05b4cdfcb291
languageName: node
linkType: hard

Expand Down Expand Up @@ -7880,10 +7880,10 @@ __metadata:
"@cypress/webpack-preprocessor": ^5.7.0
"@emotion/snapshot-serializer": ^0.8.2
"@nicolo-ribaudo/chokidar-2": ^2.1.8
"@nrwl/cli": ^11.6.1
"@nrwl/nx-cloud": ^11.2.0
"@nrwl/tao": ^11.6.1
"@nrwl/workspace": ^11.6.1
"@nrwl/cli": 12.0.7
"@nrwl/nx-cloud": 11.2.0
"@nrwl/tao": 12.0.7
"@nrwl/workspace": 12.0.7
"@storybook/addon-a11y": "workspace:*"
"@storybook/addon-actions": "workspace:*"
"@storybook/addon-backgrounds": "workspace:*"
Expand Down Expand Up @@ -20859,7 +20859,7 @@ __metadata:
languageName: node
linkType: hard

"enquirer@npm:^2.3.5, enquirer@npm:^2.3.6":
"enquirer@npm:^2.3.5, enquirer@npm:^2.3.6, enquirer@npm:~2.3.6":
version: 2.3.6
resolution: "enquirer@npm:2.3.6"
dependencies:
Expand Down Expand Up @@ -31440,7 +31440,7 @@ [email protected]:
languageName: node
linkType: hard

"lodash.template@npm:^4.0.2, lodash.template@npm:^4.4.0, lodash.template@npm:^4.5.0":
"lodash.template@npm:^4.0.2, lodash.template@npm:^4.4.0, lodash.template@npm:^4.5.0, lodash.template@npm:~4.5.0":
version: 4.5.0
resolution: "lodash.template@npm:4.5.0"
dependencies:
Expand Down Expand Up @@ -34503,7 +34503,7 @@ [email protected]:
languageName: node
linkType: hard

"open@npm:^7.0.2, open@npm:^7.0.3":
"open@npm:^7.0.2, open@npm:^7.0.3, open@npm:^7.4.2":
version: 7.4.2
resolution: "open@npm:7.4.2"
dependencies:
Expand Down Expand Up @@ -46599,6 +46599,13 @@ [email protected]:
languageName: node
linkType: hard

"v8-compile-cache@npm:2.3.0":
version: 2.3.0
resolution: "v8-compile-cache@npm:2.3.0"
checksum: b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688
languageName: node
linkType: hard

"v8-compile-cache@npm:^2.0.0, v8-compile-cache@npm:^2.0.3, v8-compile-cache@npm:^2.1.1, v8-compile-cache@npm:^2.2.0":
version: 2.2.0
resolution: "v8-compile-cache@npm:2.2.0"
Expand Down

0 comments on commit dd02bf6

Please sign in to comment.