nx 14.2.1 → 14.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/package.json +4 -4
- package/src/command-line/generate.js +7 -9
- package/src/command-line/generate.js.map +1 -1
- package/src/config/workspaces.d.ts +1 -0
- package/src/config/workspaces.js +8 -2
- package/src/config/workspaces.js.map +1 -1
- package/src/migrations/update-14-2-0/remove-default-collection.js +2 -1
- package/src/migrations/update-14-2-0/remove-default-collection.js.map +1 -1
- package/src/utils/package-json.js +6 -4
- package/src/utils/package-json.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
|
-
## [14.2.
|
|
6
|
+
## [14.2.2](https://github.com/nrwl/nx/compare/14.2.1...14.2.2) (2022-06-08)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "14.2.
|
|
3
|
+
"version": "14.2.2",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://nx.dev",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/cli": "14.2.
|
|
35
|
-
"@nrwl/tao": "14.2.
|
|
34
|
+
"@nrwl/cli": "14.2.2",
|
|
35
|
+
"@nrwl/tao": "14.2.2",
|
|
36
36
|
"@parcel/watcher": "2.0.4",
|
|
37
37
|
"chalk": "4.1.0",
|
|
38
38
|
"chokidar": "^3.5.1",
|
|
@@ -105,5 +105,5 @@
|
|
|
105
105
|
"executors": "./executors.json",
|
|
106
106
|
"main": "./bin/nx.js",
|
|
107
107
|
"typings": "./bin/nx.d.ts",
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "869ebd817fe6e8f9931d1b6a64c90cb50f294958"
|
|
109
109
|
}
|
|
@@ -31,17 +31,15 @@ function promptForCollection(generatorName, ws, interactive) {
|
|
|
31
31
|
...Object.keys(packageJson.dependencies || {}),
|
|
32
32
|
...Object.keys(packageJson.devDependencies || {}),
|
|
33
33
|
]));
|
|
34
|
-
const
|
|
35
|
-
|
|
34
|
+
const choicesMap = new Set();
|
|
35
|
+
for (const collectionName of collections) {
|
|
36
36
|
try {
|
|
37
|
-
const
|
|
38
|
-
|
|
37
|
+
const { resolvedCollectionName, normalizedGeneratorName } = ws.readGenerator(collectionName, generatorName);
|
|
38
|
+
choicesMap.add(`${resolvedCollectionName}:${normalizedGeneratorName}`);
|
|
39
39
|
}
|
|
40
|
-
catch (_a) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
})
|
|
44
|
-
.filter((c) => !!c);
|
|
40
|
+
catch (_a) { }
|
|
41
|
+
}
|
|
42
|
+
const choices = Array.from(choicesMap);
|
|
45
43
|
if (choices.length === 1) {
|
|
46
44
|
return choices[0];
|
|
47
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":";;;;AAAA,4CAKyB;AACzB,qDAAkD;AAClD,6CAAsE;AACtE,4CAAyC;AACzC,+BAA+B;AAC/B,4DAAwD;AAExD,oDAAgD;AAChD,uCAAkC;AAClC,sDAAsD;AAYtD,SAAS,YAAY,CAAC,WAAyB;IAC7C,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACxB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YACvB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACnD;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC9B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SACpD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAe,mBAAmB,CAChC,aAAqB,EACrB,EAAc,EACd,WAAoB;;QAEpB,MAAM,WAAW,GAAG,IAAA,wBAAY,EAAC,GAAG,8BAAa,eAAe,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAC5B,IAAI,GAAG,CAAC;YACN,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YAC9C,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SAClD,CAAC,CACH,CAAC;QACF,MAAM,
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare class Workspaces {
|
|
|
16
16
|
isNxGenerator(collectionName: string, generatorName: string): boolean;
|
|
17
17
|
readExecutor(nodeModule: string, executor: string): ExecutorConfig;
|
|
18
18
|
readGenerator(collectionName: string, generatorName: string): {
|
|
19
|
+
resolvedCollectionName: string;
|
|
19
20
|
normalizedGeneratorName: string;
|
|
20
21
|
schema: any;
|
|
21
22
|
implementationFactory: () => Generator<unknown>;
|
package/src/config/workspaces.js
CHANGED
|
@@ -98,7 +98,7 @@ class Workspaces {
|
|
|
98
98
|
readGenerator(collectionName, generatorName) {
|
|
99
99
|
var _a, _b;
|
|
100
100
|
try {
|
|
101
|
-
const { generatorsFilePath, generatorsJson, normalizedGeneratorName } = this.readGeneratorsJson(collectionName, generatorName);
|
|
101
|
+
const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = this.readGeneratorsJson(collectionName, generatorName);
|
|
102
102
|
const generatorsDir = path.dirname(generatorsFilePath);
|
|
103
103
|
const generatorConfig = ((_a = generatorsJson.generators) === null || _a === void 0 ? void 0 : _a[normalizedGeneratorName]) ||
|
|
104
104
|
((_b = generatorsJson.schematics) === null || _b === void 0 ? void 0 : _b[normalizedGeneratorName]);
|
|
@@ -111,6 +111,7 @@ class Workspaces {
|
|
|
111
111
|
generatorConfig.implementation || generatorConfig.factory;
|
|
112
112
|
const implementationFactory = this.getImplementationFactory(generatorConfig.implementation, generatorsDir);
|
|
113
113
|
return {
|
|
114
|
+
resolvedCollectionName,
|
|
114
115
|
normalizedGeneratorName,
|
|
115
116
|
schema,
|
|
116
117
|
implementationFactory,
|
|
@@ -198,7 +199,12 @@ class Workspaces {
|
|
|
198
199
|
}
|
|
199
200
|
throw new Error(`Cannot find generator '${generator}' in ${generatorsFilePath}.`);
|
|
200
201
|
}
|
|
201
|
-
return {
|
|
202
|
+
return {
|
|
203
|
+
generatorsFilePath,
|
|
204
|
+
generatorsJson,
|
|
205
|
+
normalizedGeneratorName,
|
|
206
|
+
resolvedCollectionName: collectionName,
|
|
207
|
+
};
|
|
202
208
|
}
|
|
203
209
|
resolvePaths() {
|
|
204
210
|
return this.root ? [this.root, __dirname] : [__dirname];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../../../packages/nx/src/config/workspaces.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../../../packages/nx/src/config/workspaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ function default_1(tree) {
|
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
9
|
const workspaceConfiguration = (0, project_configuration_1.readWorkspaceConfiguration)(tree);
|
|
10
10
|
(_a = workspaceConfiguration.cli) === null || _a === void 0 ? true : delete _a.defaultCollection;
|
|
11
|
-
if (
|
|
11
|
+
if (workspaceConfiguration.cli &&
|
|
12
|
+
Object.keys(workspaceConfiguration.cli).length === 0) {
|
|
12
13
|
delete workspaceConfiguration.cli;
|
|
13
14
|
}
|
|
14
15
|
(0, project_configuration_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-default-collection.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-2-0/remove-default-collection.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;AAE5I,mBAA+B,IAAU;;;QACvC,MAAM,sBAAsB,GAAG,IAAA,kDAA0B,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAA,sBAAsB,CAAC,GAAG,+CAAE,iBAAiB,CAAC;QACrD,
|
|
1
|
+
{"version":3,"file":"remove-default-collection.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-2-0/remove-default-collection.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;AAE5I,mBAA+B,IAAU;;;QACvC,MAAM,sBAAsB,GAAG,IAAA,kDAA0B,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAA,sBAAsB,CAAC,GAAG,+CAAE,iBAAiB,CAAC;QACrD,IACE,sBAAsB,CAAC,GAAG;YAC1B,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EACpD;YACA,OAAO,sBAAsB,CAAC,GAAG,CAAC;SACnC;QAED,IAAA,oDAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;QAE3D,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;;CACvD;AAdD,4BAcC"}
|
|
@@ -26,10 +26,12 @@ function buildTargetFromScript(script, nx) {
|
|
|
26
26
|
exports.buildTargetFromScript = buildTargetFromScript;
|
|
27
27
|
function readModulePackageJson(moduleSpecifier, requirePaths = [workspace_root_1.workspaceRoot]) {
|
|
28
28
|
let packageJsonPath;
|
|
29
|
+
let packageJson;
|
|
29
30
|
try {
|
|
30
31
|
packageJsonPath = require.resolve(`${moduleSpecifier}/package.json`, {
|
|
31
32
|
paths: requirePaths,
|
|
32
33
|
});
|
|
34
|
+
packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
|
|
33
35
|
}
|
|
34
36
|
catch (_a) {
|
|
35
37
|
const entryPoint = require.resolve(moduleSpecifier, {
|
|
@@ -41,10 +43,10 @@ function readModulePackageJson(moduleSpecifier, requirePaths = [workspace_root_1
|
|
|
41
43
|
moduleRootPath = (0, path_1.dirname)(moduleRootPath);
|
|
42
44
|
packageJsonPath = (0, path_1.join)(moduleRootPath, 'package.json');
|
|
43
45
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
|
|
47
|
+
if (packageJson.name && packageJson.name !== moduleSpecifier) {
|
|
48
|
+
throw new Error(`Found module ${packageJson.name} while trying to locate ${moduleSpecifier}/package.json`);
|
|
49
|
+
}
|
|
48
50
|
}
|
|
49
51
|
return {
|
|
50
52
|
packageJson,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,+BAAqC;AAErC,2CAA2C;AAC3C,qDAAiD;AAyDjD,SAAgB,mBAAmB,CACjC,IAA0B;IAE1B,MAAM,uBAAuB,GAAG,CAC9B,QAA6C,EAClB,EAAE;QAC7B,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;SACnD;QAED,uCACK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAChE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACzE;IACJ,CAAC,CAAC;IAEF,qDACK,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAC1C,uBAAuB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAE9C,uBAAuB,CAAC,IAAW,CAAC,EACvC;AACJ,CAAC;AAzBD,kDAyBC;AAED,SAAgB,qBAAqB,CACnC,MAAc,EACd,EAAqC;;IAErC,MAAM,qBAAqB,GAAG,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,0CAAG,MAAM,CAAC,KAAI,EAAE,CAAC;IAE1D,uCACK,qBAAqB,KACxB,QAAQ,EAAE,eAAe,EACzB,OAAO,kCACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,MAAM,OAER;AACJ,CAAC;AAdD,sDAcC;AAED,SAAgB,qBAAqB,CACnC,eAAuB,EACvB,YAAY,GAAG,CAAC,8BAAa,CAAC;IAK9B,IAAI,eAAuB,CAAC;IAC5B,IAAI;QACF,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,eAAe,eAAe,EAAE;YACnE,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,+BAAqC;AAErC,2CAA2C;AAC3C,qDAAiD;AAyDjD,SAAgB,mBAAmB,CACjC,IAA0B;IAE1B,MAAM,uBAAuB,GAAG,CAC9B,QAA6C,EAClB,EAAE;QAC7B,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,EAAE,CAAC;SACX;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YAChC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;SACnD;QAED,uCACK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAChE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACzE;IACJ,CAAC,CAAC;IAEF,qDACK,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAC1C,uBAAuB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAE9C,uBAAuB,CAAC,IAAW,CAAC,EACvC;AACJ,CAAC;AAzBD,kDAyBC;AAED,SAAgB,qBAAqB,CACnC,MAAc,EACd,EAAqC;;IAErC,MAAM,qBAAqB,GAAG,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,0CAAG,MAAM,CAAC,KAAI,EAAE,CAAC;IAE1D,uCACK,qBAAqB,KACxB,QAAQ,EAAE,eAAe,EACzB,OAAO,kCACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,MAAM,OAER;AACJ,CAAC;AAdD,sDAcC;AAED,SAAgB,qBAAqB,CACnC,eAAuB,EACvB,YAAY,GAAG,CAAC,8BAAa,CAAC;IAK9B,IAAI,eAAuB,CAAC;IAC5B,IAAI,WAAwB,CAAC;IAE7B,IAAI;QACF,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,eAAe,eAAe,EAAE;YACnE,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;QACH,WAAW,GAAG,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;KAC7C;IAAC,WAAM;QACN,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE;YAClD,KAAK,EAAE,YAAY;SACpB,CAAC,CAAC;QACH,IAAI,cAAc,GAAG,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC;QACzC,eAAe,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAEvD,OAAO,CAAC,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YACnC,cAAc,GAAG,IAAA,cAAO,EAAC,cAAc,CAAC,CAAC;YACzC,eAAe,GAAG,IAAA,WAAI,EAAC,cAAc,EAAE,cAAc,CAAC,CAAC;SACxD;QAED,WAAW,GAAG,IAAA,wBAAY,EAAC,eAAe,CAAC,CAAC;QAC5C,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,eAAe,EAAE;YAC5D,MAAM,IAAI,KAAK,CACb,gBAAgB,WAAW,CAAC,IAAI,2BAA2B,eAAe,eAAe,CAC1F,CAAC;SACH;KACF;IAED,OAAO;QACL,WAAW;QACX,IAAI,EAAE,eAAe;KACtB,CAAC;AACJ,CAAC;AAvCD,sDAuCC"}
|