nx 22.2.3 → 22.3.0-beta.0
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 +11 -11
- package/src/adapter/ngcli-adapter.d.ts.map +1 -1
- package/src/adapter/ngcli-adapter.js +28 -3
- package/src/command-line/format/format.d.ts.map +1 -1
- package/src/command-line/format/format.js +20 -2
- package/src/command-line/init/implementation/angular/legacy-angular-versions.d.ts.map +1 -1
- package/src/command-line/init/implementation/angular/legacy-angular-versions.js +1 -0
- package/src/command-line/release/changelog.js +2 -0
- package/src/command-line/release/utils/shared.d.ts +3 -1
- package/src/command-line/release/utils/shared.d.ts.map +1 -1
- package/src/command-line/release/utils/shared.js +9 -0
- package/src/core/graph/main.js +1 -1
- package/src/native/index.d.ts +1 -1
- 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/js/lock-file/project-graph-pruning.js +3 -3
- package/src/plugins/js/project-graph/build-dependencies/build-dependencies.d.ts.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/build-dependencies.js +6 -6
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts.map +1 -1
- package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js +24 -16
- package/src/tasks-runner/cache.d.ts.map +1 -1
- package/src/tasks-runner/cache.js +1 -1
package/src/native/index.d.ts
CHANGED
|
@@ -69,7 +69,7 @@ export declare class ImportResult {
|
|
|
69
69
|
|
|
70
70
|
export declare class NxCache {
|
|
71
71
|
cacheDirectory: string
|
|
72
|
-
constructor(workspaceRoot: string, cachePath: string, dbConnection: ExternalObject<NxDbConnection>,
|
|
72
|
+
constructor(workspaceRoot: string, cachePath: string, dbConnection: ExternalObject<NxDbConnection>, maxCacheSize?: number | undefined | null)
|
|
73
73
|
get(hash: string): CachedResult | null
|
|
74
74
|
put(hash: string, terminalOutput: string, outputs: Array<string>, code: number): void
|
|
75
75
|
applyRemoteCacheResults(hash: string, result: CachedResult, outputs?: Array<string> | undefined | null): void
|
|
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,EAGL,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;AAuB3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB;IACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;CACpD,CASA;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,EAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,+BAUnD;
|
|
1
|
+
{"version":3,"file":"pnpm-parser.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/plugins/js/lock-file/pnpm-parser.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,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;AAuB3E,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,GACnB;IACD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;CACpD,CASA;AAED,wBAAgB,2BAA2B,CACzC,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,yBAAyB,EAC9B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,+BAUnD;AAmXD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,qBAAqB,EAClC,aAAa,EAAE,MAAM,GACpB,MAAM,CAuCR"}
|
|
@@ -271,12 +271,14 @@ function getHoistedVersion(packageName, isV5, hoistedKeysByPackage) {
|
|
|
271
271
|
}
|
|
272
272
|
function getDependencies(data, keyMap, isV5, ctx) {
|
|
273
273
|
const results = [];
|
|
274
|
-
Object.
|
|
274
|
+
Object.keys(data.packages).forEach((key) => {
|
|
275
|
+
const snapshot = data.packages[key];
|
|
275
276
|
const nodes = keyMap.get(key);
|
|
276
277
|
nodes.forEach((node) => {
|
|
277
278
|
[snapshot.dependencies, snapshot.optionalDependencies].forEach((section) => {
|
|
278
279
|
if (section) {
|
|
279
|
-
Object.
|
|
280
|
+
Object.keys(section).forEach((name) => {
|
|
281
|
+
const versionRange = section[name];
|
|
280
282
|
const version = parseBaseVersion(findVersion(versionRange, name, isV5), isV5);
|
|
281
283
|
const target = ctx.externalNodes[`npm:${name}@${version}`] ||
|
|
282
284
|
ctx.externalNodes[`npm:${name}`];
|
|
@@ -97,9 +97,9 @@ function addNodesAndDependencies(graph, packageJsonDeps, workspacePackages, buil
|
|
|
97
97
|
}
|
|
98
98
|
else if (workspacePackages.has(name)) {
|
|
99
99
|
// Workspace Node
|
|
100
|
-
const
|
|
101
|
-
if (
|
|
102
|
-
traverseWorkspaceNode(graph, builder,
|
|
100
|
+
const workspaceNode = workspacePackages.get(name);
|
|
101
|
+
if (workspaceNode) {
|
|
102
|
+
traverseWorkspaceNode(graph, builder, workspaceNode);
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/build-dependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAK5F,wBAAgB,yBAAyB,CACvC,cAAc,EAAE;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,EACD,GAAG,EAAE,yBAAyB,GAC7B,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"build-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/build-dependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,iDAAiD,CAAC;AAK5F,wBAAgB,yBAAyB,CACvC,cAAc,EAAE;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,EACD,GAAG,EAAE,yBAAyB,GAC7B,yBAAyB,EAAE,CA8C7B"}
|
|
@@ -11,14 +11,14 @@ function buildExplicitDependencies(jsPluginConfig, ctx) {
|
|
|
11
11
|
// TODO: TargetProjectLocator is a public API, so we can't change the shape of it
|
|
12
12
|
// We should eventually let it accept Record<string, ProjectConfiguration> s.t. we
|
|
13
13
|
// don't have to reshape the CreateDependenciesContext here.
|
|
14
|
-
const nodes =
|
|
15
|
-
|
|
16
|
-
{
|
|
14
|
+
const nodes = {};
|
|
15
|
+
Object.keys(ctx.projects).forEach((key) => {
|
|
16
|
+
nodes[key] = {
|
|
17
17
|
name: key,
|
|
18
18
|
type: null,
|
|
19
|
-
data:
|
|
20
|
-
}
|
|
21
|
-
|
|
19
|
+
data: ctx.projects[key],
|
|
20
|
+
};
|
|
21
|
+
});
|
|
22
22
|
const targetProjectLocator = new target_project_locator_1.TargetProjectLocator(nodes, ctx.externalNodes);
|
|
23
23
|
if (jsPluginConfig.analyzeSourceFiles === undefined ||
|
|
24
24
|
jsPluginConfig.analyzeSourceFiles === true) {
|
package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explicit-package-json-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,iDAAiD,CAAC;
|
|
1
|
+
{"version":3,"file":"explicit-package-json-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/nx/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACnF,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,iDAAiD,CAAC;AAGzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,wBAAgB,oCAAoC,CAClD,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,oBAAoB,GACzC,yBAAyB,EAAE,CAe7B"}
|
package/src/plugins/js/project-graph/build-dependencies/explicit-package-json-dependencies.js
CHANGED
|
@@ -5,25 +5,33 @@ const project_graph_1 = require("../../../../config/project-graph");
|
|
|
5
5
|
const file_utils_1 = require("../../../../project-graph/file-utils");
|
|
6
6
|
const project_graph_builder_1 = require("../../../../project-graph/project-graph-builder");
|
|
7
7
|
const json_1 = require("../../../../utils/json");
|
|
8
|
-
const path_1 = require("../../../../utils/path");
|
|
9
8
|
function buildExplicitPackageJsonDependencies(ctx, targetProjectLocator) {
|
|
10
9
|
const res = [];
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
const roots = {};
|
|
11
|
+
Object.values(ctx.projects).forEach((project) => {
|
|
12
|
+
roots[project.root] = true;
|
|
13
|
+
});
|
|
14
|
+
Object.keys(ctx.filesToProcess.projectFileMap).forEach((source) => {
|
|
15
|
+
Object.values(ctx.filesToProcess.projectFileMap[source]).forEach((f) => {
|
|
16
|
+
if (isPackageJsonAtProjectRoot(roots, f.file)) {
|
|
17
17
|
processPackageJson(source, f.file, ctx, targetProjectLocator, res);
|
|
18
18
|
}
|
|
19
|
-
}
|
|
20
|
-
}
|
|
19
|
+
});
|
|
20
|
+
});
|
|
21
21
|
return res;
|
|
22
22
|
}
|
|
23
|
+
function isPackageJsonAtProjectRoot(roots, fileName) {
|
|
24
|
+
if (!fileName.endsWith('package.json')) {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
const filePath = fileName.slice(0, -13);
|
|
28
|
+
return !!roots[filePath];
|
|
29
|
+
}
|
|
23
30
|
function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLocator, collectedDeps) {
|
|
24
31
|
try {
|
|
25
32
|
const deps = readDeps((0, json_1.parseJson)((0, file_utils_1.defaultFileRead)(packageJsonPath)));
|
|
26
|
-
|
|
33
|
+
Object.keys(deps).forEach((packageName) => {
|
|
34
|
+
const packageVersion = deps[packageName];
|
|
27
35
|
const localProject = targetProjectLocator.findDependencyInWorkspaceProjects(packageJsonPath, packageName, packageVersion);
|
|
28
36
|
if (localProject) {
|
|
29
37
|
// package.json refers to another project in the monorepo
|
|
@@ -35,11 +43,11 @@ function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLo
|
|
|
35
43
|
};
|
|
36
44
|
(0, project_graph_builder_1.validateDependency)(dependency, ctx);
|
|
37
45
|
collectedDeps.push(dependency);
|
|
38
|
-
|
|
46
|
+
return;
|
|
39
47
|
}
|
|
40
48
|
const externalNodeName = targetProjectLocator.findNpmProjectFromImport(packageName, packageJsonPath);
|
|
41
49
|
if (!externalNodeName) {
|
|
42
|
-
|
|
50
|
+
return;
|
|
43
51
|
}
|
|
44
52
|
const dependency = {
|
|
45
53
|
source: sourceProject,
|
|
@@ -49,7 +57,7 @@ function processPackageJson(sourceProject, packageJsonPath, ctx, targetProjectLo
|
|
|
49
57
|
};
|
|
50
58
|
(0, project_graph_builder_1.validateDependency)(dependency, ctx);
|
|
51
59
|
collectedDeps.push(dependency);
|
|
52
|
-
}
|
|
60
|
+
});
|
|
53
61
|
}
|
|
54
62
|
catch (e) {
|
|
55
63
|
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
@@ -70,9 +78,9 @@ function readDeps(packageJson) {
|
|
|
70
78
|
'dependencies',
|
|
71
79
|
];
|
|
72
80
|
for (const type of depType) {
|
|
73
|
-
|
|
74
|
-
deps[depName] =
|
|
75
|
-
}
|
|
81
|
+
Object.keys(packageJson[type] || {}).forEach((depName) => {
|
|
82
|
+
deps[depName] = packageJson[type][depName];
|
|
83
|
+
});
|
|
76
84
|
}
|
|
77
85
|
return deps;
|
|
78
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,yBAAyB,EACzB,WAAW,EAEZ,MAAM,wBAAwB,CAAC;AAKhC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAW5C,OAAO,EAAE,mBAAmB,EAAc,MAAM,mBAAmB,CAAC;AAUpE,MAAM,MAAM,YAAY,GAAG;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAE,CAAC;AAG9E,wBAAgB,cAAc,YAkB7B;AAGD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,GAAG,KAAK,CAS5E;AAED,qBAAa,OAAO;
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ class DbCache {
|
|
|
56
56
|
constructor(options) {
|
|
57
57
|
this.options = options;
|
|
58
58
|
this.nxJson = (0, nx_json_1.readNxJson)();
|
|
59
|
-
this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(),
|
|
59
|
+
this.cache = new native_1.NxCache(workspace_root_1.workspaceRoot, cache_directory_1.cacheDir, (0, db_connection_1.getDbConnection)(), resolveMaxCacheSize(this.nxJson));
|
|
60
60
|
this.isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
|
|
61
61
|
}
|
|
62
62
|
async init() {
|