@nrwl/workspace 14.7.16 → 14.7.18
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 +27 -27
- package/src/generators/move/lib/move-project-configuration.js +3 -0
- package/src/generators/move/lib/move-project-configuration.js.map +1 -1
- package/src/generators/move/lib/update-build-targets.js +21 -12
- package/src/generators/move/lib/update-build-targets.js.map +1 -1
- package/src/generators/new/new.js +11 -14
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/remove/lib/remove-project-config.js +3 -2
- package/src/generators/remove/lib/remove-project-config.js.map +1 -1
- package/src/generators/workspace/workspace.js +0 -18
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/utils/cli-config-utils.js +1 -0
- package/src/utils/cli-config-utils.js.map +1 -1
- package/src/utils/rules/format-files.js +6 -6
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/generators/workspace/files/__workspaceFile__.json__tmpl__ +0 -5
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
|
-
## [14.7.
|
|
6
|
+
## [14.7.18](https://github.com/nrwl/nx/compare/14.7.17...14.7.18) (2022-09-28)
|
|
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": "14.7.
|
|
3
|
+
"version": "14.7.18",
|
|
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,28 +33,28 @@
|
|
|
33
33
|
"requirements": {},
|
|
34
34
|
"migrations": "./migrations.json",
|
|
35
35
|
"packageGroup": {
|
|
36
|
-
"@nrwl/angular": "14.7.
|
|
37
|
-
"@nrwl/cypress": "14.7.
|
|
38
|
-
"@nrwl/devkit": "14.7.
|
|
39
|
-
"@nrwl/eslint-plugin-nx": "14.7.
|
|
40
|
-
"@nrwl/express": "14.7.
|
|
41
|
-
"@nrwl/jest": "14.7.
|
|
42
|
-
"@nrwl/linter": "14.7.
|
|
43
|
-
"@nrwl/nest": "14.7.
|
|
44
|
-
"@nrwl/next": "14.7.
|
|
45
|
-
"@nrwl/node": "14.7.
|
|
46
|
-
"@nrwl/nx-plugin": "14.7.
|
|
47
|
-
"@nrwl/react": "14.7.
|
|
48
|
-
"@nrwl/storybook": "14.7.
|
|
49
|
-
"@nrwl/web": "14.7.
|
|
50
|
-
"@nrwl/js": "14.7.
|
|
51
|
-
"@nrwl/cli": "14.7.
|
|
52
|
-
"@nrwl/tao": "14.7.
|
|
36
|
+
"@nrwl/angular": "14.7.18",
|
|
37
|
+
"@nrwl/cypress": "14.7.18",
|
|
38
|
+
"@nrwl/devkit": "14.7.18",
|
|
39
|
+
"@nrwl/eslint-plugin-nx": "14.7.18",
|
|
40
|
+
"@nrwl/express": "14.7.18",
|
|
41
|
+
"@nrwl/jest": "14.7.18",
|
|
42
|
+
"@nrwl/linter": "14.7.18",
|
|
43
|
+
"@nrwl/nest": "14.7.18",
|
|
44
|
+
"@nrwl/next": "14.7.18",
|
|
45
|
+
"@nrwl/node": "14.7.18",
|
|
46
|
+
"@nrwl/nx-plugin": "14.7.18",
|
|
47
|
+
"@nrwl/react": "14.7.18",
|
|
48
|
+
"@nrwl/storybook": "14.7.18",
|
|
49
|
+
"@nrwl/web": "14.7.18",
|
|
50
|
+
"@nrwl/js": "14.7.18",
|
|
51
|
+
"@nrwl/cli": "14.7.18",
|
|
52
|
+
"@nrwl/tao": "14.7.18",
|
|
53
53
|
"@nrwl/nx-cloud": "latest",
|
|
54
|
-
"@nrwl/react-native": "14.7.
|
|
55
|
-
"@nrwl/expo": "14.7.
|
|
56
|
-
"@nrwl/detox": "14.7.
|
|
57
|
-
"nx": "14.7.
|
|
54
|
+
"@nrwl/react-native": "14.7.18",
|
|
55
|
+
"@nrwl/expo": "14.7.18",
|
|
56
|
+
"@nrwl/detox": "14.7.18",
|
|
57
|
+
"nx": "14.7.18"
|
|
58
58
|
}
|
|
59
59
|
},
|
|
60
60
|
"peerDependencies": {
|
|
@@ -66,9 +66,9 @@
|
|
|
66
66
|
}
|
|
67
67
|
},
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@nrwl/devkit": "14.7.
|
|
70
|
-
"@nrwl/jest": "14.7.
|
|
71
|
-
"@nrwl/linter": "14.7.
|
|
69
|
+
"@nrwl/devkit": "14.7.18",
|
|
70
|
+
"@nrwl/jest": "14.7.18",
|
|
71
|
+
"@nrwl/linter": "14.7.18",
|
|
72
72
|
"@parcel/watcher": "2.0.4",
|
|
73
73
|
"chalk": "4.1.0",
|
|
74
74
|
"chokidar": "^3.5.1",
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"ignore": "^5.0.4",
|
|
84
84
|
"minimatch": "3.0.5",
|
|
85
85
|
"npm-run-path": "^4.0.1",
|
|
86
|
-
"nx": "14.7.
|
|
86
|
+
"nx": "14.7.18",
|
|
87
87
|
"open": "^8.4.0",
|
|
88
88
|
"rxjs": "^6.5.4",
|
|
89
89
|
"semver": "7.3.4",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
"access": "public"
|
|
97
97
|
},
|
|
98
98
|
"types": "./index.d.ts",
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "5025c300b72948081218db474fa9fb5b8f741340"
|
|
100
100
|
}
|
|
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.moveProjectConfiguration = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
function moveProjectConfiguration(tree, schema, projectConfig) {
|
|
6
|
+
if (projectConfig.name) {
|
|
7
|
+
projectConfig.name = schema.newProjectName;
|
|
8
|
+
}
|
|
6
9
|
const isStandalone = (0, devkit_1.isStandaloneProject)(tree, schema.projectName);
|
|
7
10
|
const projectString = JSON.stringify(projectConfig);
|
|
8
11
|
const newProjectString = projectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move-project-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/move-project-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,SAAgB,wBAAwB,CACtC,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,MAAM,YAAY,GAAG,IAAA,4BAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACnE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IAEF,SAAS;IACT,MAAM,UAAU,GAAyB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtE,8BAA8B;IAC9B,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,8CAA8C;IAC9C,IAAA,gCAAuB,EACrB,IAAI,EACJ,MAAM,CAAC,cAAc,EACrB,UAAU,EACV,YAAY,CACb,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"move-project-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/move-project-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,SAAgB,wBAAwB,CACtC,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,IAAI,aAAa,CAAC,IAAI,EAAE;QACtB,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;KAC5C;IAED,MAAM,YAAY,GAAG,IAAA,4BAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IACnE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IAEF,SAAS;IACT,MAAM,UAAU,GAAyB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtE,8BAA8B;IAC9B,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,8CAA8C;IAC9C,IAAA,gCAAuB,EACrB,IAAI,EACJ,MAAM,CAAC,cAAc,EACrB,UAAU,EACV,YAAY,CACb,CAAC;AACJ,CAAC;AA7BD,4DA6BC"}
|
|
@@ -7,26 +7,32 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
7
7
|
*/
|
|
8
8
|
function updateBuildTargets(tree, schema) {
|
|
9
9
|
(0, devkit_1.getProjects)(tree).forEach((projectConfig, project) => {
|
|
10
|
+
let changed = false;
|
|
10
11
|
Object.entries(projectConfig.targets || {}).forEach(([target, targetConfig]) => {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
12
|
+
changed =
|
|
13
|
+
updateJsonValue(targetConfig, (value) => {
|
|
14
|
+
const [project, target, configuration] = value.split(':');
|
|
15
|
+
if (project === schema.projectName && target) {
|
|
16
|
+
return configuration
|
|
17
|
+
? `${schema.newProjectName}:${target}:${configuration}`
|
|
18
|
+
: `${schema.newProjectName}:${target}`;
|
|
19
|
+
}
|
|
20
|
+
}) || changed;
|
|
19
21
|
});
|
|
20
|
-
(
|
|
22
|
+
if (changed) {
|
|
23
|
+
(0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
|
|
24
|
+
}
|
|
21
25
|
});
|
|
22
26
|
}
|
|
23
27
|
exports.updateBuildTargets = updateBuildTargets;
|
|
24
28
|
function updateJsonValue(config, callback) {
|
|
25
29
|
function recur(obj, key, value) {
|
|
30
|
+
let changed = false;
|
|
26
31
|
if (typeof value === 'string') {
|
|
27
32
|
const result = callback(value);
|
|
28
|
-
if (result) {
|
|
33
|
+
if (result && obj[key] !== result) {
|
|
29
34
|
obj[key] = result;
|
|
35
|
+
changed = true;
|
|
30
36
|
}
|
|
31
37
|
}
|
|
32
38
|
else if (Array.isArray(value)) {
|
|
@@ -34,12 +40,15 @@ function updateJsonValue(config, callback) {
|
|
|
34
40
|
}
|
|
35
41
|
else if (typeof value === 'object') {
|
|
36
42
|
Object.entries(value).forEach(([k, v]) => {
|
|
37
|
-
recur(value, k, v);
|
|
43
|
+
changed = recur(value, k, v) || changed;
|
|
38
44
|
});
|
|
39
45
|
}
|
|
46
|
+
return changed;
|
|
40
47
|
}
|
|
48
|
+
let changed = false;
|
|
41
49
|
Object.entries(config).forEach(([k, v]) => {
|
|
42
|
-
recur(config, k, v);
|
|
50
|
+
changed = recur(config, k, v) || changed;
|
|
43
51
|
});
|
|
52
|
+
return changed;
|
|
44
53
|
}
|
|
45
54
|
//# sourceMappingURL=update-build-targets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-build-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-build-targets.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,MAAwB;IACrE,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE;QACnD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CACjD,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE;YACzB,eAAe,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"update-build-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-build-targets.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,MAAwB;IACrE,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,OAAO,EAAE,EAAE;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CACjD,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE;YACzB,OAAO;gBACL,eAAe,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;oBACtC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC1D,IAAI,OAAO,KAAK,MAAM,CAAC,WAAW,IAAI,MAAM,EAAE;wBAC5C,OAAO,aAAa;4BAClB,CAAC,CAAC,GAAG,MAAM,CAAC,cAAc,IAAI,MAAM,IAAI,aAAa,EAAE;4BACvD,CAAC,CAAC,GAAG,MAAM,CAAC,cAAc,IAAI,MAAM,EAAE,CAAC;qBAC1C;gBACH,CAAC,CAAC,IAAI,OAAO,CAAC;QAClB,CAAC,CACF,CAAC;QACF,IAAI,OAAO,EAAE;YACX,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;SAC1D;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AApBD,gDAoBC;AAED,SAAS,eAAe,CACtB,MAA2B,EAC3B,QAAsC;IAEtC,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK;QAC5B,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,MAAM,EAAE;gBACjC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;gBAClB,OAAO,GAAG,IAAI,CAAC;aAChB;SACF;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;SACjD;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACvC,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC;YAC1C,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACxC,OAAO,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -202,7 +202,7 @@ function setDefaultLinter(host, options) {
|
|
|
202
202
|
* This sets ESLint as the default for any schematics that default to TSLint
|
|
203
203
|
*/
|
|
204
204
|
function setESLintDefault(host, options) {
|
|
205
|
-
(0, devkit_1.updateJson)(host,
|
|
205
|
+
(0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
|
|
206
206
|
setDefault(json, '@nrwl/angular', 'application', 'linter', 'eslint');
|
|
207
207
|
setDefault(json, '@nrwl/angular', 'library', 'linter', 'eslint');
|
|
208
208
|
setDefault(json, '@nrwl/angular', 'storybook-configuration', 'linter', 'eslint');
|
|
@@ -213,7 +213,7 @@ function setESLintDefault(host, options) {
|
|
|
213
213
|
* This sets TSLint as the default for any schematics that default to ESLint
|
|
214
214
|
*/
|
|
215
215
|
function setTSLintDefault(host, options) {
|
|
216
|
-
(0, devkit_1.updateJson)(host,
|
|
216
|
+
(0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
|
|
217
217
|
setDefault(json, '@nrwl/workspace', 'library', 'linter', 'tslint');
|
|
218
218
|
setDefault(json, '@nrwl/cypress', 'cypress-project', 'linter', 'tslint');
|
|
219
219
|
setDefault(json, '@nrwl/cypress', 'cypress-project', 'linter', 'tslint');
|
|
@@ -226,22 +226,19 @@ function setTSLintDefault(host, options) {
|
|
|
226
226
|
return json;
|
|
227
227
|
});
|
|
228
228
|
}
|
|
229
|
-
function getWorkspacePath(host, { directory, cli }) {
|
|
230
|
-
return (0, path_1.join)(directory, cli === 'angular' ? 'angular.json' : 'workspace.json');
|
|
231
|
-
}
|
|
232
229
|
function setDefault(json, collectionName, generatorName, key, value) {
|
|
233
|
-
if (!json.
|
|
234
|
-
json.
|
|
235
|
-
if (json.
|
|
236
|
-
json.
|
|
237
|
-
json.
|
|
230
|
+
if (!json.generators)
|
|
231
|
+
json.generators = {};
|
|
232
|
+
if (json.generators[collectionName] &&
|
|
233
|
+
json.generators[collectionName][generatorName]) {
|
|
234
|
+
json.generators[collectionName][generatorName][key] = value;
|
|
238
235
|
}
|
|
239
|
-
else if (json.
|
|
240
|
-
json.
|
|
236
|
+
else if (json.generators[`${collectionName}:${generatorName}`]) {
|
|
237
|
+
json.generators[`${collectionName}:${generatorName}`][key] = value;
|
|
241
238
|
}
|
|
242
239
|
else {
|
|
243
|
-
json.
|
|
244
|
-
json.
|
|
240
|
+
json.generators[collectionName] = json.generators[collectionName] || {};
|
|
241
|
+
json.generators[collectionName][generatorName] = { [key]: value };
|
|
245
242
|
}
|
|
246
243
|
}
|
|
247
244
|
//# sourceMappingURL=new.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,10 +21,11 @@ function removeProjectConfig(tree, schema) {
|
|
|
21
21
|
}
|
|
22
22
|
// Remove implicit dependencies onto removed project
|
|
23
23
|
(0, devkit_1.getProjects)(tree).forEach((project, projectName) => {
|
|
24
|
-
if (project.implicitDependencies
|
|
24
|
+
if (project.implicitDependencies &&
|
|
25
|
+
project.implicitDependencies.some((projectName) => projectName === schema.projectName)) {
|
|
25
26
|
project.implicitDependencies = project.implicitDependencies.filter((projectName) => projectName !== schema.projectName);
|
|
27
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
|
|
26
28
|
}
|
|
27
|
-
(0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
|
|
28
29
|
});
|
|
29
30
|
}
|
|
30
31
|
exports.removeProjectConfig = removeProjectConfig;
|
|
@@ -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,yCAKsB;AACtB,yCAIsB;AAEtB;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;IAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,wDAAwD;IACxD,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAChE,IACE,sBAAsB,CAAC,cAAc;QACrC,sBAAsB,CAAC,cAAc,KAAK,MAAM,CAAC,WAAW,EAC5D;QACA,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,sBAAsB,CAAC,cAAc,CAAC;QAC7C,OAAO,CAAC,IAAI,CACV,kCAAkC,aAAa,oBAAoB,MAAM,CAAC,WAAW,+DAA+D,CACrJ,CAAC;QAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;KAC5D;IAED,oDAAoD;IACpD,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;QACjD,
|
|
1
|
+
{"version":3,"file":"remove-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-config.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,yCAIsB;AAEtB;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;IAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,wDAAwD;IACxD,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAChE,IACE,sBAAsB,CAAC,cAAc;QACrC,sBAAsB,CAAC,cAAc,KAAK,MAAM,CAAC,WAAW,EAC5D;QACA,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,sBAAsB,CAAC,cAAc,CAAC;QAC7C,OAAO,CAAC,IAAI,CACV,kCAAkC,aAAa,oBAAoB,MAAM,CAAC,WAAW,+DAA+D,CACrJ,CAAC;QAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;KAC5D;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;AAhCD,kDAgCC"}
|
|
@@ -6,7 +6,6 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const versions_1 = require("../../utils/versions");
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
-
const workspaces_1 = require("nx/src/config/workspaces");
|
|
10
9
|
const presets_1 = require("../utils/presets");
|
|
11
10
|
const default_base_1 = require("../../utilities/default-base");
|
|
12
11
|
exports.DEFAULT_NRWL_PRETTIER_CONFIG = {
|
|
@@ -95,22 +94,6 @@ function createNpmrc(host, options) {
|
|
|
95
94
|
function createYarnrcYml(host, options) {
|
|
96
95
|
host.write((0, path_1.join)(options.directory, '.yarnrc.yml'), 'nodeLinker: node-modules\n');
|
|
97
96
|
}
|
|
98
|
-
function formatWorkspaceJson(host, options) {
|
|
99
|
-
const path = (0, path_1.join)(options.directory, options.cli === 'angular' ? 'angular.json' : 'workspace.json');
|
|
100
|
-
try {
|
|
101
|
-
(0, devkit_1.updateJson)(host, path, (workspaceJson) => {
|
|
102
|
-
const reformatted = (0, workspaces_1.reformattedWorkspaceJsonOrNull)(workspaceJson);
|
|
103
|
-
if (reformatted) {
|
|
104
|
-
return reformatted;
|
|
105
|
-
}
|
|
106
|
-
return workspaceJson;
|
|
107
|
-
});
|
|
108
|
-
}
|
|
109
|
-
catch (e) {
|
|
110
|
-
console.error(`Failed to format: ${path}`);
|
|
111
|
-
console.error(e);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
97
|
function addNpmScripts(host, options) {
|
|
115
98
|
if (options.cli === 'angular') {
|
|
116
99
|
(0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'package.json'), (json) => {
|
|
@@ -157,7 +140,6 @@ function workspaceGenerator(host, options) {
|
|
|
157
140
|
addNpmScripts(host, options);
|
|
158
141
|
createAppsAndLibsFolders(host, options);
|
|
159
142
|
yield (0, devkit_1.formatFiles)(host);
|
|
160
|
-
formatWorkspaceJson(host, options);
|
|
161
143
|
});
|
|
162
144
|
}
|
|
163
145
|
exports.workspaceGenerator = workspaceGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":";;;;AAAA,yCAWsB;AAEtB,mDAK8B;AAC9B,2BAAkC;AAClC,+BAA8C;
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ function replaceAppNameWithPath(node, appName, root) {
|
|
|
56
56
|
'tags',
|
|
57
57
|
'defaultConfiguration',
|
|
58
58
|
'maximumError',
|
|
59
|
+
'name',
|
|
59
60
|
]; // Some of the properties should not be renamed
|
|
60
61
|
return Object.keys(node).reduce((m, c) => ((m[c] = !forbiddenPropertyList.includes(c)
|
|
61
62
|
? replaceAppNameWithPath(node[c], appName, root)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-config-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/cli-config-utils.ts"],"names":[],"mappings":";;;AAEA,2CAA6C;AAI7C,SAAgB,gBAAgB,CAAC,IAAU;IACzC,MAAM,aAAa,GAAG,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC3D,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC;AAHD,4CAGC;AAED,SAAgB,WAAW,CAAC,IAAU;IACpC,OAAO,IAAA,0BAAc,EAAsB,IAAI,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC;AACvE,CAAC;AAFD,kCAEC;AAED,SAAgB,WAAW,CAAC,YAAoB;IAC9C,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1D,OAAO;QACL,OAAO;QACP,MAAM;QACN,MAAM;KACP,CAAC;AACJ,CAAC;AAPD,kCAOC;AAED,SAAgB,UAAU,CAAC,YAAoB,EAAE,QAAQ;IACvD,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;IAC/C,OAAO,eAAe,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;AACjD,CAAC;AAHD,gCAGC;AAED,SAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE;IACzD,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtE,CAAC;AAFD,0CAEC;AAED,SAAgB,sBAAsB,CACpC,IAAS,EACT,OAAe,EACf,IAAY;IAEZ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,YAAY,GAAG,IAAI,MAAM,CAC7B,eAAe,OAAO,QAAQ,OAAO,eAAe,EACpD,IAAI,CACL,CAAC;QACF,IACE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;YAC1B,IAAI,KAAK,aAAa;YACtB,IAAI,KAAK,SAAS,EAClB;YACA,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACtC,OAAO,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;gBACnD,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC,CAAC;SACP;aAAM;YACL,OAAO,IAAI,CAAC;SACb;KACF;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;KAClE;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,EAAE;QAC3C,MAAM,qBAAqB,GAAa;YACtC,QAAQ;YACR,SAAS;YACT,UAAU;YACV,eAAe;YACf,MAAM;YACN,sBAAsB;YACtB,cAAc;
|
|
1
|
+
{"version":3,"file":"cli-config-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/cli-config-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,18 +57,18 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
|
57
57
|
exports.formatFiles = formatFiles;
|
|
58
58
|
function updateWorkspaceJsonToMatchFormatVersion(host) {
|
|
59
59
|
const workspaceConfigPath = (0, workspaces_1.workspaceConfigName)(devkit_1.workspaceRoot);
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
if (workspaceConfigPath) {
|
|
61
|
+
try {
|
|
62
62
|
const workspaceJson = (0, devkit_2.parseJson)(host.read(workspaceConfigPath).toString());
|
|
63
63
|
const reformatted = (0, workspaces_1.reformattedWorkspaceJsonOrNull)(workspaceJson);
|
|
64
64
|
if (reformatted) {
|
|
65
65
|
host.overwrite(workspaceConfigPath, (0, devkit_2.serializeJson)(reformatted));
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
68
|
+
catch (e) {
|
|
69
|
+
console.error(`Failed to format workspace config: ${workspaceConfigPath}`);
|
|
70
|
+
console.error(e);
|
|
71
|
+
}
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
//# sourceMappingURL=format-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/format-files.ts"],"names":[],"mappings":";;;;AAAA,2DAOoC;AACpC,+BAA4B;AAC5B,8CAAuD;AACvD,6BAA6B;AAC7B,yCAA6C;AAC7C,yDAGkC;AAClC,yCAAwD;AAExD,SAAgB,WAAW,CACzB,UAAmC,EAAE,UAAU,EAAE,KAAK,EAAE,EACxD,YAAoB,EAAE;IAEtB,IAAI,QAAQ,CAAC;IACb,IAAI;QACF,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;KAChC;IAAC,OAAO,CAAC,EAAE,GAAE;IAEd,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,OAAO,IAAA,iBAAI,GAAE,CAAC;KACf;IAED,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,uCAAuC,CAAC,IAAI,CAAC,CAAC;QAE9C,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QAED,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,IAAI,CAAC,OAAO;aACT,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,CAAC;aAC9D,GAAG,CAAC,CAAC,MAA8C,EAAE,EAAE,CAAC,CAAC;YACxD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;SACnC,CAAC,CAAC,CACN,CAAC;QACF,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;YACpB,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAA,WAAI,EAAC,KAAK,CAAC,CAAC,IAAI,CACrB,IAAA,kBAAM,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EACxC,IAAA,oBAAQ,EAAC,CAAO,IAAI,EAAE,EAAE;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,OAAO,GAAQ;gBACjB,QAAQ,EAAE,UAAU;aACrB,CAAC;YACF,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACjE,IAAI,eAAe,EAAE;gBACnB,OAAO,mCACF,OAAO,GACP,eAAe,CACnB,CAAC;aACH;YACD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAChE,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAC9C,OAAO;aACR;YAED,IAAI;gBACF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;aACnE;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,oBAAoB,IAAI,CAAC,IAAI,YAAY,CAAC,CAAC,OAAO,EAAE,CACrD,CAAC;aACH;QACH,CAAC,CAAA,CAAC,EACF,IAAA,eAAG,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAChB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AA7DD,kCA6DC;AAED,SAAS,uCAAuC,CAAC,IAAU;IACzD,MAAM,mBAAmB,GAAG,IAAA,gCAAmB,EAAC,sBAAa,CAAC,CAAC;IAE/D,IAAI
|
|
1
|
+
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/format-files.ts"],"names":[],"mappings":"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"}
|