nx 15.0.11 → 15.0.13
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/migrations.json +6 -0
- package/package.json +4 -4
- package/plugins/package-json.d.ts +1 -0
- package/plugins/package-json.js +5 -0
- package/plugins/package-json.js.map +1 -0
- package/src/migrations/update-15-1-0/set-project-names.d.ts +2 -0
- package/src/migrations/update-15-1-0/set-project-names.js +32 -0
- package/src/migrations/update-15-1-0/set-project-names.js.map +1 -0
- package/src/tasks-runner/utils.js +2 -2
- package/src/tasks-runner/utils.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
|
-
## [15.0.
|
|
6
|
+
## [15.0.13](https://github.com/nrwl/nx/compare/15.0.12...15.0.13) (2022-11-08)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/migrations.json
CHANGED
|
@@ -41,6 +41,12 @@
|
|
|
41
41
|
"version": "15.0.0-beta.1",
|
|
42
42
|
"description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
|
|
43
43
|
"implementation": "./src/migrations/update-15-0-0/prefix-outputs"
|
|
44
|
+
},
|
|
45
|
+
"15.1.0-set-project-names": {
|
|
46
|
+
"cli": "nx",
|
|
47
|
+
"version": "15.0.12-beta.1",
|
|
48
|
+
"description": "Set project names in project.json files",
|
|
49
|
+
"implementation": "./src/migrations/update-15-1-0/set-project-names"
|
|
44
50
|
}
|
|
45
51
|
}
|
|
46
52
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "15.0.
|
|
3
|
+
"version": "15.0.13",
|
|
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": {
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
},
|
|
33
33
|
"homepage": "https://nx.dev",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/cli": "15.0.
|
|
36
|
-
"@nrwl/tao": "15.0.
|
|
35
|
+
"@nrwl/cli": "15.0.13",
|
|
36
|
+
"@nrwl/tao": "15.0.13",
|
|
37
37
|
"@parcel/watcher": "2.0.4",
|
|
38
38
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
39
39
|
"@yarnpkg/parsers": "^3.0.0-rc.18",
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
},
|
|
121
121
|
"main": "./bin/nx.js",
|
|
122
122
|
"types": "./bin/nx.d.ts",
|
|
123
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "3115d8573b1c8f6ac20f331417c58012fe4005a2"
|
|
124
124
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const projectFilePatterns: string[];
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../packages/nx/plugins/package-json.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAAG,CAAC,cAAc,CAAC,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
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
|
+
const path_1 = require("path");
|
|
7
|
+
function default_1(tree) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
// This looks like it does nothing, but this will actually effectively migrate over all the configs that need to be moved over, but won't touch configs that don't need to be moved
|
|
10
|
+
for (const [projName, projConfig] of (0, project_configuration_1.getProjects)(tree)) {
|
|
11
|
+
if (tree.exists((0, path_1.join)(projConfig.root, 'project.json'))) {
|
|
12
|
+
if (!projConfig.name) {
|
|
13
|
+
projConfig.name = toProjectName(projConfig.root, (0, project_configuration_1.readNxJson)(tree));
|
|
14
|
+
}
|
|
15
|
+
(0, project_configuration_1.updateProjectConfiguration)(tree, projName, projConfig);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
yield (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
exports.default = default_1;
|
|
22
|
+
function toProjectName(directory, nxJson) {
|
|
23
|
+
let { appsDir, libsDir } = (nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) || {};
|
|
24
|
+
appsDir !== null && appsDir !== void 0 ? appsDir : (appsDir = 'apps');
|
|
25
|
+
libsDir !== null && libsDir !== void 0 ? libsDir : (libsDir = 'libs');
|
|
26
|
+
const parts = directory.split(/[\/\\]/g);
|
|
27
|
+
if ([appsDir, libsDir].includes(parts[0])) {
|
|
28
|
+
parts.splice(0, 1);
|
|
29
|
+
}
|
|
30
|
+
return parts.join('-').toLowerCase();
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=set-project-names.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"set-project-names.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-15-1-0/set-project-names.ts"],"names":[],"mappings":";;;AACA,wFAIsD;AACtD,qJAA4I;AAC5I,+BAA4B;AAE5B,mBAA+B,IAAU;;QACvC,mLAAmL;QACnL,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;gBACtD,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;oBACpB,UAAU,CAAC,IAAI,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE,IAAA,kCAAU,EAAC,IAAI,CAAC,CAAC,CAAC;iBACpE;gBACD,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aACxD;SACF;QAED,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;IACxD,CAAC;CAAA;AAZD,4BAYC;AAED,SAAS,aAAa,CAAC,SAAiB,EAAE,MAAW;IACnD,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,eAAe,KAAI,EAAE,CAAC;IACzD,OAAO,aAAP,OAAO,cAAP,OAAO,IAAP,OAAO,GAAK,MAAM,EAAC;IACnB,OAAO,aAAP,OAAO,cAAP,OAAO,IAAP,OAAO,GAAK,MAAM,EAAC;IACnB,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QACzC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KACpB;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;AACvC,CAAC"}
|
|
@@ -116,8 +116,8 @@ function getOutputsForTargetAndConfiguration(task, node) {
|
|
|
116
116
|
.map((output) => {
|
|
117
117
|
return interpolate(output, {
|
|
118
118
|
projectRoot: node.data.root,
|
|
119
|
-
projectName: node.
|
|
120
|
-
project: Object.assign(Object.assign({}, node.data), { name: node.
|
|
119
|
+
projectName: node.name,
|
|
120
|
+
project: Object.assign(Object.assign({}, node.data), { name: node.name }),
|
|
121
121
|
options,
|
|
122
122
|
});
|
|
123
123
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|