@nrwl/workspace 15.6.2 → 15.7.0-beta.0
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/README.md +1 -1
- package/generators.json +3 -22
- package/index.d.ts +0 -2
- package/index.js +1 -5
- package/index.js.map +1 -1
- package/migrations.json +6 -0
- package/package.json +30 -31
- package/src/generators/ci-workflow/schema.json +1 -1
- package/src/generators/convert-to-nx-project/convert-to-nx-project.d.ts +1 -2
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +49 -28
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
- package/src/generators/convert-to-nx-project/schema.d.ts +2 -0
- package/src/generators/convert-to-nx-project/schema.json +7 -3
- package/src/generators/library/library.js +1 -1
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +2 -1
- package/src/generators/move/lib/move-project-configuration.js +1 -2
- package/src/generators/move/lib/move-project-configuration.js.map +1 -1
- package/src/generators/move/lib/update-implicit-dependencies.d.ts +0 -2
- package/src/generators/move/lib/update-implicit-dependencies.js +0 -2
- package/src/generators/move/lib/update-implicit-dependencies.js.map +1 -1
- package/src/generators/new/new.js +0 -3
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/npm-package/npm-package.js +3 -6
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/generators/preset/preset.js +3 -12
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/preset/schema.json +3 -1
- package/src/generators/remove/lib/remove-project-references-in-config.d.ts +3 -0
- package/src/generators/remove/lib/{remove-project-config.js → remove-project-references-in-config.js} +4 -12
- package/src/generators/remove/lib/remove-project-references-in-config.js.map +1 -0
- package/src/generators/remove/remove.js +2 -2
- package/src/generators/remove/remove.js.map +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +1 -28
- package/src/migrations/update-13-0-0/config-locations/config-locations.js.map +1 -1
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.d.ts +3 -0
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js +15 -0
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js.map +1 -0
- package/src/utils/cli-config-utils.d.ts +3 -0
- package/src/utils/cli-config-utils.js +3 -0
- package/src/utils/cli-config-utils.js.map +1 -1
- package/src/utils/rules/format-files.js +0 -19
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.d.ts +0 -2
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js +0 -9
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js.map +0 -1
- package/src/generators/remove/lib/remove-project-config.d.ts +0 -8
- package/src/generators/remove/lib/remove-project-config.js.map +0 -1
- package/src/utils/rules/check-project-exists.d.ts +0 -10
- package/src/utils/rules/check-project-exists.js +0 -24
- package/src/utils/rules/check-project-exists.js.map +0 -1
- package/src/utils/rules/rename-npm-packages.d.ts +0 -10
- package/src/utils/rules/rename-npm-packages.js +0 -81
- package/src/utils/rules/rename-npm-packages.js.map +0 -1
- package/src/utils/rules/rename-package-imports.d.ts +0 -10
- package/src/utils/rules/rename-package-imports.js +0 -59
- package/src/utils/rules/rename-package-imports.js.map +0 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+BAA4B;AAC5B,4CAAkD;AAMlD,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,QAAQ,CACf,WAAmB,EACnB,IAAU,EACV,QAAgB,EAChB,OAAuB;IAEvB,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE;QAC/B,IAAI,EAAE,IAAA,oBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;QAC3C,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE;YACP,IAAI,EAAE,eAAe;SACtB;KACF,CAAC,CAAC;IAEH,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAuB;;QAC3E,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1C,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAE1E,IAAI,OAAO,EAAE;YACX,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAnBD,kDAmBC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
|
@@ -17,7 +17,7 @@ function presetGenerator(tree, options) {
|
|
17
17
|
exports.presetGenerator = presetGenerator;
|
18
18
|
exports.default = presetGenerator;
|
19
19
|
function createPreset(tree, options) {
|
20
|
-
var _a;
|
20
|
+
var _a, _b;
|
21
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
22
22
|
if (options.preset === presets_1.Preset.Empty || options.preset === presets_1.Preset.Apps) {
|
23
23
|
return;
|
@@ -28,7 +28,6 @@ function createPreset(tree, options) {
|
|
28
28
|
name: options.name,
|
29
29
|
style: options.style,
|
30
30
|
linter: options.linter,
|
31
|
-
standaloneConfig: options.standaloneConfig,
|
32
31
|
});
|
33
32
|
}
|
34
33
|
else if (options.preset === presets_1.Preset.AngularStandalone) {
|
@@ -37,7 +36,6 @@ function createPreset(tree, options) {
|
|
37
36
|
name: options.name,
|
38
37
|
style: options.style,
|
39
38
|
linter: options.linter,
|
40
|
-
standaloneConfig: options.standaloneConfig,
|
41
39
|
rootProject: true,
|
42
40
|
});
|
43
41
|
}
|
@@ -47,8 +45,7 @@ function createPreset(tree, options) {
|
|
47
45
|
name: options.name,
|
48
46
|
style: options.style,
|
49
47
|
linter: options.linter,
|
50
|
-
|
51
|
-
bundler: 'webpack',
|
48
|
+
bundler: (_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack',
|
52
49
|
});
|
53
50
|
}
|
54
51
|
else if (options.preset === presets_1.Preset.ReactStandalone) {
|
@@ -57,9 +54,8 @@ function createPreset(tree, options) {
|
|
57
54
|
name: options.name,
|
58
55
|
style: options.style,
|
59
56
|
linter: options.linter,
|
60
|
-
standaloneConfig: options.standaloneConfig,
|
61
57
|
rootProject: true,
|
62
|
-
bundler: (
|
58
|
+
bundler: (_b = options.bundler) !== null && _b !== void 0 ? _b : 'vite',
|
63
59
|
e2eTestRunner: 'cypress',
|
64
60
|
unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
|
65
61
|
});
|
@@ -71,7 +67,6 @@ function createPreset(tree, options) {
|
|
71
67
|
name: options.name,
|
72
68
|
style: options.style,
|
73
69
|
linter: options.linter,
|
74
|
-
standaloneConfig: options.standaloneConfig,
|
75
70
|
});
|
76
71
|
}
|
77
72
|
else if (options.preset === presets_1.Preset.WebComponents) {
|
@@ -81,7 +76,6 @@ function createPreset(tree, options) {
|
|
81
76
|
name: options.name,
|
82
77
|
style: options.style,
|
83
78
|
linter: options.linter,
|
84
|
-
standaloneConfig: options.standaloneConfig,
|
85
79
|
bundler: 'vite',
|
86
80
|
});
|
87
81
|
}
|
@@ -98,7 +92,6 @@ function createPreset(tree, options) {
|
|
98
92
|
yield expressApplicationGenerator(tree, {
|
99
93
|
name: options.name,
|
100
94
|
linter: options.linter,
|
101
|
-
standaloneConfig: options.standaloneConfig,
|
102
95
|
});
|
103
96
|
}
|
104
97
|
else if (options.preset === presets_1.Preset.ReactNative) {
|
@@ -107,7 +100,6 @@ function createPreset(tree, options) {
|
|
107
100
|
yield reactNativeApplicationGenerator(tree, {
|
108
101
|
name: options.name,
|
109
102
|
linter: options.linter,
|
110
|
-
standaloneConfig: options.standaloneConfig,
|
111
103
|
e2eTestRunner: 'detox',
|
112
104
|
});
|
113
105
|
}
|
@@ -116,7 +108,6 @@ function createPreset(tree, options) {
|
|
116
108
|
yield expoApplicationGenerator(tree, {
|
117
109
|
name: options.name,
|
118
110
|
linter: options.linter,
|
119
|
-
standaloneConfig: options.standaloneConfig,
|
120
111
|
e2eTestRunner: 'detox',
|
121
112
|
});
|
122
113
|
}
|
@@ -1 +1 @@
|
|
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;
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
@@ -57,7 +57,9 @@
|
|
57
57
|
},
|
58
58
|
"standaloneConfig": {
|
59
59
|
"description": "Split the project configurations into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
60
|
-
"type": "boolean"
|
60
|
+
"type": "boolean",
|
61
|
+
"default": true,
|
62
|
+
"x-deprecated": "Nx only supports standaloneConfig"
|
61
63
|
},
|
62
64
|
"packageManager": {
|
63
65
|
"description": "The package manager used to install dependencies.",
|
@@ -1,20 +1,12 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.
|
3
|
+
exports.removeProjectReferencesInConfig = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
|
6
|
-
* Deletes the project from the workspace file
|
7
|
-
*
|
8
|
-
* @param schema The options provided to the schematic
|
9
|
-
*/
|
10
|
-
function removeProjectConfig(tree, schema) {
|
11
|
-
(0, devkit_1.removeProjectConfiguration)(tree, schema.projectName);
|
5
|
+
function removeProjectReferencesInConfig(tree, schema) {
|
12
6
|
// Unset default project if deleting the default project
|
13
7
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
14
8
|
if (nxJson.defaultProject && nxJson.defaultProject === schema.projectName) {
|
15
|
-
const workspacePath = (0, devkit_1.getWorkspacePath)(tree);
|
16
9
|
delete nxJson.defaultProject;
|
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.`);
|
18
10
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
19
11
|
}
|
20
12
|
// Remove implicit dependencies onto removed project
|
@@ -26,5 +18,5 @@ function removeProjectConfig(tree, schema) {
|
|
26
18
|
}
|
27
19
|
});
|
28
20
|
}
|
29
|
-
exports.
|
30
|
-
//# sourceMappingURL=remove-project-config.js.map
|
21
|
+
exports.removeProjectReferencesInConfig = removeProjectReferencesInConfig;
|
22
|
+
//# sourceMappingURL=remove-project-references-in-config.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"remove-project-references-in-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-references-in-config.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AAEtB,SAAgB,+BAA+B,CAAC,IAAU,EAAE,MAAc;IACxE,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,OAAO,MAAM,CAAC,cAAc,CAAC;QAC7B,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;AAtBD,0EAsBC"}
|
@@ -7,7 +7,7 @@ const check_dependencies_1 = require("./lib/check-dependencies");
|
|
7
7
|
const check_targets_1 = require("./lib/check-targets");
|
8
8
|
const remove_project_1 = require("./lib/remove-project");
|
9
9
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
10
|
-
const
|
10
|
+
const remove_project_references_in_config_1 = require("./lib/remove-project-references-in-config");
|
11
11
|
const update_jest_config_1 = require("./lib/update-jest-config");
|
12
12
|
function removeGenerator(tree, schema) {
|
13
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
@@ -15,7 +15,7 @@ function removeGenerator(tree, schema) {
|
|
15
15
|
yield (0, check_dependencies_1.checkDependencies)(tree, schema);
|
16
16
|
yield (0, check_targets_1.checkTargets)(tree, schema);
|
17
17
|
(0, update_jest_config_1.updateJestConfig)(tree, schema, project);
|
18
|
-
(0,
|
18
|
+
(0, remove_project_references_in_config_1.removeProjectReferencesInConfig)(tree, schema);
|
19
19
|
(0, remove_project_1.removeProject)(tree, project);
|
20
20
|
yield (0, update_tsconfig_1.updateTsconfig)(tree, schema);
|
21
21
|
if (!schema.skipFormat) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/remove/remove.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/remove/remove.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,iEAA6D;AAC7D,uDAAmD;AACnD,yDAAqD;AACrD,2DAAuD;AACvD,mGAA4F;AAE5F,iEAA4D;AAE5D,SAAsB,eAAe,CAAC,IAAU,EAAE,MAAc;;QAC9D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QACnE,MAAM,IAAA,sCAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtC,MAAM,IAAA,4BAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjC,IAAA,qCAAgB,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxC,IAAA,qEAA+B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,MAAM,IAAA,gCAAc,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAXD,0CAWC;AAED,kBAAe,eAAe,CAAC;AAElB,QAAA,eAAe,GAAG,IAAA,2BAAkB,EAAC,eAAe,CAAC,CAAC"}
|
@@ -29,33 +29,6 @@ exports.default = update;
|
|
29
29
|
* correctly.
|
30
30
|
*/
|
31
31
|
function movePropertiesAreInNewLocations(tree) {
|
32
|
-
|
33
|
-
if (!tree.exists('nx.json')) {
|
34
|
-
return;
|
35
|
-
}
|
36
|
-
const workspacePath = (0, devkit_1.getWorkspacePath)(tree);
|
37
|
-
if (!workspacePath) {
|
38
|
-
return;
|
39
|
-
}
|
40
|
-
const nxJson = (0, devkit_1.readNxJson)(tree);
|
41
|
-
(0, devkit_1.updateJson)(tree, workspacePath, (json) => {
|
42
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
43
|
-
var _j, _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
|
-
}
|
49
|
-
else if (json.cli) {
|
50
|
-
(_g = nxJson.cli) !== null && _g !== void 0 ? _g : (nxJson.cli = json.cli);
|
51
|
-
}
|
52
|
-
(_h = nxJson.defaultProject) !== null && _h !== void 0 ? _h : (nxJson.defaultProject = json.defaultProject);
|
53
|
-
delete json.cli;
|
54
|
-
delete json.defaultProject;
|
55
|
-
delete json.schematics;
|
56
|
-
delete json.generators;
|
57
|
-
return json;
|
58
|
-
});
|
59
|
-
(0, devkit_1.updateNxJson)(tree, nxJson);
|
32
|
+
return;
|
60
33
|
}
|
61
34
|
//# 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,yCASsB;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,OAAO;AACT,CAAC"}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.splitConfigurationIntoProjectJsonFiles = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
6
|
+
const convert_to_nx_project_1 = require("@nrwl/workspace/src/generators/convert-to-nx-project/convert-to-nx-project");
|
7
|
+
function splitConfigurationIntoProjectJsonFiles(tree) {
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
9
|
+
yield (0, convert_to_nx_project_1.default)(tree, { all: true });
|
10
|
+
yield (0, devkit_1.formatFiles)(tree);
|
11
|
+
});
|
12
|
+
}
|
13
|
+
exports.splitConfigurationIntoProjectJsonFiles = splitConfigurationIntoProjectJsonFiles;
|
14
|
+
exports.default = splitConfigurationIntoProjectJsonFiles;
|
15
|
+
//# sourceMappingURL=split-configuration-into-project-json-files.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"split-configuration-into-project-json-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-15-7-0/split-configuration-into-project-json-files.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AACjD,sHAA4G;AAE5G,SAAsB,sCAAsC,CAAC,IAAU;;QACrE,MAAM,IAAA,+BAAkB,EAAC,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAHD,wFAGC;AAED,kBAAe,sCAAsC,CAAC"}
|
@@ -1,4 +1,7 @@
|
|
1
1
|
import { Tree } from '@angular-devkit/schematics';
|
2
|
+
/**
|
3
|
+
* @deprecated Nx no longer supports workspace.json
|
4
|
+
*/
|
2
5
|
export declare function getWorkspacePath(host: Tree): string;
|
3
6
|
export declare function getNpmScope(host: Tree): string;
|
4
7
|
export declare function parseTarget(targetString: string): {
|
@@ -2,6 +2,9 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.replaceAppNameWithPath = exports.serializeTarget = exports.editTarget = exports.parseTarget = exports.getNpmScope = exports.getWorkspacePath = void 0;
|
4
4
|
const ast_utils_1 = require("./ast-utils");
|
5
|
+
/**
|
6
|
+
* @deprecated Nx no longer supports workspace.json
|
7
|
+
*/
|
5
8
|
function getWorkspacePath(host) {
|
6
9
|
const possibleFiles = ['/angular.json', '/workspace.json'];
|
7
10
|
return possibleFiles.filter((path) => host.exists(path))[0];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cli-config-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/cli-config-utils.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"cli-config-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/cli-config-utils.ts"],"names":[],"mappings":"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"}
|
@@ -7,8 +7,6 @@ const rxjs_1 = require("rxjs");
|
|
7
7
|
const operators_1 = require("rxjs/operators");
|
8
8
|
const path = require("path");
|
9
9
|
const devkit_1 = require("@nrwl/devkit");
|
10
|
-
const workspaces_1 = require("nx/src/config/workspaces");
|
11
|
-
const devkit_2 = require("@nrwl/devkit");
|
12
10
|
function formatFiles(options = { skipFormat: false }, directory = '') {
|
13
11
|
let prettier;
|
14
12
|
try {
|
@@ -19,7 +17,6 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
19
17
|
return (0, schematics_1.noop)();
|
20
18
|
}
|
21
19
|
return (host, context) => {
|
22
|
-
updateWorkspaceJsonToMatchFormatVersion(host);
|
23
20
|
if (!prettier) {
|
24
21
|
return host;
|
25
22
|
}
|
@@ -55,20 +52,4 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
55
52
|
};
|
56
53
|
}
|
57
54
|
exports.formatFiles = formatFiles;
|
58
|
-
function updateWorkspaceJsonToMatchFormatVersion(host) {
|
59
|
-
const workspaceConfigPath = (0, workspaces_1.workspaceConfigName)(devkit_1.workspaceRoot);
|
60
|
-
if (workspaceConfigPath) {
|
61
|
-
try {
|
62
|
-
const workspaceJson = (0, devkit_2.parseJson)(host.read(workspaceConfigPath).toString());
|
63
|
-
const reformatted = (0, workspaces_1.reformattedWorkspaceJsonOrNull)(workspaceJson);
|
64
|
-
if (reformatted) {
|
65
|
-
host.overwrite(workspaceConfigPath, (0, devkit_2.serializeJson)(reformatted));
|
66
|
-
}
|
67
|
-
}
|
68
|
-
catch (e) {
|
69
|
-
console.error(`Failed to format workspace config: ${workspaceConfigPath}`);
|
70
|
-
console.error(e);
|
71
|
-
}
|
72
|
-
}
|
73
|
-
}
|
74
55
|
//# 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;
|
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;AAE7C,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,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;AA3DD,kCA2DC"}
|
@@ -1,9 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.getProjectConfigurationPath = void 0;
|
4
|
-
const path_1 = require("path");
|
5
|
-
function getProjectConfigurationPath(configuration) {
|
6
|
-
return (0, path_1.join)(configuration.root, 'project.json');
|
7
|
-
}
|
8
|
-
exports.getProjectConfigurationPath = getProjectConfigurationPath;
|
9
|
-
//# sourceMappingURL=get-project-configuration-path.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"get-project-configuration-path.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/convert-to-nx-project/utils/get-project-configuration-path.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAE5B,SAAgB,2BAA2B,CACzC,aAAmC;IAEnC,OAAO,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AAClD,CAAC;AAJD,kEAIC"}
|
@@ -1,8 +0,0 @@
|
|
1
|
-
import { Schema } from '../schema';
|
2
|
-
import { Tree } from '@nrwl/devkit';
|
3
|
-
/**
|
4
|
-
* Deletes the project from the workspace file
|
5
|
-
*
|
6
|
-
* @param schema The options provided to the schematic
|
7
|
-
*/
|
8
|
-
export declare function removeProjectConfig(tree: Tree, schema: Schema): void;
|
@@ -1 +0,0 @@
|
|
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"}
|
@@ -1,10 +0,0 @@
|
|
1
|
-
import { Rule } from '@angular-devkit/schematics';
|
2
|
-
/**
|
3
|
-
* Checks whether the project exists in the workspace.
|
4
|
-
* Throws an Error if the project is not found.
|
5
|
-
*
|
6
|
-
* @param schema The options provided to the schematic
|
7
|
-
*/
|
8
|
-
export declare function checkProjectExists(schema: {
|
9
|
-
projectName: string;
|
10
|
-
}): Rule;
|
@@ -1,24 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.checkProjectExists = void 0;
|
4
|
-
const rxjs_1 = require("rxjs");
|
5
|
-
const operators_1 = require("rxjs/operators");
|
6
|
-
const workspace_1 = require("../workspace");
|
7
|
-
/**
|
8
|
-
* Checks whether the project exists in the workspace.
|
9
|
-
* Throws an Error if the project is not found.
|
10
|
-
*
|
11
|
-
* @param schema The options provided to the schematic
|
12
|
-
*/
|
13
|
-
function checkProjectExists(schema) {
|
14
|
-
return (tree, _context) => {
|
15
|
-
return (0, rxjs_1.from)((0, workspace_1.getWorkspace)(tree)).pipe((0, operators_1.map)((workspace) => {
|
16
|
-
if (!workspace.projects.has(schema.projectName)) {
|
17
|
-
throw new Error(`Project not found in workspace: [${schema.projectName}]`);
|
18
|
-
}
|
19
|
-
return tree;
|
20
|
-
}));
|
21
|
-
};
|
22
|
-
}
|
23
|
-
exports.checkProjectExists = checkProjectExists;
|
24
|
-
//# sourceMappingURL=check-project-exists.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"check-project-exists.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/check-project-exists.ts"],"names":[],"mappings":";;;AACA,+BAAwC;AACxC,8CAAqC;AACrC,4CAA4C;AAE5C;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,MAA+B;IAChE,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAoB,EAAE;QAClE,OAAO,IAAA,WAAI,EAAC,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAClC,IAAA,eAAG,EAAC,CAAC,SAAS,EAAE,EAAE;YAChB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;gBAC/C,MAAM,IAAI,KAAK,CACb,oCAAoC,MAAM,CAAC,WAAW,GAAG,CAC1D,CAAC;aACH;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAdD,gDAcC"}
|
@@ -1,10 +0,0 @@
|
|
1
|
-
import { Rule, Tree, SchematicContext } from '@angular-devkit/schematics';
|
2
|
-
export interface PackageRenameMapping {
|
3
|
-
[packageName: string]: string | [newPackageName: string, version: string];
|
4
|
-
}
|
5
|
-
/**
|
6
|
-
* Updates all the imports in the workspace, and adjust the package.json appropriately.
|
7
|
-
*
|
8
|
-
* @param packageNameMapping The packageNameMapping provided to the schematic
|
9
|
-
*/
|
10
|
-
export declare function renameNpmPackages(packageRenameMapping: PackageRenameMapping): (tree: Tree, context: SchematicContext) => Rule;
|
@@ -1,81 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.renameNpmPackages = void 0;
|
4
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
5
|
-
const ast_utils_1 = require("../ast-utils");
|
6
|
-
const rename_package_imports_1 = require("./rename-package-imports");
|
7
|
-
const format_files_1 = require("./format-files");
|
8
|
-
const normalizeToDescriptors = (packageJson) => ([packageName, newPackageNameConfig]) => {
|
9
|
-
const isDevDep = !!packageJson.devDependencies &&
|
10
|
-
packageName in packageJson.devDependencies;
|
11
|
-
const inPackageJson = (packageJson.dependencies && packageName in packageJson.dependencies) ||
|
12
|
-
isDevDep;
|
13
|
-
const newPackageName = Array.isArray(newPackageNameConfig)
|
14
|
-
? newPackageNameConfig[0]
|
15
|
-
: newPackageNameConfig;
|
16
|
-
const version = Array.isArray(newPackageNameConfig) && newPackageNameConfig[1]
|
17
|
-
? newPackageNameConfig[1]
|
18
|
-
: isDevDep
|
19
|
-
? packageJson.devDependencies[packageName]
|
20
|
-
: packageJson.dependencies[packageName];
|
21
|
-
return {
|
22
|
-
packageName,
|
23
|
-
newPackageName,
|
24
|
-
version,
|
25
|
-
isDevDep,
|
26
|
-
inPackageJson,
|
27
|
-
};
|
28
|
-
};
|
29
|
-
/**
|
30
|
-
* Updates all the imports in the workspace, and adjust the package.json appropriately.
|
31
|
-
*
|
32
|
-
* @param packageNameMapping The packageNameMapping provided to the schematic
|
33
|
-
*/
|
34
|
-
function renameNpmPackages(packageRenameMapping) {
|
35
|
-
return (tree, context) => {
|
36
|
-
const pkg = (0, ast_utils_1.readJsonInTree)(tree, 'package.json');
|
37
|
-
const renameDescriptors = Object.entries(packageRenameMapping).map(normalizeToDescriptors(pkg));
|
38
|
-
// if you don't find the packageName in package.json abort
|
39
|
-
if (renameDescriptors.filter(({ inPackageJson }) => inPackageJson).length ===
|
40
|
-
0) {
|
41
|
-
return (0, schematics_1.noop)();
|
42
|
-
}
|
43
|
-
const packageNameMapping = renameDescriptors.reduce((mapping, { packageName, newPackageName }) => {
|
44
|
-
mapping[packageName] = newPackageName;
|
45
|
-
return mapping;
|
46
|
-
}, {});
|
47
|
-
const depAdditions = renameDescriptors.reduce((mapping, { newPackageName, version, isDevDep }) => {
|
48
|
-
if (!isDevDep) {
|
49
|
-
mapping[newPackageName] = version;
|
50
|
-
}
|
51
|
-
return mapping;
|
52
|
-
}, {});
|
53
|
-
const devDepAdditions = renameDescriptors.reduce((mapping, { newPackageName, version, isDevDep }) => {
|
54
|
-
if (isDevDep) {
|
55
|
-
mapping[newPackageName] = version;
|
56
|
-
}
|
57
|
-
return mapping;
|
58
|
-
}, {});
|
59
|
-
return (0, schematics_1.chain)([
|
60
|
-
// rename all the imports before the package.json changes and we can't find the imports
|
61
|
-
(0, rename_package_imports_1.renamePackageImports)(packageNameMapping),
|
62
|
-
// add the new name at either the old version or a new version
|
63
|
-
(0, ast_utils_1.addDepsToPackageJson)(depAdditions, devDepAdditions),
|
64
|
-
// delete the old entry from the package.json
|
65
|
-
(0, ast_utils_1.updateJsonInTree)('package.json', (json) => {
|
66
|
-
renameDescriptors.forEach(({ packageName, isDevDep }) => {
|
67
|
-
if (isDevDep) {
|
68
|
-
delete json.devDependencies[packageName];
|
69
|
-
}
|
70
|
-
else {
|
71
|
-
delete json.dependencies[packageName];
|
72
|
-
}
|
73
|
-
});
|
74
|
-
return json;
|
75
|
-
}),
|
76
|
-
(0, format_files_1.formatFiles)(),
|
77
|
-
]);
|
78
|
-
};
|
79
|
-
}
|
80
|
-
exports.renameNpmPackages = renameNpmPackages;
|
81
|
-
//# sourceMappingURL=rename-npm-packages.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"rename-npm-packages.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/rename-npm-packages.ts"],"names":[],"mappings":"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"}
|
@@ -1,10 +0,0 @@
|
|
1
|
-
import { Rule } from '@angular-devkit/schematics';
|
2
|
-
export interface PackageNameMapping {
|
3
|
-
[packageName: string]: string;
|
4
|
-
}
|
5
|
-
/**
|
6
|
-
* Updates all the imports found in the workspace
|
7
|
-
*
|
8
|
-
* @param packageNameMapping The packageNameMapping provided to the schematic
|
9
|
-
*/
|
10
|
-
export declare function renamePackageImports(packageNameMapping: PackageNameMapping): Rule;
|
@@ -1,59 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.renamePackageImports = void 0;
|
4
|
-
const tslib_1 = require("tslib");
|
5
|
-
const ts = require("typescript");
|
6
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
7
|
-
const workspace_1 = require("../workspace");
|
8
|
-
const visit_not_ignored_files_1 = require("./visit-not-ignored-files");
|
9
|
-
const ast_utils_1 = require("../ast-utils");
|
10
|
-
const typescript_1 = require("nx/src/utils/typescript");
|
11
|
-
const core_1 = require("@angular-devkit/core");
|
12
|
-
/**
|
13
|
-
* Updates all the imports found in the workspace
|
14
|
-
*
|
15
|
-
* @param packageNameMapping The packageNameMapping provided to the schematic
|
16
|
-
*/
|
17
|
-
function renamePackageImports(packageNameMapping) {
|
18
|
-
return (tree, _context) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
19
|
-
const workspace = yield (0, workspace_1.getWorkspace)(tree);
|
20
|
-
const rules = [];
|
21
|
-
workspace.projects.forEach((project) => {
|
22
|
-
rules.push((0, visit_not_ignored_files_1.visitNotIgnoredFiles)((file) => {
|
23
|
-
if (!/([jt])sx?$/.test(file)) {
|
24
|
-
return;
|
25
|
-
}
|
26
|
-
const contents = tree.read(file).toString('utf-8');
|
27
|
-
const fileIncludesPackageToRename = Object.keys(packageNameMapping).some((packageName) => {
|
28
|
-
return contents.includes(packageName);
|
29
|
-
});
|
30
|
-
if (!fileIncludesPackageToRename) {
|
31
|
-
return;
|
32
|
-
}
|
33
|
-
const astSource = ts.createSourceFile(file, contents, ts.ScriptTarget.Latest, true);
|
34
|
-
const changes = Object.entries(packageNameMapping)
|
35
|
-
.map(([packageName, newPackageName]) => {
|
36
|
-
const nodes = (0, typescript_1.findNodes)(astSource, ts.SyntaxKind.ImportDeclaration);
|
37
|
-
return nodes
|
38
|
-
.filter((node) => {
|
39
|
-
return (
|
40
|
-
// remove quotes from module name
|
41
|
-
node.moduleSpecifier.getText().slice(1).slice(0, -1) ===
|
42
|
-
packageName);
|
43
|
-
})
|
44
|
-
.map((node) => new ast_utils_1.ReplaceChange(file, node.moduleSpecifier.getStart(), node.moduleSpecifier.getText(), `'${newPackageName}'`));
|
45
|
-
})
|
46
|
-
// .flatMap()/.flat() is not available? So, here's a flat poly
|
47
|
-
.reduce((acc, val) => acc.concat(val), []);
|
48
|
-
// if the reference to packageName was in fact an import statement
|
49
|
-
if (changes.length > 0) {
|
50
|
-
// update the file in the tree
|
51
|
-
(0, ast_utils_1.insert)(tree, file, changes);
|
52
|
-
}
|
53
|
-
}, (0, core_1.normalize)(project.root)));
|
54
|
-
});
|
55
|
-
return (0, schematics_1.chain)(rules);
|
56
|
-
});
|
57
|
-
}
|
58
|
-
exports.renamePackageImports = renamePackageImports;
|
59
|
-
//# sourceMappingURL=rename-package-imports.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"rename-package-imports.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/rename-package-imports.ts"],"names":[],"mappings":";;;;AAAA,iCAAiC;AACjC,2DAKoC;AACpC,4CAA4C;AAC5C,uEAAiE;AACjE,4CAAqD;AACrD,wDAAoD;AACpD,+CAAiD;AAMjD;;;;GAIG;AACH,SAAgB,oBAAoB,CAClC,kBAAsC;IAEtC,OAAO,CAAO,IAAU,EAAE,QAA0B,EAAE,EAAE;QACtD,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE3C,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACrC,KAAK,CAAC,IAAI,CACR,IAAA,8CAAoB,EAAC,CAAC,IAAI,EAAE,EAAE;gBAC5B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBAC5B,OAAO;iBACR;gBAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACnD,MAAM,2BAA2B,GAAG,MAAM,CAAC,IAAI,CAC7C,kBAAkB,CACnB,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;oBACrB,OAAO,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,2BAA2B,EAAE;oBAChC,OAAO;iBACR;gBAED,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CACnC,IAAI,EACJ,QAAQ,EACR,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;gBACF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC;qBAC/C,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,EAAE;oBACrC,MAAM,KAAK,GAAG,IAAA,sBAAS,EACrB,SAAS,EACT,EAAE,CAAC,UAAU,CAAC,iBAAiB,CACN,CAAC;oBAE5B,OAAO,KAAK;yBACT,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;wBACf,OAAO;wBACL,iCAAiC;wBACjC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;4BACpD,WAAW,CACZ,CAAC;oBACJ,CAAC,CAAC;yBACD,GAAG,CACF,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,yBAAa,CACf,IAAI,EACJ,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,EAC/B,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAC9B,IAAI,cAAc,GAAG,CACtB,CACJ,CAAC;gBACN,CAAC,CAAC;oBACF,8DAA8D;qBAC7D,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;gBAE7C,kEAAkE;gBAClE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtB,8BAA8B;oBAC9B,IAAA,kBAAM,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;iBAC7B;YACH,CAAC,EAAE,IAAA,gBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC5B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAA,CAAC;AACJ,CAAC;AAtED,oDAsEC"}
|