nx 21.6.5 → 21.6.7
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/bin/nx.js +3 -0
- package/migrations.json +37 -0
- package/package.json +11 -11
- package/src/command-line/nx-cloud/complete-run/command-object.d.ts +3 -0
- package/src/command-line/nx-cloud/complete-run/command-object.d.ts.map +1 -0
- package/src/command-line/nx-cloud/complete-run/command-object.js +16 -0
- package/src/command-line/nx-cloud/complete-run/stop-all-agents.d.ts +5 -0
- package/src/command-line/nx-cloud/complete-run/stop-all-agents.d.ts.map +1 -0
- package/src/command-line/nx-cloud/complete-run/stop-all-agents.js +7 -0
- package/src/command-line/nx-cloud/start-agent/command-object.d.ts +3 -0
- package/src/command-line/nx-cloud/start-agent/command-object.d.ts.map +1 -0
- package/src/command-line/nx-cloud/start-agent/command-object.js +15 -0
- package/src/command-line/nx-cloud/start-agent/start-agent.d.ts +5 -0
- package/src/command-line/nx-cloud/start-agent/start-agent.d.ts.map +1 -0
- package/src/command-line/nx-cloud/start-agent/start-agent.js +7 -0
- package/src/command-line/nx-cloud/start-ci-run/command-object.js +1 -1
- package/src/command-line/nx-commands.d.ts.map +1 -1
- package/src/command-line/nx-commands.js +11 -7
- package/src/core/graph/main.js +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.d.ts.map +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js +14 -1
- package/src/devkit-internals.d.ts +1 -0
- package/src/devkit-internals.d.ts.map +1 -1
- package/src/devkit-internals.js +3 -1
- package/src/generators/utils/project-configuration.js +13 -1
- package/src/migrations/update-15-0-0/prefix-outputs.d.ts +3 -0
- package/src/migrations/update-15-0-0/prefix-outputs.d.ts.map +1 -0
- package/src/migrations/update-15-0-0/prefix-outputs.js +49 -0
- package/src/migrations/update-16-0-0/remove-nrwl-cli.d.ts +3 -0
- package/src/migrations/update-16-0-0/remove-nrwl-cli.d.ts.map +1 -0
- package/src/migrations/update-16-0-0/remove-nrwl-cli.js +16 -0
- package/src/migrations/update-16-0-0/update-depends-on-to-tokens.d.ts +3 -0
- package/src/migrations/update-16-0-0/update-depends-on-to-tokens.d.ts.map +1 -0
- package/src/migrations/update-16-0-0/update-depends-on-to-tokens.js +97 -0
- package/src/migrations/update-16-0-0/update-nx-cloud-runner.d.ts +3 -0
- package/src/migrations/update-16-0-0/update-nx-cloud-runner.d.ts.map +1 -0
- package/src/migrations/update-16-0-0/update-nx-cloud-runner.js +29 -0
- package/src/migrations/update-16-2-0/remove-run-commands-output-path.d.ts +3 -0
- package/src/migrations/update-16-2-0/remove-run-commands-output-path.d.ts.map +1 -0
- package/src/migrations/update-16-2-0/remove-run-commands-output-path.js +45 -0
- package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.d.ts +13 -0
- package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.d.ts.map +1 -0
- package/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.js +67 -0
- package/src/native/nx.wasm32-wasi.wasm +0 -0
- package/src/plugins/js/lock-file/pnpm-parser.d.ts.map +1 -1
- package/src/plugins/js/lock-file/pnpm-parser.js +4 -2
- package/src/plugins/package-json/create-nodes.js +1 -1
- package/src/plugins/project-json/build-nodes/project-json.d.ts +0 -1
- package/src/plugins/project-json/build-nodes/project-json.d.ts.map +1 -1
- package/src/plugins/project-json/build-nodes/project-json.js +1 -13
- package/src/project-graph/utils/project-configuration-utils.d.ts +1 -1
- package/src/project-graph/utils/project-configuration-utils.d.ts.map +1 -1
- package/src/project-graph/utils/project-configuration-utils.js +13 -4
- package/src/tasks-runner/cache.d.ts.map +1 -1
- package/src/tasks-runner/cache.js +27 -14
- package/src/tasks-runner/fork.js +3 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle-old.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle-old.js +8 -2
- package/src/tasks-runner/life-cycles/task-history-life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/task-history-life-cycle.js +8 -2
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.d.ts +1 -1
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.d.ts.map +1 -1
- package/src/tasks-runner/life-cycles/tui-summary-life-cycle.js +83 -55
- package/src/utils/exit-codes.d.ts +1 -1
- package/src/utils/exit-codes.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph-incremental-recomputation.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,OAAO,EACP,YAAY,EAEb,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,YAAY,EAIb,MAAM,mCAAmC,CAAC;AAc3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAEL,uBAAuB,EACxB,MAAM,uDAAuD,CAAC;AAS/D,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,mBAAmB,EAAE,YAAY,GAAG,IAAI,CAAC;IACzC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,iBAAiB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACrC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,uBAAuB,GAAG,IAAI,CAAC;IAC3C,cAAc,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAClD;AAGD,eAAO,IAAI,gBAAgB,EACvB;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,QAAQ,EAAE,CAAC;IAC9B,cAAc,EAAE,yBAAyB,CAAC;CAC3C,GACD,SAAS,CAAC;AACd,eAAO,IAAI,0BAA0B,EAAE,YAAY,GAAG,SAAS,CAAC;AAChE,eAAO,IAAI,mBAAmB,EAAE,YAAY,GAAG,SAAS,CAAC;AAYzD,wBAAsB,sCAAsC,IAAI,OAAO,CAAC,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"project-graph-incremental-recomputation.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,OAAO,EACP,YAAY,EAEb,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,YAAY,EAIb,MAAM,mCAAmC,CAAC;AAc3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAEL,uBAAuB,EACxB,MAAM,uDAAuD,CAAC;AAS/D,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,mBAAmB,EAAE,YAAY,GAAG,IAAI,CAAC;IACzC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACxB,iBAAiB,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACrC,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,uBAAuB,GAAG,IAAI,CAAC;IAC3C,cAAc,EAAE,yBAAyB,GAAG,IAAI,CAAC;CAClD;AAGD,eAAO,IAAI,gBAAgB,EACvB;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,QAAQ,EAAE,CAAC;IAC9B,cAAc,EAAE,yBAAyB,CAAC;CAC3C,GACD,SAAS,CAAC;AACd,eAAO,IAAI,0BAA0B,EAAE,YAAY,GAAG,SAAS,CAAC;AAChE,eAAO,IAAI,mBAAmB,EAAE,YAAY,GAAG,SAAS,CAAC;AAYzD,wBAAsB,sCAAsC,IAAI,OAAO,CAAC,sBAAsB,CAAC,CA+E9F;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,EACtB,YAAY,EAAE,MAAM,EAAE,QAuCvB;AAED,wBAAgB,yCAAyC,CACvD,QAAQ,EAAE,CACR,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,uBAAuB,KAChC,IAAI,QAGV"}
|
|
@@ -59,6 +59,20 @@ async function getCachedSerializedProjectGraphPromise() {
|
|
|
59
59
|
if (wasScheduled) {
|
|
60
60
|
notifyProjectGraphRecomputationListeners(result.projectGraph, result.sourceMaps);
|
|
61
61
|
}
|
|
62
|
+
const errors = result.error
|
|
63
|
+
? result.error instanceof error_types_1.DaemonProjectGraphError
|
|
64
|
+
? result.error.errors
|
|
65
|
+
: [result.error]
|
|
66
|
+
: [];
|
|
67
|
+
// Always write the daemon's current graph to disk to ensure disk cache
|
|
68
|
+
// stays in sync with the daemon's in-memory cache. This prevents issues
|
|
69
|
+
// where a non-daemon process writes a stale/errored cache that never
|
|
70
|
+
// gets overwritten by the daemon's valid graph.
|
|
71
|
+
if (result.projectGraph &&
|
|
72
|
+
result.projectFileMapCache &&
|
|
73
|
+
result.sourceMaps) {
|
|
74
|
+
(0, nx_deps_cache_1.writeCache)(result.projectFileMapCache, result.projectGraph, result.sourceMaps, errors);
|
|
75
|
+
}
|
|
62
76
|
return result;
|
|
63
77
|
}
|
|
64
78
|
catch (e) {
|
|
@@ -197,7 +211,6 @@ async function processFilesAndCreateAndSerializeProjectGraph(plugins) {
|
|
|
197
211
|
};
|
|
198
212
|
}
|
|
199
213
|
}
|
|
200
|
-
(0, nx_deps_cache_1.writeCache)(g.projectFileMapCache, g.projectGraph, projectConfigurationsResult.sourceMaps, errors);
|
|
201
214
|
if (errors.length > 0) {
|
|
202
215
|
return {
|
|
203
216
|
error: new error_types_1.DaemonProjectGraphError(errors, g.projectGraph, projectConfigurationsResult.sourceMaps),
|
|
@@ -26,4 +26,5 @@ export { registerTsProject } from './plugins/js/utils/register';
|
|
|
26
26
|
export { interpolate } from './tasks-runner/utils';
|
|
27
27
|
export { isCI } from './utils/is-ci';
|
|
28
28
|
export { isUsingPrettierInTree } from './utils/is-using-prettier';
|
|
29
|
+
export { signalToCode } from './utils/exit-codes';
|
|
29
30
|
//# sourceMappingURL=devkit-internals.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"devkit-internals.d.ts","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-internals.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,sBAAsB,EACtB,aAAa,GACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,OAAO,EAAE,gDAAgD,EAAE,MAAM,gDAAgD,CAAC;AAClH,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EACL,oCAAoC,EACpC,uBAAuB,GACxB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kDAAkD,EAClD,kBAAkB,GACnB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,cAAc,6BAA6B,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC"}
|
package/src/devkit-internals.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
|
|
3
|
+
exports.signalToCode = exports.isUsingPrettierInTree = exports.isCI = exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashMultiGlobWithWorkspaceContext = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.installPackageToTmp = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.findMatchingConfigFiles = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.parseExecutor = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
/**
|
|
6
6
|
* Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
|
|
@@ -57,3 +57,5 @@ var is_ci_1 = require("./utils/is-ci");
|
|
|
57
57
|
Object.defineProperty(exports, "isCI", { enumerable: true, get: function () { return is_ci_1.isCI; } });
|
|
58
58
|
var is_using_prettier_1 = require("./utils/is-using-prettier");
|
|
59
59
|
Object.defineProperty(exports, "isUsingPrettierInTree", { enumerable: true, get: function () { return is_using_prettier_1.isUsingPrettierInTree; } });
|
|
60
|
+
var exit_codes_1 = require("./utils/exit-codes");
|
|
61
|
+
Object.defineProperty(exports, "signalToCode", { enumerable: true, get: function () { return exit_codes_1.signalToCode; } });
|
|
@@ -181,9 +181,21 @@ function readAndCombineAllProjectConfigurations(tree) {
|
|
|
181
181
|
if ((0, path_1.basename)(projectFile) === 'project.json') {
|
|
182
182
|
const json = (0, json_1.readJson)(tree, projectFile);
|
|
183
183
|
const config = (0, project_json_1.buildProjectFromProjectJson)(json, projectFile);
|
|
184
|
+
if (!config.name) {
|
|
185
|
+
try {
|
|
186
|
+
const packageJson = (0, json_1.readJson)(tree, (0, path_2.joinPathFragments)(config.root, 'package.json'));
|
|
187
|
+
if (packageJson.name) {
|
|
188
|
+
config.name = packageJson.name;
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
catch {
|
|
192
|
+
// Maybe no package json, is ok.
|
|
193
|
+
}
|
|
194
|
+
config.name ??= (0, to_project_name_1.toProjectName)(projectFile);
|
|
195
|
+
}
|
|
184
196
|
(0, project_configuration_utils_1.mergeProjectConfigurationIntoRootMap)(rootMap, config, undefined, undefined, true);
|
|
185
197
|
}
|
|
186
|
-
|
|
198
|
+
if ((0, path_1.basename)(projectFile) === 'package.json') {
|
|
187
199
|
const packageJson = (0, json_1.readJson)(tree, projectFile);
|
|
188
200
|
// We don't want to have all of the extra inferred stuff in here, as
|
|
189
201
|
// when generators update the project they shouldn't inline that stuff.
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prefix-outputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-15-0-0/prefix-outputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAgB7C,yBAA+B,IAAI,EAAE,IAAI,iBAoDxC"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = default_1;
|
|
4
|
+
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
5
|
+
const project_configuration_1 = require("../../generators/utils/project-configuration");
|
|
6
|
+
const nx_json_1 = require("../../generators/utils/nx-json");
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
const utils_1 = require("../../tasks-runner/utils");
|
|
9
|
+
const json_1 = require("../../generators/utils/json");
|
|
10
|
+
async function default_1(tree) {
|
|
11
|
+
// If the workspace doesn't have a nx.json, don't make any changes
|
|
12
|
+
if (!tree.exists('nx.json')) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
const nxJson = (0, nx_json_1.readNxJson)(tree);
|
|
16
|
+
for (const [projectName, project] of (0, project_configuration_1.getProjects)(tree)) {
|
|
17
|
+
for (const [_, target] of Object.entries(project.targets ?? {})) {
|
|
18
|
+
if (!target.outputs) {
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
target.outputs = (0, utils_1.transformLegacyOutputs)(project.root, target.outputs);
|
|
22
|
+
}
|
|
23
|
+
try {
|
|
24
|
+
(0, project_configuration_1.updateProjectConfiguration)(tree, projectName, project);
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
if (tree.exists((0, path_1.join)(project.root, 'package.json'))) {
|
|
28
|
+
(0, json_1.updateJson)(tree, (0, path_1.join)(project.root, 'package.json'), (json) => {
|
|
29
|
+
for (const target of Object.values(json.nx?.targets ?? {})) {
|
|
30
|
+
if (target.outputs) {
|
|
31
|
+
target.outputs = (0, utils_1.transformLegacyOutputs)(project.root, target.outputs);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return json;
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
if (nxJson.targetDefaults) {
|
|
40
|
+
for (const [_, target] of Object.entries(nxJson.targetDefaults)) {
|
|
41
|
+
if (!target.outputs) {
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
target.outputs = (0, utils_1.transformLegacyOutputs)('{projectRoot}', target.outputs);
|
|
45
|
+
}
|
|
46
|
+
(0, nx_json_1.updateNxJson)(tree, nxJson);
|
|
47
|
+
}
|
|
48
|
+
await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
|
|
49
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-nrwl-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-0-0/remove-nrwl-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAI7C,yBAA+B,IAAI,EAAE,IAAI,iBAYxC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = default_1;
|
|
4
|
+
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
5
|
+
const json_1 = require("../../generators/utils/json");
|
|
6
|
+
async function default_1(tree) {
|
|
7
|
+
(0, json_1.updateJson)(tree, 'package.json', (json) => {
|
|
8
|
+
for (const deps of [json.dependencies, json.devDependencies]) {
|
|
9
|
+
if (deps) {
|
|
10
|
+
delete deps['@nrwl/cli'];
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
return json;
|
|
14
|
+
});
|
|
15
|
+
await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
|
|
16
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-depends-on-to-tokens.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-0-0/update-depends-on-to-tokens.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C,yBAA+B,IAAI,EAAE,IAAI,iBAyDxC"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = default_1;
|
|
4
|
+
const project_configuration_1 = require("../../generators/utils/project-configuration");
|
|
5
|
+
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
6
|
+
async function default_1(tree) {
|
|
7
|
+
updateDependsOnAndInputsInsideNxJson(tree);
|
|
8
|
+
const projectsConfigurations = (0, project_configuration_1.getProjects)(tree);
|
|
9
|
+
for (const [projectName, projectConfiguration] of projectsConfigurations) {
|
|
10
|
+
let projectChanged = false;
|
|
11
|
+
for (const [targetName, targetConfiguration] of Object.entries(projectConfiguration.targets ?? {})) {
|
|
12
|
+
for (const dependency of targetConfiguration.dependsOn ?? []) {
|
|
13
|
+
if (typeof dependency !== 'string') {
|
|
14
|
+
if (dependency.projects === 'self' ||
|
|
15
|
+
dependency.projects === '{self}') {
|
|
16
|
+
delete dependency.projects;
|
|
17
|
+
projectChanged = true;
|
|
18
|
+
}
|
|
19
|
+
else if (dependency.projects === 'dependencies' ||
|
|
20
|
+
dependency.projects === '{dependencies}') {
|
|
21
|
+
delete dependency.projects;
|
|
22
|
+
dependency.dependencies = true;
|
|
23
|
+
projectChanged = true;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
for (let i = 0; i < (targetConfiguration.inputs?.length ?? 0); i++) {
|
|
28
|
+
const input = targetConfiguration.inputs[i];
|
|
29
|
+
if (typeof input !== 'string') {
|
|
30
|
+
if ('projects' in input &&
|
|
31
|
+
(input.projects === 'self' || input.projects === '{self}')) {
|
|
32
|
+
delete input.projects;
|
|
33
|
+
projectChanged = true;
|
|
34
|
+
}
|
|
35
|
+
else if ('projects' in input &&
|
|
36
|
+
(input.projects === 'dependencies' ||
|
|
37
|
+
input.projects === '{dependencies}')) {
|
|
38
|
+
delete input.projects;
|
|
39
|
+
targetConfiguration.inputs[i] = {
|
|
40
|
+
...input,
|
|
41
|
+
dependencies: true,
|
|
42
|
+
};
|
|
43
|
+
projectChanged = true;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
if (projectChanged) {
|
|
49
|
+
(0, project_configuration_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
|
|
53
|
+
}
|
|
54
|
+
function updateDependsOnAndInputsInsideNxJson(tree) {
|
|
55
|
+
const nxJson = (0, project_configuration_1.readNxJson)(tree);
|
|
56
|
+
let nxJsonChanged = false;
|
|
57
|
+
for (const [target, defaults] of Object.entries(nxJson?.targetDefaults ?? {})) {
|
|
58
|
+
for (const dependency of defaults.dependsOn ?? []) {
|
|
59
|
+
if (typeof dependency !== 'string') {
|
|
60
|
+
if (dependency.projects === 'self' ||
|
|
61
|
+
dependency.projects === '{self}') {
|
|
62
|
+
delete dependency.projects;
|
|
63
|
+
nxJsonChanged = true;
|
|
64
|
+
}
|
|
65
|
+
else if (dependency.projects === 'dependencies' ||
|
|
66
|
+
dependency.projects === '{dependencies}') {
|
|
67
|
+
delete dependency.projects;
|
|
68
|
+
dependency.dependencies = true;
|
|
69
|
+
nxJsonChanged = true;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
for (let i = 0; i < (defaults.inputs?.length ?? 0); i++) {
|
|
74
|
+
const input = defaults.inputs[i];
|
|
75
|
+
if (typeof input !== 'string') {
|
|
76
|
+
if ('projects' in input &&
|
|
77
|
+
(input.projects === 'self' || input.projects === '{self}')) {
|
|
78
|
+
delete input.projects;
|
|
79
|
+
nxJsonChanged = true;
|
|
80
|
+
}
|
|
81
|
+
else if ('projects' in input &&
|
|
82
|
+
(input.projects === 'dependencies' ||
|
|
83
|
+
input.projects === '{dependencies}')) {
|
|
84
|
+
delete input.projects;
|
|
85
|
+
defaults.inputs[i] = {
|
|
86
|
+
...input,
|
|
87
|
+
dependencies: true,
|
|
88
|
+
};
|
|
89
|
+
nxJsonChanged = true;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
if (nxJsonChanged) {
|
|
95
|
+
(0, project_configuration_1.updateNxJson)(tree, nxJson);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-nx-cloud-runner.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-0-0/update-nx-cloud-runner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAI7C,yBAA+B,IAAI,EAAE,IAAI,iBAyBxC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = default_1;
|
|
4
|
+
const project_configuration_1 = require("../../generators/utils/project-configuration");
|
|
5
|
+
const json_1 = require("../../generators/utils/json");
|
|
6
|
+
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
7
|
+
async function default_1(tree) {
|
|
8
|
+
(0, json_1.updateJson)(tree, 'package.json', (json) => {
|
|
9
|
+
if (json.dependencies && json.dependencies['@nrwl/nx-cloud']) {
|
|
10
|
+
json.dependencies['nx-cloud'] = json.dependencies['@nrwl/nx-cloud'];
|
|
11
|
+
delete json.dependencies['@nrwl/nx-cloud'];
|
|
12
|
+
}
|
|
13
|
+
if (json.devDependencies && json.devDependencies['@nrwl/nx-cloud']) {
|
|
14
|
+
json.devDependencies['nx-cloud'] = json.devDependencies['@nrwl/nx-cloud'];
|
|
15
|
+
delete json.devDependencies['@nrwl/nx-cloud'];
|
|
16
|
+
}
|
|
17
|
+
return json;
|
|
18
|
+
});
|
|
19
|
+
const nxJson = (0, project_configuration_1.readNxJson)(tree);
|
|
20
|
+
if (!nxJson)
|
|
21
|
+
return;
|
|
22
|
+
for (let opts of Object.values(nxJson.tasksRunnerOptions ?? {})) {
|
|
23
|
+
if (opts.runner === '@nrwl/nx-cloud') {
|
|
24
|
+
opts.runner = 'nx-cloud';
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
(0, project_configuration_1.updateNxJson)(tree, nxJson);
|
|
28
|
+
await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
|
|
29
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-run-commands-output-path.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-2-0/remove-run-commands-output-path.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAO7C,wBAA8B,2BAA2B,CAAC,IAAI,EAAE,IAAI,iBAoBnE"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = removeRunCommandsOutputPath;
|
|
4
|
+
const path_1 = require("../../utils/path");
|
|
5
|
+
const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
|
|
6
|
+
const json_1 = require("../../generators/utils/json");
|
|
7
|
+
const project_configuration_1 = require("../../generators/utils/project-configuration");
|
|
8
|
+
async function removeRunCommandsOutputPath(tree) {
|
|
9
|
+
for (const [project, configuration] of (0, project_configuration_1.getProjects)(tree).entries()) {
|
|
10
|
+
const targets = configuration.targets ?? {};
|
|
11
|
+
let changed = false;
|
|
12
|
+
for (const [, target] of Object.entries(targets)) {
|
|
13
|
+
changed ||= updateTargetBlock(target);
|
|
14
|
+
}
|
|
15
|
+
if (changed) {
|
|
16
|
+
(0, project_configuration_1.updateProjectConfiguration)(tree, project, configuration);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
if (tree.exists('nx.json')) {
|
|
20
|
+
(0, json_1.updateJson)(tree, 'nx.json', (json) => {
|
|
21
|
+
for (const [, target] of Object.entries(json.targetDefaults ?? {})) {
|
|
22
|
+
updateTargetBlock(target);
|
|
23
|
+
}
|
|
24
|
+
return json;
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
await (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
|
|
28
|
+
}
|
|
29
|
+
function updateTargetBlock(target) {
|
|
30
|
+
let changed = false;
|
|
31
|
+
if (target.executor === 'nx:run-commands' && target.options?.outputPath) {
|
|
32
|
+
changed = true;
|
|
33
|
+
const outputs = new Set(target.outputs ?? []);
|
|
34
|
+
outputs.delete('{options.outputPath}');
|
|
35
|
+
const newOutputs = Array.isArray(target.options.outputPath)
|
|
36
|
+
? target.options.outputPath.map((p) => (0, path_1.joinPathFragments)('{workspaceRoot}', p))
|
|
37
|
+
: [(0, path_1.joinPathFragments)('{workspaceRoot}', target.options.outputPath)];
|
|
38
|
+
for (const outputPath of newOutputs) {
|
|
39
|
+
outputs.add(outputPath);
|
|
40
|
+
}
|
|
41
|
+
delete target.options.outputPath;
|
|
42
|
+
target.outputs = Array.from(outputs);
|
|
43
|
+
}
|
|
44
|
+
return changed;
|
|
45
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Tree } from '../../generators/tree';
|
|
2
|
+
/**
|
|
3
|
+
* This function escapes dollar sign in env variables
|
|
4
|
+
* It will go through:
|
|
5
|
+
* - '.env', '.local.env', '.env.local'
|
|
6
|
+
* - .env.[target-name], .[target-name].env
|
|
7
|
+
* - .env.[target-name].[configuration-name], .[target-name].[configuration-name].env
|
|
8
|
+
* - .env.[configuration-name], .[configuration-name].env
|
|
9
|
+
* at each project root and workspace root
|
|
10
|
+
* @param tree
|
|
11
|
+
*/
|
|
12
|
+
export default function escapeDollarSignEnvVariables(tree: Tree): void;
|
|
13
|
+
//# sourceMappingURL=escape-dollar-sign-env-variables.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"escape-dollar-sign-env-variables.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-16-8-0/escape-dollar-sign-env-variables.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAG7C;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,4BAA4B,CAAC,IAAI,EAAE,IAAI,QAoC9D"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = escapeDollarSignEnvVariables;
|
|
4
|
+
const logger_1 = require("../../utils/logger");
|
|
5
|
+
const project_configuration_1 = require("../../generators/utils/project-configuration");
|
|
6
|
+
/**
|
|
7
|
+
* This function escapes dollar sign in env variables
|
|
8
|
+
* It will go through:
|
|
9
|
+
* - '.env', '.local.env', '.env.local'
|
|
10
|
+
* - .env.[target-name], .[target-name].env
|
|
11
|
+
* - .env.[target-name].[configuration-name], .[target-name].[configuration-name].env
|
|
12
|
+
* - .env.[configuration-name], .[configuration-name].env
|
|
13
|
+
* at each project root and workspace root
|
|
14
|
+
* @param tree
|
|
15
|
+
*/
|
|
16
|
+
function escapeDollarSignEnvVariables(tree) {
|
|
17
|
+
const envFiles = ['.env', '.local.env', '.env.local'];
|
|
18
|
+
for (const [_, configuration] of (0, project_configuration_1.getProjects)(tree).entries()) {
|
|
19
|
+
envFiles.push(`${configuration.root}/.env`, `${configuration.root}/.local.env`, `${configuration.root}/.env.local`);
|
|
20
|
+
for (const targetName in configuration.targets) {
|
|
21
|
+
const task = configuration.targets[targetName];
|
|
22
|
+
envFiles.push(`.env.${targetName}`, `.${targetName}.env`, `${configuration.root}/.env.${targetName}`, `${configuration.root}/.${targetName}.env`);
|
|
23
|
+
if (task.configurations) {
|
|
24
|
+
for (const configurationName in task.configurations) {
|
|
25
|
+
envFiles.push(`.env.${targetName}.${configurationName}`, `.${targetName}.${configurationName}.env`, `.env.${configurationName}`, `.${configurationName}.env`, `${configuration.root}/.env.${targetName}.${configurationName}`, `${configuration.root}/.${targetName}.${configurationName}.env`, `${configuration.root}/.env.${configurationName}`, `${configuration.root}/.${configurationName}.env`);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
for (const envFile of new Set(envFiles)) {
|
|
31
|
+
parseEnvFile(tree, envFile);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* This function parse the env file and escape dollar sign
|
|
36
|
+
* @param tree
|
|
37
|
+
* @param envFilePath
|
|
38
|
+
* @returns
|
|
39
|
+
*/
|
|
40
|
+
function parseEnvFile(tree, envFilePath) {
|
|
41
|
+
if (!tree.exists(envFilePath)) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
let envFileContent = tree.read(envFilePath, 'utf-8');
|
|
45
|
+
if (!envFileContent) {
|
|
46
|
+
// envFileContent is null if we fail to read the file for any reason
|
|
47
|
+
// e.g. the file is not utf-8 encoded
|
|
48
|
+
logger_1.logger.info(`Unable to update ${envFilePath}. Nx interpolates environment variables in the form of $VAR_NAME. To escape the dollar sign, use \\$VAR_NAME.`);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
envFileContent = envFileContent
|
|
52
|
+
.split('\n')
|
|
53
|
+
.map((line) => {
|
|
54
|
+
line = line.trim();
|
|
55
|
+
if (!line || !line.includes('$')) {
|
|
56
|
+
return line;
|
|
57
|
+
}
|
|
58
|
+
const declarations = line.split('=');
|
|
59
|
+
if (declarations[1].includes('$') && !declarations[1].includes(`\\$`)) {
|
|
60
|
+
declarations[1] = declarations[1].replace('$', `\\$`);
|
|
61
|
+
line = declarations.join('=');
|
|
62
|
+
}
|
|
63
|
+
return line;
|
|
64
|
+
})
|
|
65
|
+
.join('\n');
|
|
66
|
+
tree.write(envFilePath, envFileContent);
|
|
67
|
+
}
|
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA0B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,
|
|
1
|
+
{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EAE1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAEL,YAAY,EACZ,wBAAwB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AA0B3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAS1C;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,+BAU/B;AAkUD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,GACjC,MAAM,CAgCR"}
|
|
@@ -286,8 +286,10 @@ function stringifyPnpmLockfile(graph, rootLockFileContent, packageJson) {
|
|
|
286
286
|
const workspaceDependencyImporters = {};
|
|
287
287
|
for (const [packageName, importerPath] of Object.entries(requiredImporters)) {
|
|
288
288
|
const baseImporter = importers[importerPath];
|
|
289
|
-
|
|
290
|
-
|
|
289
|
+
if (baseImporter) {
|
|
290
|
+
workspaceDependencyImporters[`workspace_modules/${packageName}`] =
|
|
291
|
+
baseImporter;
|
|
292
|
+
}
|
|
291
293
|
}
|
|
292
294
|
const output = {
|
|
293
295
|
...data,
|
|
@@ -125,7 +125,7 @@ function buildProjectConfigurationFromPackageJson(packageJson, workspaceRoot, pa
|
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
-
if (!packageJson.name && projectRoot === '.') {
|
|
128
|
+
if (!packageJson.name && projectRoot === '.' && !packageJson.nx?.name) {
|
|
129
129
|
throw new Error('Nx requires the root package.json to specify a name if it is being used as an Nx project.');
|
|
130
130
|
}
|
|
131
131
|
let name = packageJson.name ?? (0, to_project_name_1.toProjectName)(normalizedPath);
|
|
@@ -3,5 +3,4 @@ import { NxPluginV2 } from '../../../project-graph/plugins';
|
|
|
3
3
|
export declare const ProjectJsonProjectsPlugin: NxPluginV2;
|
|
4
4
|
export default ProjectJsonProjectsPlugin;
|
|
5
5
|
export declare function buildProjectFromProjectJson(json: Partial<ProjectConfiguration>, path: string): ProjectConfiguration;
|
|
6
|
-
export declare function readNameFromPackageJson(path: string): string;
|
|
7
6
|
//# sourceMappingURL=project-json.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/project-json/build-nodes/project-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"project-json.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/project-json/build-nodes/project-json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAEnF,OAAO,EAEL,UAAU,EACX,MAAM,gCAAgC,CAAC;AAExC,eAAO,MAAM,yBAAyB,EAAE,UAyBvC,CAAC;AAEF,eAAe,yBAAyB,CAAC;AAEzC,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACnC,IAAI,EAAE,MAAM,GACX,oBAAoB,CAOtB"}
|
|
@@ -2,9 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ProjectJsonProjectsPlugin = void 0;
|
|
4
4
|
exports.buildProjectFromProjectJson = buildProjectFromProjectJson;
|
|
5
|
-
exports.readNameFromPackageJson = readNameFromPackageJson;
|
|
6
5
|
const node_path_1 = require("node:path");
|
|
7
|
-
const to_project_name_1 = require("../../../config/to-project-name");
|
|
8
6
|
const fileutils_1 = require("../../../utils/fileutils");
|
|
9
7
|
const plugins_1 = require("../../../project-graph/plugins");
|
|
10
8
|
exports.ProjectJsonProjectsPlugin = {
|
|
@@ -26,20 +24,10 @@ exports.ProjectJsonProjectsPlugin = {
|
|
|
26
24
|
};
|
|
27
25
|
exports.default = exports.ProjectJsonProjectsPlugin;
|
|
28
26
|
function buildProjectFromProjectJson(json, path) {
|
|
29
|
-
const packageJsonPath = (0, node_path_1.join)((0, node_path_1.dirname)(path), 'package.json');
|
|
30
27
|
const { name, root, ...rest } = json;
|
|
31
28
|
return {
|
|
32
|
-
name
|
|
29
|
+
name,
|
|
33
30
|
root: root ?? (0, node_path_1.dirname)(path),
|
|
34
31
|
...rest,
|
|
35
32
|
};
|
|
36
33
|
}
|
|
37
|
-
function readNameFromPackageJson(path) {
|
|
38
|
-
try {
|
|
39
|
-
const json = (0, fileutils_1.readJsonFile)(path);
|
|
40
|
-
return json.nx?.name ?? json.name;
|
|
41
|
-
}
|
|
42
|
-
catch {
|
|
43
|
-
return undefined;
|
|
44
|
-
}
|
|
45
|
-
}
|
|
@@ -71,5 +71,5 @@ export declare function readTargetDefaultsForTarget(targetName: string, targetDe
|
|
|
71
71
|
* @param project The project that the target belongs to
|
|
72
72
|
* @returns The normalized target configuration
|
|
73
73
|
*/
|
|
74
|
-
export declare function normalizeTarget(target: TargetConfiguration, project: ProjectConfiguration, workspaceRoot: string, projectsMap: Record<string, ProjectConfiguration
|
|
74
|
+
export declare function normalizeTarget(target: TargetConfiguration, project: ProjectConfiguration, workspaceRoot: string, projectsMap: Record<string, ProjectConfiguration>, errorMsgKey: string): TargetConfiguration<any>;
|
|
75
75
|
//# sourceMappingURL=project-configuration-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-configuration-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/utils/project-configuration-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,cAAc,EACf,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"project-configuration-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/utils/project-configuration-utils.ts"],"names":[],"mappings":"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"}
|