@nrwl/workspace 15.4.4 → 15.4.5
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/package.json +30 -29
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +0 -8
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
- package/src/generators/move/lib/update-default-project.js +4 -5
- package/src/generators/move/lib/update-default-project.js.map +1 -1
- package/src/generators/preset/preset.js +2 -2
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/remove/lib/remove-project-config.js +6 -8
- package/src/generators/remove/lib/remove-project-config.js.map +1 -1
- package/src/migrations/update-12-5-0/add-target-dependencies.js +2 -2
- package/src/migrations/update-12-5-0/add-target-dependencies.js.map +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +11 -11
- package/src/migrations/update-13-0-0/config-locations/config-locations.js.map +1 -1
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js +2 -2
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js.map +1 -1
- package/src/migrations/update-13-10-0/update-tasks-runner.js +2 -2
- package/src/migrations/update-13-10-0/update-tasks-runner.js.map +1 -1
- package/src/migrations/update-13-2-0/set-parallel-default.js +2 -2
- package/src/migrations/update-13-2-0/set-parallel-default.js.map +1 -1
- package/src/migrations/update-13-6-0/remove-old-task-runner-options.js +3 -3
- package/src/migrations/update-13-6-0/remove-old-task-runner-options.js.map +1 -1
- package/src/migrations/update-14-0-0/change-npm-script-executor.js.map +1 -1
- package/src/migrations/update-14-0-0/change-nx-json-presets.js +3 -3
- package/src/migrations/update-14-0-0/change-nx-json-presets.js.map +1 -1
- package/src/utilities/buildable-libs-utils.js +1 -1
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/set-default-collection.js +5 -5
- package/src/utilities/set-default-collection.js.map +1 -1
package/CHANGELOG.md
CHANGED
@@ -3,6 +3,6 @@
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
5
5
|
|
6
|
-
## [15.4.
|
6
|
+
## [15.4.5](https://github.com/nrwl/nx/compare/15.4.4...15.4.5) (2023-01-06)
|
7
7
|
|
8
8
|
**Note:** Version bump only for package @nrwl/workspace
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nrwl/workspace",
|
3
|
-
"version": "15.4.
|
3
|
+
"version": "15.4.5",
|
4
4
|
"private": false,
|
5
5
|
"description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
|
6
6
|
"repository": {
|
@@ -33,31 +33,32 @@
|
|
33
33
|
"requirements": {},
|
34
34
|
"migrations": "./migrations.json",
|
35
35
|
"packageGroup": {
|
36
|
-
"@nrwl/angular": "15.4.
|
37
|
-
"@nrwl/cli": "15.4.
|
38
|
-
"@nrwl/cypress": "15.4.
|
39
|
-
"@nrwl/detox": "15.4.
|
40
|
-
"@nrwl/devkit": "15.4.
|
41
|
-
"@nrwl/esbuild": "15.4.
|
42
|
-
"@nrwl/eslint-plugin-nx": "15.4.
|
43
|
-
"@nrwl/expo": "15.4.
|
44
|
-
"@nrwl/express": "15.4.
|
45
|
-
"@nrwl/jest": "15.4.
|
46
|
-
"@nrwl/js": "15.4.
|
47
|
-
"@nrwl/linter": "15.4.
|
48
|
-
"@nrwl/nest": "15.4.
|
49
|
-
"@nrwl/next": "15.4.
|
50
|
-
"@nrwl/node": "15.4.
|
36
|
+
"@nrwl/angular": "15.4.5",
|
37
|
+
"@nrwl/cli": "15.4.5",
|
38
|
+
"@nrwl/cypress": "15.4.5",
|
39
|
+
"@nrwl/detox": "15.4.5",
|
40
|
+
"@nrwl/devkit": "15.4.5",
|
41
|
+
"@nrwl/esbuild": "15.4.5",
|
42
|
+
"@nrwl/eslint-plugin-nx": "15.4.5",
|
43
|
+
"@nrwl/expo": "15.4.5",
|
44
|
+
"@nrwl/express": "15.4.5",
|
45
|
+
"@nrwl/jest": "15.4.5",
|
46
|
+
"@nrwl/js": "15.4.5",
|
47
|
+
"@nrwl/linter": "15.4.5",
|
48
|
+
"@nrwl/nest": "15.4.5",
|
49
|
+
"@nrwl/next": "15.4.5",
|
50
|
+
"@nrwl/node": "15.4.5",
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
52
|
-
"@nrwl/nx-plugin": "15.4.
|
53
|
-
"@nrwl/react": "15.4.
|
54
|
-
"@nrwl/react
|
55
|
-
"@nrwl/rollup": "15.4.
|
56
|
-
"@nrwl/storybook": "15.4.
|
57
|
-
"@nrwl/tao": "15.4.
|
58
|
-
"@nrwl/
|
59
|
-
"@nrwl/
|
60
|
-
"
|
52
|
+
"@nrwl/nx-plugin": "15.4.5",
|
53
|
+
"@nrwl/react-native": "15.4.5",
|
54
|
+
"@nrwl/react": "15.4.5",
|
55
|
+
"@nrwl/rollup": "15.4.5",
|
56
|
+
"@nrwl/storybook": "15.4.5",
|
57
|
+
"@nrwl/tao": "15.4.5",
|
58
|
+
"@nrwl/vite": "15.4.5",
|
59
|
+
"@nrwl/web": "15.4.5",
|
60
|
+
"@nrwl/webpack": "15.4.5",
|
61
|
+
"nx": "15.4.5"
|
61
62
|
}
|
62
63
|
},
|
63
64
|
"peerDependencies": {
|
@@ -69,8 +70,8 @@
|
|
69
70
|
}
|
70
71
|
},
|
71
72
|
"dependencies": {
|
72
|
-
"@nrwl/devkit": "15.4.
|
73
|
-
"@nrwl/linter": "15.4.
|
73
|
+
"@nrwl/devkit": "15.4.5",
|
74
|
+
"@nrwl/linter": "15.4.5",
|
74
75
|
"@parcel/watcher": "2.0.4",
|
75
76
|
"chalk": "4.1.0",
|
76
77
|
"chokidar": "^3.5.1",
|
@@ -86,7 +87,7 @@
|
|
86
87
|
"jsonc-parser": "3.2.0",
|
87
88
|
"minimatch": "3.0.5",
|
88
89
|
"npm-run-path": "^4.0.1",
|
89
|
-
"nx": "15.4.
|
90
|
+
"nx": "15.4.5",
|
90
91
|
"open": "^8.4.0",
|
91
92
|
"rxjs": "^6.5.4",
|
92
93
|
"semver": "7.3.4",
|
@@ -99,5 +100,5 @@
|
|
99
100
|
"access": "public"
|
100
101
|
},
|
101
102
|
"types": "./index.d.ts",
|
102
|
-
"gitHead": "
|
103
|
+
"gitHead": "0827694421806c23d678806a1a616352bbd2177d"
|
103
104
|
}
|
@@ -27,14 +27,6 @@ function validateSchema(schema) {
|
|
27
27
|
exports.validateSchema = validateSchema;
|
28
28
|
function convertToNxProjectGenerator(host, schema) {
|
29
29
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
30
|
-
const workspace = (0, devkit_1.readWorkspaceConfiguration)(host);
|
31
|
-
if (workspace.version < 2) {
|
32
|
-
devkit_1.logger.error(`
|
33
|
-
NX Only workspaces with version 2+ support project.json files.
|
34
|
-
To upgrade change the version number at the top of ${(0, devkit_1.getWorkspacePath)(host)} and run 'nx format'.
|
35
|
-
`);
|
36
|
-
throw new Error('v2+ Required');
|
37
|
-
}
|
38
30
|
yield validateSchema(schema);
|
39
31
|
const projects = schema.all
|
40
32
|
? (0, devkit_1.getProjects)(host).entries()
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,yCAYsB;AACtB,uCAAkC;AAClC,yFAAiG;AACjG,+BAA+B;AAE/B,2FAAqF;AAExE,QAAA,qCAAqC,GAChD,4CAA4C,CAAC;AAE/C,SAAsB,cAAc,CAAC,MAAc;;QACjD,IAAI,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE;YAChC,MAAM,6CAAqC,CAAC;SAC7C;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YAClC,MAAM,CAAC,OAAO,GAAG,CACf,MAAM,IAAA,iBAAM,EAAsB;gBAChC;oBACE,OAAO,EAAE,mCAAmC;oBAC5C,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,SAAS;iBAChB;aACF,CAAC,CACH,CAAC,OAAO,CAAC;SACX;IACH,CAAC;CAAA;AAhBD,wCAgBC;AAED,SAAsB,2BAA2B,CAAC,IAAU,EAAE,MAAc;;QAC1E,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAE7B,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG;YACzB,CAAC,CAAC,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE;YAC7B,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAG9D,CAAC;QAET,KAAK,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,QAAQ,EAAE;YAC/C,MAAM,UAAU,GAAG,IAAA,4DAA2B,EAAC,aAAa,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBAC3B,eAAM,CAAC,IAAI,CAAC,YAAY,OAAO,UAAU,UAAU,kBAAkB,CAAC,CAAC;gBACvE,SAAS;aACV;YAED,IAAA,kBAAS,EAAC,IAAI,EAAE,UAAU,gCACxB,OAAO,EAAE,IAAA,wDAAgC,EAAC,IAAI,EAAE,aAAa,CAAC,IAC3D,aAAa,KAChB,IAAI,EAAE,SAAS,IACf,CAAC;YAEH,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjD,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAA,sBAAa,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;gBAC7D,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAhCD,kEAgCC;AAED,kBAAe,2BAA2B,CAAC;AAE9B,QAAA,2BAA2B,GAAG,IAAA,2BAAkB,EAC3D,2BAA2B,CAC5B,CAAC"}
|
@@ -10,12 +10,11 @@ const devkit_1 = require("@nrwl/devkit");
|
|
10
10
|
* - change target references
|
11
11
|
*/
|
12
12
|
function updateDefaultProject(tree, schema) {
|
13
|
-
const
|
13
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
14
14
|
// update default project (if necessary)
|
15
|
-
if (
|
16
|
-
|
17
|
-
|
18
|
-
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
|
15
|
+
if (nxJson.defaultProject && nxJson.defaultProject === schema.projectName) {
|
16
|
+
nxJson.defaultProject = schema.newProjectName;
|
17
|
+
(0, devkit_1.updateNxJson)(tree, nxJson);
|
19
18
|
}
|
20
19
|
}
|
21
20
|
exports.updateDefaultProject = updateDefaultProject;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-default-project.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-default-project.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"update-default-project.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-default-project.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAG9D;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAAC,IAAU,EAAE,MAAwB;IACvE,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,wCAAwC;IACxC,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,CAAC,WAAW,EAAE;QACzE,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;QAC9C,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC5B;AACH,CAAC;AARD,oDAQC"}
|
@@ -119,12 +119,12 @@ function createPreset(tree, options) {
|
|
119
119
|
});
|
120
120
|
}
|
121
121
|
else if (options.preset === presets_1.Preset.TS) {
|
122
|
-
const c = (0, devkit_1.
|
122
|
+
const c = (0, devkit_1.readNxJson)(tree);
|
123
123
|
c.workspaceLayout = {
|
124
124
|
appsDir: 'packages',
|
125
125
|
libsDir: 'packages',
|
126
126
|
};
|
127
|
-
(0, devkit_1.
|
127
|
+
(0, devkit_1.updateNxJson)(tree, c);
|
128
128
|
}
|
129
129
|
else {
|
130
130
|
throw new Error(`Invalid preset ${options.preset}`);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,8CAA0C;AAE1C,SAAsB,eAAe,CAAC,IAAU,EAAE,OAAe;;QAC/D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAPD,0CAOC;AAED,kBAAe,eAAe,CAAC;AAE/B,SAAe,YAAY,CAAC,IAAU,EAAE,OAAe;;QACrD,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,EAAE;YACrE,OAAO;SACR;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,eAAe,EAAE;YACpD,MAAM,EACJ,oBAAoB,EAAE,2BAA2B,GAClD,GAAG,OAAO,CAAC,OAAO,GAAG,qBAAqB,CAAC,CAAC;YAE7C,MAAM,2BAA2B,CAAC,IAAI,EAAE;gBACtC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,iBAAiB,EAAE;YACtD,MAAM,EACJ,oBAAoB,EAAE,2BAA2B,GAClD,GAAG,OAAO,CAAC,OAAO,GAAG,qBAAqB,CAAC,CAAC;YAE7C,MAAM,2BAA2B,CAAC,IAAI,EAAE;gBACtC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,aAAa,EAAE;YAClD,MAAM,EACJ,oBAAoB,EAAE,yBAAyB,GAChD,GAAG,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC;YAEhC,MAAM,yBAAyB,CAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,eAAe,EAAE;YACpD,MAAM,EACJ,oBAAoB,EAAE,yBAAyB,GAChD,GAAG,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC;YAEhC,MAAM,yBAAyB,CAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,MAAM;gBACf,aAAa,EAAE,SAAS;gBACxB,cAAc,EAAE,QAAQ;aACzB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,MAAM,EAAE;YAC3C,MAAM,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO;gBACxE,OAAO,CAAC,CAAC;YAEX,MAAM,wBAAwB,CAAC,IAAI,EAAE;gBACnC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,aAAa,EAAE;YAClD,MAAM,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,OAAO;gBACvE,MAAM,CAAC,CAAC;YAEV,MAAM,uBAAuB,CAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,OAAO,EAAE,MAAM;aAChB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,EAAE;YACzC,MAAM,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO;gBACxE,OAAO,CAAC,CAAC;YAEX,MAAM,wBAAwB,CAAC,IAAI,EAAE;gBACnC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,OAAO,EAAE;YAC5C,MAAM,EACJ,oBAAoB,EAAE,2BAA2B,GAClD,GAAG,OAAO,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC;YAClC,MAAM,2BAA2B,CAAC,IAAI,EAAE;gBACtC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,WAAW,EAAE;YAChD,MAAM,EAAE,+BAA+B,EAAE,GAAG,OAAO,CAAC,OAAO;gBACzD,eAAe,CAAC,CAAC;YACnB,MAAM,+BAA+B,CAAC,IAAI,EAAE;gBAC1C,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,aAAa,EAAE,OAAO;aACvB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI,EAAE;YACzC,MAAM,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;YAChE,MAAM,wBAAwB,CAAC,IAAI,EAAE;gBACnC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,aAAa,EAAE,OAAO;aACvB,CAAC,CAAC;SACJ;aAAM,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,EAAE,EAAE;YACvC,MAAM,CAAC,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;YAC3B,CAAC,CAAC,eAAe,GAAG;gBAClB,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE,UAAU;aACpB,CAAC;YACF,IAAA,qBAAY,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SACvB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,kBAAkB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;SACrD;IACH,CAAC;CAAA;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
@@ -2,22 +2,20 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.removeProjectConfig = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const devkit_2 = require("@nrwl/devkit");
|
6
5
|
/**
|
7
6
|
* Deletes the project from the workspace file
|
8
7
|
*
|
9
8
|
* @param schema The options provided to the schematic
|
10
9
|
*/
|
11
10
|
function removeProjectConfig(tree, schema) {
|
12
|
-
(0,
|
11
|
+
(0, devkit_1.removeProjectConfiguration)(tree, schema.projectName);
|
13
12
|
// Unset default project if deleting the default project
|
14
|
-
const
|
15
|
-
if (
|
16
|
-
|
17
|
-
|
18
|
-
delete workspaceConfiguration.defaultProject;
|
13
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
14
|
+
if (nxJson.defaultProject && nxJson.defaultProject === schema.projectName) {
|
15
|
+
const workspacePath = (0, devkit_1.getWorkspacePath)(tree);
|
16
|
+
delete nxJson.defaultProject;
|
19
17
|
console.warn(`Default project was removed in ${workspacePath} because it was "${schema.projectName}". If you want a default project you should define a new one.`);
|
20
|
-
(0, devkit_1.
|
18
|
+
(0, devkit_1.updateNxJson)(tree, nxJson);
|
21
19
|
}
|
22
20
|
// Remove implicit dependencies onto removed project
|
23
21
|
(0, devkit_1.getProjects)(tree).forEach((project, projectName) => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"remove-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-config.ts"],"names":[],"mappings":";;;AACA,
|
1
|
+
{"version":3,"file":"remove-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-config.ts"],"names":[],"mappings":";;;AACA,yCAQsB;AAEtB;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;IAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,wDAAwD;IACxD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,CAAC,WAAW,EAAE;QACzE,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,MAAM,CAAC,cAAc,CAAC;QAC7B,OAAO,CAAC,IAAI,CACV,kCAAkC,aAAa,oBAAoB,MAAM,CAAC,WAAW,+DAA+D,CACrJ,CAAC;QAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC5B;IAED,oDAAoD;IACpD,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;QACjD,IACE,OAAO,CAAC,oBAAoB;YAC5B,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAC/B,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,CACpD,EACD;YACA,OAAO,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAChE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,CACpD,CAAC;YACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;SACxD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA7BD,kDA6BC"}
|
@@ -7,7 +7,7 @@ const output_1 = require("../../utilities/output");
|
|
7
7
|
function setTargetDependencies(host) {
|
8
8
|
var _a, _b, _c, _d, _e, _f, _g;
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
10
|
-
const config = (0, devkit_1.
|
10
|
+
const config = (0, devkit_1.readNxJson)(host);
|
11
11
|
const strictlyOrderedTargets = ((_c = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.strictlyOrderedTargets) || ['build'];
|
12
12
|
(_f = (_e = (_d = config.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d['default']) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? true : delete _f.strictlyOrderedTargets;
|
13
13
|
config.targetDependencies = (_g = config.targetDependencies) !== null && _g !== void 0 ? _g : {};
|
@@ -20,7 +20,7 @@ function setTargetDependencies(host) {
|
|
20
20
|
updatedStrictlyOrderedTargets.push(target);
|
21
21
|
}
|
22
22
|
});
|
23
|
-
(0, devkit_1.
|
23
|
+
(0, devkit_1.updateNxJson)(host, config);
|
24
24
|
if (updatedStrictlyOrderedTargets.length > 0) {
|
25
25
|
output_1.output.note({
|
26
26
|
title: 'Target dependencies have been updated in nx.json',
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"add-target-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-12-5-0/add-target-dependencies.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"add-target-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-12-5-0/add-target-dependencies.ts"],"names":[],"mappings":";;;;AAAA,yCAA2E;AAC3E,mDAAgD;AAEhD,SAAsB,qBAAqB,CAAC,IAAU;;;QACpD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,sBAAsB,GAAG,CAAA,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,0CAC1E,sBAAsB,KAAI,CAAC,OAAO,CAAC,CAAC;QACjC,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,+CAClD,sBAAsB,CAAC;QAC3B,MAAM,CAAC,kBAAkB,GAAG,MAAA,MAAM,CAAC,kBAAkB,mCAAI,EAAE,CAAC;QAE5D,MAAM,6BAA6B,GAAG,EAAE,CAAC;QACzC,sBAAsB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;gBACtC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG;oBAClC,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE;iBACrC,CAAC;gBACF,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3B,IAAI,6BAA6B,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5C,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,kDAAkD;gBACzD,SAAS,EAAE;oBACT,2EAA2E;oBAC3E,0GAA0G,6BAA6B,CAAC,IAAI,CAC1I,IAAI,CACL,GAAG;oBACJ,gEAAgE;iBACjE;aACF,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjCD,sDAiCC;AAED,kBAAe,qBAAqB,CAAC"}
|
@@ -7,11 +7,11 @@ function update(tree) {
|
|
7
7
|
const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
|
8
8
|
// updateProjectConfiguration automatically saves the project opts into workspace/project.json
|
9
9
|
if (nxJson.projects) {
|
10
|
-
Object.entries(nxJson.projects).forEach(([p,
|
10
|
+
Object.entries(nxJson.projects).forEach(([p, nxJsonConfiguration]) => {
|
11
11
|
var _a, _b;
|
12
12
|
const configuration = (0, devkit_1.readProjectConfiguration)(tree, p);
|
13
|
-
(_a = configuration.tags) !== null && _a !== void 0 ? _a : (configuration.tags =
|
14
|
-
(_b = configuration.implicitDependencies) !== null && _b !== void 0 ? _b : (configuration.implicitDependencies =
|
13
|
+
(_a = configuration.tags) !== null && _a !== void 0 ? _a : (configuration.tags = nxJsonConfiguration.tags);
|
14
|
+
(_b = configuration.implicitDependencies) !== null && _b !== void 0 ? _b : (configuration.implicitDependencies = nxJsonConfiguration.implicitDependencies);
|
15
15
|
(0, devkit_1.updateProjectConfiguration)(tree, p, configuration);
|
16
16
|
});
|
17
17
|
delete nxJson.projects;
|
@@ -37,25 +37,25 @@ function movePropertiesAreInNewLocations(tree) {
|
|
37
37
|
if (!workspacePath) {
|
38
38
|
return;
|
39
39
|
}
|
40
|
-
const
|
40
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
41
41
|
(0, devkit_1.updateJson)(tree, workspacePath, (json) => {
|
42
42
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
43
43
|
var _j, _k;
|
44
|
-
(_a =
|
45
|
-
if (
|
46
|
-
(_c = (_j =
|
47
|
-
(_e = (_k =
|
44
|
+
(_a = nxJson.generators) !== null && _a !== void 0 ? _a : (nxJson.generators = (_b = json.generators) !== null && _b !== void 0 ? _b : json.schematics);
|
45
|
+
if (nxJson.cli) {
|
46
|
+
(_c = (_j = nxJson.cli).defaultCollection) !== null && _c !== void 0 ? _c : (_j.defaultCollection = (_d = json.cli) === null || _d === void 0 ? void 0 : _d.defaultCollection);
|
47
|
+
(_e = (_k = nxJson.cli).packageManager) !== null && _e !== void 0 ? _e : (_k.packageManager = (_f = json.cli) === null || _f === void 0 ? void 0 : _f.packageManager);
|
48
48
|
}
|
49
49
|
else if (json.cli) {
|
50
|
-
(_g =
|
50
|
+
(_g = nxJson.cli) !== null && _g !== void 0 ? _g : (nxJson.cli = json.cli);
|
51
51
|
}
|
52
|
-
(_h =
|
52
|
+
(_h = nxJson.defaultProject) !== null && _h !== void 0 ? _h : (nxJson.defaultProject = json.defaultProject);
|
53
53
|
delete json.cli;
|
54
54
|
delete json.defaultProject;
|
55
55
|
delete json.schematics;
|
56
56
|
delete json.generators;
|
57
57
|
return json;
|
58
58
|
});
|
59
|
-
(0, devkit_1.
|
59
|
+
(0, devkit_1.updateNxJson)(tree, nxJson);
|
60
60
|
}
|
61
61
|
//# sourceMappingURL=config-locations.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"config-locations.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/migrations/update-13-0-0/config-locations/config-locations.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"config-locations.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/migrations/update-13-0-0/config-locations/config-locations.ts"],"names":[],"mappings":";;;AAAA,yCAasB;AAEtB,SAA8B,MAAM,CAAC,IAAU;;QAC7C,MAAM,MAAM,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAKtC,CAAC;QACF,8FAA8F;QAC9F,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC,EAAE,EAAE;;gBACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACxD,MAAA,aAAa,CAAC,IAAI,oCAAlB,aAAa,CAAC,IAAI,GAAK,mBAAmB,CAAC,IAAI,EAAC;gBAChD,MAAA,aAAa,CAAC,oBAAoB,oCAAlC,aAAa,CAAC,oBAAoB,GAChC,mBAAmB,CAAC,oBAAoB,EAAC;gBAC3C,IAAA,mCAA0B,EAAC,IAAI,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,QAAQ,CAAC;SACxB;QAED,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEnC,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC,oCAAoC;QAE3E,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAxBD,yBAwBC;AAED;;;;;GAKG;AACH,SAAS,+BAA+B,CAAC,IAAU;IACjD,8EAA8E;IAC9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC3B,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO;KACR;IACD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,IAAA,mBAAU,EAAsB,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;;;QAC5D,MAAA,MAAM,CAAC,UAAU,oCAAjB,MAAM,CAAC,UAAU,GAAK,MAAA,IAAI,CAAC,UAAU,mCAAK,IAAY,CAAC,UAAU,EAAC;QAClE,IAAI,MAAM,CAAC,GAAG,EAAE;YACd,YAAA,MAAM,CAAC,GAAG,EAAC,iBAAiB,uCAAjB,iBAAiB,GAAK,MAAA,IAAI,CAAC,GAAG,0CAAE,iBAAiB,EAAC;YAC7D,YAAA,MAAM,CAAC,GAAG,EAAC,cAAc,uCAAd,cAAc,GAAK,MAAA,IAAI,CAAC,GAAG,0CAAE,cAAc,EAAC;SACxD;aAAM,IAAI,IAAI,CAAC,GAAG,EAAE;YACnB,MAAA,MAAM,CAAC,GAAG,oCAAV,MAAM,CAAC,GAAG,GAAK,IAAI,CAAC,GAAG,EAAC;SACzB;QACD,MAAA,MAAM,CAAC,cAAc,oCAArB,MAAM,CAAC,cAAc,GAAK,IAAI,CAAC,cAAc,EAAC;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC;QAC3B,OAAQ,IAAY,CAAC,UAAU,CAAC;QAChC,OAAO,IAAI,CAAC,UAAU,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC"}
|
@@ -8,7 +8,7 @@ function setDefaultBaseIfNotSet(host) {
|
|
8
8
|
var _a, _b, _c;
|
9
9
|
var _d;
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
11
|
-
const config = (0, devkit_1.
|
11
|
+
const config = (0, devkit_1.readNxJson)(host);
|
12
12
|
if (!((_a = config.affected) === null || _a === void 0 ? void 0 : _a.defaultBase)) {
|
13
13
|
(_b = config.affected) !== null && _b !== void 0 ? _b : (config.affected = {});
|
14
14
|
(_c = (_d = config.affected).defaultBase) !== null && _c !== void 0 ? _c : (_d.defaultBase = 'master');
|
@@ -21,7 +21,7 @@ function setDefaultBaseIfNotSet(host) {
|
|
21
21
|
],
|
22
22
|
});
|
23
23
|
}
|
24
|
-
(0, devkit_1.
|
24
|
+
(0, devkit_1.updateNxJson)(host, config);
|
25
25
|
yield (0, devkit_1.formatFiles)(host);
|
26
26
|
});
|
27
27
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"set-default-base-if-not-set.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-0-0/set-default-base-if-not-set.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"set-default-base-if-not-set.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-0-0/set-default-base-if-not-set.ts"],"names":[],"mappings":";;;;AAAA,yCAA2E;AAC3E,mDAAgD;AAEhD,SAAsB,sBAAsB,CAAC,IAAU;;;;QACrD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,CAAA,EAAE;YACjC,MAAA,MAAM,CAAC,QAAQ,oCAAf,MAAM,CAAC,QAAQ,GAAK,EAAE,EAAC;YACvB,YAAA,MAAM,CAAC,QAAQ,EAAC,WAAW,uCAAX,WAAW,GAAK,QAAQ,EAAC;YAEzC,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,sCAAsC;gBAC7C,SAAS,EAAE;oBACT,+CAA+C;oBAC/C,0FAA0F;oBAC1F,kDAAkD;iBACnD;aACF,CAAC,CAAC;SACJ;QACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjBD,wDAiBC;AAED,kBAAe,sBAAsB,CAAC"}
|
@@ -4,13 +4,13 @@ exports.updateTasksRunner = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
function updateTasksRunner(host) {
|
6
6
|
var _a;
|
7
|
-
const config = (0, devkit_1.
|
7
|
+
const config = (0, devkit_1.readNxJson)(host);
|
8
8
|
if (((_a = config === null || config === void 0 ? void 0 : config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) &&
|
9
9
|
(config === null || config === void 0 ? void 0 : config.tasksRunnerOptions['default'].runner) ==
|
10
10
|
'@nrwl/workspace/tasks-runners/default') {
|
11
11
|
config.tasksRunnerOptions['default'].runner = 'nx/tasks-runners/default';
|
12
12
|
}
|
13
|
-
(0, devkit_1.
|
13
|
+
(0, devkit_1.updateNxJson)(host, config);
|
14
14
|
}
|
15
15
|
exports.updateTasksRunner = updateTasksRunner;
|
16
16
|
exports.default = updateTasksRunner;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-tasks-runner.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-10-0/update-tasks-runner.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"update-tasks-runner.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-10-0/update-tasks-runner.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAE9D,SAAgB,iBAAiB,CAAC,IAAU;;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,IACE,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,0CAAG,SAAS,CAAC;QACvC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC,SAAS,EAAE,MAAM;YAC1C,uCAAuC,EACzC;QACA,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,0BAA0B,CAAC;KAC1E;IACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAVD,8CAUC;AAED,kBAAe,iBAAiB,CAAC"}
|
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function setParallelDefault(host) {
|
7
7
|
var _a, _b;
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
9
|
-
const config = (0, devkit_1.
|
9
|
+
const config = (0, devkit_1.readNxJson)(host);
|
10
10
|
const defaultTaskRunnerOptions = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
|
11
11
|
if (defaultTaskRunnerOptions) {
|
12
12
|
if (defaultTaskRunnerOptions.parallel) {
|
@@ -17,7 +17,7 @@ function setParallelDefault(host) {
|
|
17
17
|
else {
|
18
18
|
defaultTaskRunnerOptions.parallel = 1;
|
19
19
|
}
|
20
|
-
(0, devkit_1.
|
20
|
+
(0, devkit_1.updateNxJson)(host, config);
|
21
21
|
}
|
22
22
|
yield (0, devkit_1.formatFiles)(host);
|
23
23
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"set-parallel-default.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-2-0/set-parallel-default.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"set-parallel-default.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-2-0/set-parallel-default.ts"],"names":[],"mappings":";;;;AAAA,yCAA2E;AAE3E,SAAsB,kBAAkB,CAAC,IAAU;;;QACjD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,wBAAwB,GAC5B,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,CAAC;QAClD,IAAI,wBAAwB,EAAE;YAC5B,IAAI,wBAAwB,CAAC,QAAQ,EAAE;gBACrC,wBAAwB,CAAC,QAAQ;oBAC/B,wBAAwB,CAAC,WAAW,IAAI,CAAC,CAAC;gBAC5C,OAAO,wBAAwB,CAAC,WAAW,CAAC;aAC7C;iBAAM;gBACL,wBAAwB,CAAC,QAAQ,GAAG,CAAC,CAAC;aACvC;YACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5B;QACD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAfD,gDAeC;AAED,kBAAe,kBAAkB,CAAC"}
|
@@ -4,12 +4,12 @@ exports.removeOldTaskRunnerOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
function removeOldTaskRunnerOptions(host) {
|
6
6
|
var _a, _b;
|
7
|
-
const
|
8
|
-
const options = (_b = (_a =
|
7
|
+
const nxJson = (0, devkit_1.readNxJson)(host);
|
8
|
+
const options = (_b = (_a = nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
|
9
9
|
if (options) {
|
10
10
|
delete options.scan;
|
11
11
|
delete options.analytics;
|
12
|
-
(0, devkit_1.
|
12
|
+
(0, devkit_1.updateNxJson)(host, nxJson);
|
13
13
|
}
|
14
14
|
}
|
15
15
|
exports.removeOldTaskRunnerOptions = removeOldTaskRunnerOptions;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"remove-old-task-runner-options.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"remove-old-task-runner-options.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAE9D,SAAgB,0BAA0B,CAAC,IAAU;;IACnD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,CAAC;IAChE,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC,SAAS,CAAC;QACzB,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC5B;AACH,CAAC;AARD,gEAQC;AAED,kBAAe,0BAA0B,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"change-npm-script-executor.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-14-0-0/change-npm-script-executor.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"change-npm-script-executor.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-14-0-0/change-npm-script-executor.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,iGAA8F;AAE9F,SAAsB,uBAAuB,CAAC,IAAU;;QACtD,IAAA,+CAAsB,EACpB,IAAI,EACJ,4BAA4B,EAC5B,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAChC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9D,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEnD,YAAY,CAAC,QAAQ,GAAG,eAAe,CAAC;YAExC,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAC3D,CAAC,CACF,CAAC;QAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAfD,0DAeC;AAED,kBAAe,uBAAuB,CAAC"}
|
@@ -5,13 +5,13 @@ const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
function changeNxJsonPresets(tree) {
|
7
7
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
8
|
-
const
|
8
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
9
9
|
const replacements = {
|
10
10
|
'@nrwl/workspace/presets/npm.json': 'nx/presets/npm.json',
|
11
11
|
'@nrwl/workspace/presets/core.json': 'nx/presets/core.json',
|
12
12
|
};
|
13
|
-
if (
|
14
|
-
(0, devkit_1.
|
13
|
+
if (nxJson.extends && replacements[nxJson.extends]) {
|
14
|
+
(0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { extends: replacements[nxJson.extends] }));
|
15
15
|
}
|
16
16
|
yield (0, devkit_1.formatFiles)(tree);
|
17
17
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"change-nx-json-presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-14-0-0/change-nx-json-presets.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"change-nx-json-presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-14-0-0/change-nx-json-presets.ts"],"names":[],"mappings":";;;;AAAA,yCAA2E;AAE3E,SAAsB,mBAAmB,CAAC,IAAU;;QAClD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,YAAY,GAAG;YACnB,kCAAkC,EAAE,qBAAqB;YACzD,mCAAmC,EAAE,sBAAsB;SAC5D,CAAC;QACF,IAAI,MAAM,CAAC,OAAO,IAAI,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YAClD,IAAA,qBAAY,EAAC,IAAI,kCACZ,MAAM,KACT,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,IACrC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAdD,kDAcC;AAED,kBAAe,mBAAmB,CAAC"}
|
@@ -207,7 +207,7 @@ function updatePaths(dependencies, paths) {
|
|
207
207
|
// Bind secondary endpoints for ng-packagr projects
|
208
208
|
let mappedPaths = dep.outputs.map((output) => `${output}/${nestedPart}`);
|
209
209
|
// Get the dependency's package name
|
210
|
-
const { root } = ((_a = dep.node) === null || _a === void 0 ? void 0 : _a.data) || {};
|
210
|
+
const { root } = (((_a = dep.node) === null || _a === void 0 ? void 0 : _a.data) || {});
|
211
211
|
if (root) {
|
212
212
|
// Update nested mappings to point to the dependency's output paths
|
213
213
|
mappedPaths = mappedPaths.concat(paths[path].flatMap((path) => dep.outputs.map((output) => path.replace(root, output))));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":"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"}
|
@@ -12,13 +12,13 @@ const devkit_1 = require("@nrwl/devkit");
|
|
12
12
|
* @param collectionName Name of the collection to be set as the default
|
13
13
|
*/
|
14
14
|
function setDefaultCollection(host, collectionName) {
|
15
|
-
const
|
16
|
-
|
17
|
-
const defaultCollection =
|
15
|
+
const nxJson = (0, devkit_1.readNxJson)(host);
|
16
|
+
nxJson.cli = nxJson.cli || {};
|
17
|
+
const defaultCollection = nxJson.cli.defaultCollection;
|
18
18
|
if (!defaultCollection || defaultCollection === '@nrwl/workspace') {
|
19
|
-
|
19
|
+
nxJson.cli.defaultCollection = collectionName;
|
20
20
|
}
|
21
|
-
(0, devkit_1.
|
21
|
+
(0, devkit_1.updateNxJson)(host, nxJson);
|
22
22
|
}
|
23
23
|
exports.setDefaultCollection = setDefaultCollection;
|
24
24
|
//# sourceMappingURL=set-default-collection.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"set-default-collection.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/set-default-collection.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"set-default-collection.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/set-default-collection.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAE9D;;;;;;;;GAQG;AACH,SAAgB,oBAAoB,CAAC,IAAU,EAAE,cAAsB;IACrE,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;IAE9B,MAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAEvD,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,KAAK,iBAAiB,EAAE;QACjE,MAAM,CAAC,GAAG,CAAC,iBAAiB,GAAG,cAAc,CAAC;KAC/C;IAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAXD,oDAWC"}
|