nx 17.1.2 → 17.1.3
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/package.json +12 -12
- package/src/adapter/ngcli-adapter.js +4 -3
- package/src/utils/params.d.ts +2 -0
- package/src/utils/params.js +6 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "17.1.
|
|
3
|
+
"version": "17.1.3",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"yargs": "^17.6.2",
|
|
68
68
|
"yargs-parser": "21.1.1",
|
|
69
69
|
"node-machine-id": "1.1.12",
|
|
70
|
-
"@nrwl/tao": "17.1.
|
|
70
|
+
"@nrwl/tao": "17.1.3"
|
|
71
71
|
},
|
|
72
72
|
"peerDependencies": {
|
|
73
73
|
"@swc-node/register": "^1.6.7",
|
|
@@ -82,16 +82,16 @@
|
|
|
82
82
|
}
|
|
83
83
|
},
|
|
84
84
|
"optionalDependencies": {
|
|
85
|
-
"@nx/nx-darwin-x64": "17.1.
|
|
86
|
-
"@nx/nx-darwin-arm64": "17.1.
|
|
87
|
-
"@nx/nx-linux-x64-gnu": "17.1.
|
|
88
|
-
"@nx/nx-linux-x64-musl": "17.1.
|
|
89
|
-
"@nx/nx-win32-x64-msvc": "17.1.
|
|
90
|
-
"@nx/nx-linux-arm64-gnu": "17.1.
|
|
91
|
-
"@nx/nx-linux-arm64-musl": "17.1.
|
|
92
|
-
"@nx/nx-linux-arm-gnueabihf": "17.1.
|
|
93
|
-
"@nx/nx-win32-arm64-msvc": "17.1.
|
|
94
|
-
"@nx/nx-freebsd-x64": "17.1.
|
|
85
|
+
"@nx/nx-darwin-x64": "17.1.3",
|
|
86
|
+
"@nx/nx-darwin-arm64": "17.1.3",
|
|
87
|
+
"@nx/nx-linux-x64-gnu": "17.1.3",
|
|
88
|
+
"@nx/nx-linux-x64-musl": "17.1.3",
|
|
89
|
+
"@nx/nx-win32-x64-msvc": "17.1.3",
|
|
90
|
+
"@nx/nx-linux-arm64-gnu": "17.1.3",
|
|
91
|
+
"@nx/nx-linux-arm64-musl": "17.1.3",
|
|
92
|
+
"@nx/nx-linux-arm-gnueabihf": "17.1.3",
|
|
93
|
+
"@nx/nx-win32-arm64-msvc": "17.1.3",
|
|
94
|
+
"@nx/nx-freebsd-x64": "17.1.3"
|
|
95
95
|
},
|
|
96
96
|
"nx-migrations": {
|
|
97
97
|
"migrations": "./migrations.json",
|
|
@@ -735,11 +735,12 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root) {
|
|
|
735
735
|
const [packageName, builderName] = builderStr.split(':');
|
|
736
736
|
const { executorsFilePath, executorConfig } = this.readExecutorsJson(packageName, builderName);
|
|
737
737
|
const builderInfo = this.readExecutor(packageName, builderName);
|
|
738
|
+
const { builders, executors } = (0, fileutils_1.readJsonFile)(executorsFilePath);
|
|
738
739
|
return {
|
|
739
740
|
name: builderStr,
|
|
740
741
|
builderName,
|
|
741
|
-
description:
|
|
742
|
-
|
|
742
|
+
description: builders?.[builderName]?.description ??
|
|
743
|
+
executors?.[builderName]?.description,
|
|
743
744
|
optionSchema: builderInfo.schema,
|
|
744
745
|
import: (0, schema_utils_1.resolveImplementation)(executorConfig.implementation, (0, path_1.dirname)(executorsFilePath)),
|
|
745
746
|
};
|
|
@@ -752,7 +753,7 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root) {
|
|
|
752
753
|
}
|
|
753
754
|
const executorsFilePath = require.resolve((0, path_1.join)((0, path_1.dirname)(packageJsonPath), executorsFile));
|
|
754
755
|
const executorsJson = (0, fileutils_1.readJsonFile)(executorsFilePath);
|
|
755
|
-
const executorConfig = executorsJson.builders?.[builder];
|
|
756
|
+
const executorConfig = executorsJson.builders?.[builder] ?? executorsJson.executors?.[builder];
|
|
756
757
|
if (!executorConfig) {
|
|
757
758
|
throw new Error(`Cannot find builder '${builder}' in ${executorsFilePath}.`);
|
|
758
759
|
}
|
package/src/utils/params.d.ts
CHANGED
package/src/utils/params.js
CHANGED
|
@@ -472,6 +472,12 @@ function convertSmartDefaultsIntoNamedParams(opts, schema, defaultProjectName, r
|
|
|
472
472
|
relativeCwd) {
|
|
473
473
|
opts[k] = relativeCwd.replace(/\\/g, '/');
|
|
474
474
|
}
|
|
475
|
+
else if (opts[k] === undefined &&
|
|
476
|
+
v.$default !== undefined &&
|
|
477
|
+
v.$default.$source === 'workingDirectory' &&
|
|
478
|
+
relativeCwd) {
|
|
479
|
+
opts[k] = relativeCwd.replace(/\\/g, '/');
|
|
480
|
+
}
|
|
475
481
|
});
|
|
476
482
|
const leftOverPositionalArgs = [];
|
|
477
483
|
for (let i = 0; i < argv.length; ++i) {
|