nx 14.7.18 → 15.0.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/CHANGELOG.md +1 -1
- package/package.json +15 -12
- package/src/config/workspaces.js +7 -6
- package/src/config/workspaces.js.map +1 -1
- package/src/utils/lock-file/lock-file-type.d.ts +1 -0
- package/src/utils/lock-file/lock-file.d.ts +4 -0
- package/src/utils/lock-file/lock-file.js +35 -10
- package/src/utils/lock-file/lock-file.js.map +1 -1
- package/src/utils/lock-file/npm.js +1 -0
- package/src/utils/lock-file/npm.js.map +1 -1
- package/src/utils/lock-file/pnpm.js +1 -0
- package/src/utils/lock-file/pnpm.js.map +1 -1
- package/src/utils/lock-file/utils.d.ts +6 -0
- package/src/utils/lock-file/utils.js +11 -1
- package/src/utils/lock-file/utils.js.map +1 -1
- package/src/utils/lock-file/yarn.js +9 -3
- package/src/utils/lock-file/yarn.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
|
-
|
|
6
|
+
# [15.0.0-beta.0](https://github.com/nrwl/nx/compare/14.8.0...15.0.0-beta.0) (2022-09-28)
|
|
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": "
|
|
3
|
+
"version": "15.0.0-beta.0",
|
|
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": "
|
|
36
|
-
"@nrwl/tao": "
|
|
35
|
+
"@nrwl/cli": "15.0.0-beta.0",
|
|
36
|
+
"@nrwl/tao": "15.0.0-beta.0",
|
|
37
37
|
"@parcel/watcher": "2.0.4",
|
|
38
38
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
39
39
|
"@yarnpkg/parsers": "^3.0.0-rc.18",
|
|
@@ -82,31 +82,34 @@
|
|
|
82
82
|
"nx-migrations": {
|
|
83
83
|
"migrations": "./migrations.json",
|
|
84
84
|
"packageGroup": [
|
|
85
|
-
"@nrwl/workspace",
|
|
86
85
|
"@nrwl/angular",
|
|
86
|
+
"@nrwl/cli",
|
|
87
87
|
"@nrwl/cypress",
|
|
88
|
+
"@nrwl/detox",
|
|
88
89
|
"@nrwl/devkit",
|
|
90
|
+
"@nrwl/esbuild",
|
|
89
91
|
"@nrwl/eslint-plugin-nx",
|
|
92
|
+
"@nrwl/expo",
|
|
90
93
|
"@nrwl/express",
|
|
91
94
|
"@nrwl/jest",
|
|
95
|
+
"@nrwl/js",
|
|
92
96
|
"@nrwl/linter",
|
|
93
97
|
"@nrwl/nest",
|
|
94
98
|
"@nrwl/next",
|
|
95
99
|
"@nrwl/node",
|
|
96
100
|
"@nrwl/nx-plugin",
|
|
97
101
|
"@nrwl/react",
|
|
102
|
+
"@nrwl/react-native",
|
|
103
|
+
"@nrwl/rollup",
|
|
98
104
|
"@nrwl/storybook",
|
|
99
|
-
"@nrwl/web",
|
|
100
|
-
"@nrwl/js",
|
|
101
|
-
"@nrwl/cli",
|
|
102
105
|
"@nrwl/tao",
|
|
106
|
+
"@nrwl/web",
|
|
107
|
+
"@nrwl/webpack",
|
|
108
|
+
"@nrwl/workspace",
|
|
103
109
|
{
|
|
104
110
|
"package": "@nrwl/nx-cloud",
|
|
105
111
|
"version": "latest"
|
|
106
|
-
}
|
|
107
|
-
"@nrwl/react-native",
|
|
108
|
-
"@nrwl/detox",
|
|
109
|
-
"@nrwl/expo"
|
|
112
|
+
}
|
|
110
113
|
]
|
|
111
114
|
},
|
|
112
115
|
"executors": "./executors.json",
|
|
@@ -116,5 +119,5 @@
|
|
|
116
119
|
},
|
|
117
120
|
"main": "./bin/nx.js",
|
|
118
121
|
"types": "./bin/nx.d.ts",
|
|
119
|
-
"gitHead": "
|
|
122
|
+
"gitHead": "40c8859ff039dcf30a8b55a9abfbbfcb38eb4b88"
|
|
120
123
|
}
|
package/src/config/workspaces.js
CHANGED
|
@@ -518,21 +518,22 @@ function buildProjectConfigurationFromPackageJson(path, packageJson, nxJson) {
|
|
|
518
518
|
var _a, _b, _c, _d;
|
|
519
519
|
const directory = (0, path_1.dirname)(path).split('\\').join('/');
|
|
520
520
|
let name = (_a = packageJson.name) !== null && _a !== void 0 ? _a : toProjectName(directory, nxJson);
|
|
521
|
-
if (nxJson.npmScope) {
|
|
521
|
+
if (nxJson === null || nxJson === void 0 ? void 0 : nxJson.npmScope) {
|
|
522
522
|
const npmPrefix = `@${nxJson.npmScope}/`;
|
|
523
523
|
if (name.startsWith(npmPrefix)) {
|
|
524
524
|
name = name.replace(npmPrefix, '');
|
|
525
525
|
}
|
|
526
526
|
}
|
|
527
|
+
const projectType = ((_b = nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) === null || _b === void 0 ? void 0 : _b.appsDir) != ((_c = nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) === null || _c === void 0 ? void 0 : _c.libsDir) &&
|
|
528
|
+
((_d = nxJson === null || nxJson === void 0 ? void 0 : nxJson.workspaceLayout) === null || _d === void 0 ? void 0 : _d.appsDir) &&
|
|
529
|
+
directory.startsWith(nxJson.workspaceLayout.appsDir)
|
|
530
|
+
? 'application'
|
|
531
|
+
: 'library';
|
|
527
532
|
return {
|
|
528
533
|
root: directory,
|
|
529
534
|
sourceRoot: directory,
|
|
530
535
|
name,
|
|
531
|
-
projectType
|
|
532
|
-
((_d = nxJson.workspaceLayout) === null || _d === void 0 ? void 0 : _d.appsDir) &&
|
|
533
|
-
directory.startsWith(nxJson.workspaceLayout.appsDir)
|
|
534
|
-
? 'application'
|
|
535
|
-
: 'library',
|
|
536
|
+
projectType,
|
|
536
537
|
};
|
|
537
538
|
}
|
|
538
539
|
function inferProjectFromNonStandardFile(file, nxJson) {
|
|
@@ -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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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { PackageManager } from '../package-manager';
|
|
2
2
|
import { LockFileData } from './lock-file-type';
|
|
3
|
+
/**
|
|
4
|
+
* Hashes lock file content
|
|
5
|
+
*/
|
|
6
|
+
export declare function lockFileHash(packageManager?: PackageManager): string;
|
|
3
7
|
/**
|
|
4
8
|
* Parses lock file and maps dependencies and metadata to {@link LockFileData}
|
|
5
9
|
*/
|
|
@@ -1,25 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pruneLockFile = exports.writeLockFile = exports.parseLockFile = void 0;
|
|
3
|
+
exports.pruneLockFile = exports.writeLockFile = exports.parseLockFile = exports.lockFileHash = void 0;
|
|
4
4
|
const fs_extra_1 = require("fs-extra");
|
|
5
5
|
const package_manager_1 = require("../package-manager");
|
|
6
6
|
const yarn_1 = require("./yarn");
|
|
7
7
|
const npm_1 = require("./npm");
|
|
8
8
|
const pnpm_1 = require("./pnpm");
|
|
9
|
+
const workspace_root_1 = require("../workspace-root");
|
|
10
|
+
const path_1 = require("path");
|
|
11
|
+
const utils_1 = require("./utils");
|
|
12
|
+
/**
|
|
13
|
+
* Hashes lock file content
|
|
14
|
+
*/
|
|
15
|
+
function lockFileHash(packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
|
|
16
|
+
let file;
|
|
17
|
+
if (packageManager === 'yarn') {
|
|
18
|
+
file = (0, fs_extra_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'yarn.lock'), 'utf8');
|
|
19
|
+
}
|
|
20
|
+
if (packageManager === 'pnpm') {
|
|
21
|
+
file = (0, fs_extra_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-lock.yaml'), 'utf8');
|
|
22
|
+
}
|
|
23
|
+
if (packageManager === 'npm') {
|
|
24
|
+
file = (0, fs_extra_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package-lock.json'), 'utf8');
|
|
25
|
+
}
|
|
26
|
+
if (file) {
|
|
27
|
+
return (0, utils_1.hashString)(file);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
throw Error(`Unknown package manager ${packageManager} or lock file missing`);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.lockFileHash = lockFileHash;
|
|
9
34
|
/**
|
|
10
35
|
* Parses lock file and maps dependencies and metadata to {@link LockFileData}
|
|
11
36
|
*/
|
|
12
|
-
function parseLockFile(packageManager = (0, package_manager_1.detectPackageManager)()) {
|
|
37
|
+
function parseLockFile(packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
|
|
13
38
|
if (packageManager === 'yarn') {
|
|
14
|
-
const file = (0, fs_extra_1.readFileSync)('yarn.lock', 'utf8');
|
|
39
|
+
const file = (0, fs_extra_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'yarn.lock'), 'utf8');
|
|
15
40
|
return (0, yarn_1.parseYarnLockFile)(file);
|
|
16
41
|
}
|
|
17
42
|
if (packageManager === 'pnpm') {
|
|
18
|
-
const file = (0, fs_extra_1.readFileSync)('pnpm-lock.yaml', 'utf8');
|
|
43
|
+
const file = (0, fs_extra_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-lock.yaml'), 'utf8');
|
|
19
44
|
return (0, pnpm_1.parsePnpmLockFile)(file);
|
|
20
45
|
}
|
|
21
46
|
if (packageManager === 'npm') {
|
|
22
|
-
const file = (0, fs_extra_1.readFileSync)('package-lock.json', 'utf8');
|
|
47
|
+
const file = (0, fs_extra_1.readFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package-lock.json'), 'utf8');
|
|
23
48
|
return (0, npm_1.parseNpmLockFile)(file);
|
|
24
49
|
}
|
|
25
50
|
throw Error(`Unknown package manager: ${packageManager}`);
|
|
@@ -28,20 +53,20 @@ exports.parseLockFile = parseLockFile;
|
|
|
28
53
|
/**
|
|
29
54
|
* Stringifies {@link LockFileData} content and writes it to lock file
|
|
30
55
|
*/
|
|
31
|
-
function writeLockFile(lockFile, packageManager = (0, package_manager_1.detectPackageManager)()) {
|
|
56
|
+
function writeLockFile(lockFile, packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
|
|
32
57
|
if (packageManager === 'yarn') {
|
|
33
58
|
const content = (0, yarn_1.stringifyYarnLockFile)(lockFile);
|
|
34
|
-
(0, fs_extra_1.writeFileSync)('yarn.lock', content);
|
|
59
|
+
(0, fs_extra_1.writeFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'yarn.lock'), content);
|
|
35
60
|
return;
|
|
36
61
|
}
|
|
37
62
|
if (packageManager === 'pnpm') {
|
|
38
63
|
const content = (0, pnpm_1.stringifyPnpmLockFile)(lockFile);
|
|
39
|
-
(0, fs_extra_1.writeFileSync)('pnpm-lock.yaml', content);
|
|
64
|
+
(0, fs_extra_1.writeFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-lock.yaml'), content);
|
|
40
65
|
return;
|
|
41
66
|
}
|
|
42
67
|
if (packageManager === 'npm') {
|
|
43
68
|
const content = (0, npm_1.stringifyNpmLockFile)(lockFile);
|
|
44
|
-
(0, fs_extra_1.writeFileSync)('package-lock.json', content);
|
|
69
|
+
(0, fs_extra_1.writeFileSync)((0, path_1.join)(workspace_root_1.workspaceRoot, 'package-lock.json'), content);
|
|
45
70
|
return;
|
|
46
71
|
}
|
|
47
72
|
throw Error(`Unknown package manager: ${packageManager}`);
|
|
@@ -51,7 +76,7 @@ exports.writeLockFile = writeLockFile;
|
|
|
51
76
|
* Prunes {@link LockFileData} based on minimal necessary set of packages
|
|
52
77
|
* Returns new {@link LockFileData}
|
|
53
78
|
*/
|
|
54
|
-
function pruneLockFile(lockFile, packages, packageManager = (0, package_manager_1.detectPackageManager)()) {
|
|
79
|
+
function pruneLockFile(lockFile, packages, packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot)) {
|
|
55
80
|
if (packageManager === 'yarn') {
|
|
56
81
|
return (0, yarn_1.pruneYarnLockFile)(lockFile, packages);
|
|
57
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock-file.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/lock-file.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AACvD,wDAA0E;AAC1E,iCAIgB;AAChB,+BAIe;AACf,iCAIgB;
|
|
1
|
+
{"version":3,"file":"lock-file.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/lock-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/npm.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/npm.ts"],"names":[],"mappings":";;;;AACA,mCAAiD;AA6BjD;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,QAAgB;IAC/C,MAAM,KAA0C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAA9D,EAAE,QAAQ,EAAE,YAAY,OAAsC,EAAjC,QAAQ,sBAArC,4BAAuC,CAAuB,CAAC;IACrE,OAAO;QACL,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC;QACnC,gBAAgB,EAAE;YAChB,QAAQ;YACR,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;SAC1B;QACD,IAAI,EAAE,IAAA,kBAAU,EAAC,QAAQ,CAAC;KAC3B,CAAC;AACJ,CAAC;AAVD,4CAUC;AAED,8EAA8E;AAC9E,SAAS,WAAW,CAAC,QAAsB;IACzC,MAAM,cAAc,GAAiC,EAAE,CAAC;IAExD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,EAAkC,EAAE,EAAE;YAAtC,CAAC,GAAG,UAA8B,EAA5B,EAAE,GAAG,EAAE,QAAQ,OAAY,EAAP,KAAK,sBAAzB,mBAA2B,CAAF;QAC/D,oBAAoB;QACpB,IAAI,CAAC,GAAG,EAAE;YACR,OAAO;SACR;QACD,sEAAsE;QACtE,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;QACrE,cAAc,CAAC,WAAW,CAAC,GAAG,cAAc,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAEhE,MAAM,WAAW,GAAG;YAClB,IAAI,EAAE,GAAG;YACT,GAAG;YACH,QAAQ;SACT,CAAC;QAEF,MAAM,MAAM,GAAG,WAAW,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC;QACjD,IAAI,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,EAAE;YACvC,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACnE;aAAM;YACL,cAAc,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,mCAC9B,KAAK,KACR,WAAW,EAAE,CAAC,WAAW,CAAC,GAC3B,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IACH,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAC,YAA0B;IAC7D,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,QAAQ,GAAiB;QAC7B,EAAE,EAAE,YAAY,CAAC,gBAAgB,CAAC,WAAW;KAC9C,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACpD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,eAAe,GAAG,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAE9C,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC9B,wBAAwB,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;KACJ;IAED,6BAA6B;IAC7B,MAAM,YAAY,mCACb,YAAY,CAAC,gBAAgB,CAAC,QAAQ,KACzC,QAAQ,EAAE,IAAA,kBAAU,EAAC,QAAQ,CAAC,EAC9B,YAAY,EAAE,gBAAgB,CAAC,YAAY,CAAC,GAC7C,CAAC;IAEF,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;AACtD,CAAC;AA1BD,oDA0BC;AAED,oDAAoD;AACpD,SAAS,YAAY,CACnB,QAAsB,EACtB,EAA4C;QAA5C,EAAE,WAAW,OAA+B,EAA1B,KAAK,sBAAvB,eAAyB,CAAF;IAEvB,mEAAmE;IACnE,MAAM,EACJ,OAAO,EACP,QAAQ,EACR,SAAS,EACT,OAAO,EACP,WAAW,EACX,gBAAgB,KAEd,KAAK,EADJ,IAAI,kBACL,KAAK,EARH,kFAQL,CAAQ,CAAC;IAEV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/C,8FAA8F;QAC9F,QAAQ,CAAC,IAAI,CAAC,mBACZ,OAAO;YACP,QAAQ;YACR,SAAS;YACT,GAAG;YACH,WAAW;YACX,gBAAgB;YAChB,OAAO;YACP,QAAQ,IACL,IAAI,CACR,CAAC;KACH;AACH,CAAC;AAED,SAAS,wBAAwB,CAC/B,YAA2C,EAC3C,WAAmB,EACnB,EAA6E;QAA7E,EAAE,WAAW,OAAgE,EAA3D,KAAK,sBAAvB,eAAyB,CAAF;IAEvB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEzD,MAAM,SAAS,GAAG,sCAAsC,CACtD,WAAW,EACX,YAAY,CACb,CAAC;QACF,MAAM,QAAQ,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAEhD,iDAAiD;QACjD,SAAS,CAAC,WAAW,CAAC,mBACpB,OAAO;YACP,QAAQ;YACR,SAAS;YACT,GAAG;YACH,WAAW;YACX,QAAQ;YACR,QAAQ,IACL,SAAS,CAAC,WAAW,CAAC,CAC1B,CAAC;KACH;AACH,CAAC;AAED,8EAA8E;AAC9E,8CAA8C;AAC9C,SAAS,sCAAsC,CAC7C,QAAkB,EAClB,YAA2C;IAE3C,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAC1B,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE;YAC7B,YAAY,CAAC,UAAU,CAAC,GAAG,EAAmB,CAAC;SAChD;QACD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,YAAY,EAAE;YAC1C,YAAY,CAAC,UAAU,CAAC,CAAC,YAAY,GAAG,EAAE,CAAC;SAC5C;QACD,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC;KACtD;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,4EAA4E;AAC5E,SAAS,uBAAuB,CAC9B,KAA6C;IAE7C,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE;QACtD,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,YAAY,mCACb,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,GAC1B,CAAC,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CACtC,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;KACjC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,gCAAgC;AAChC,SAAS,gBAAgB,CACvB,oBAAmD;IAEnD,MAAM,YAAY,GAAG,EAAE,CAAC;IACxB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,CAAC;IAE5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;QACpC,IAAI,KAAK,CAAC,YAAY,EAAE;YACtB,KAAK,CAAC,YAAY,GAAG,gBAAgB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC3D;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAC9B,YAA0B,EAC1B,QAAkB;IAElB,mEAAmE;IACnE,OAAO,CAAC,IAAI,CACV,8EAA8E,CAC/E,CAAC;IACF,OAAO,YAAY,CAAC;AACtB,CAAC;AATD,4CASC"}
|
|
@@ -23,6 +23,7 @@ function parsePnpmLockFile(lockFile) {
|
|
|
23
23
|
return {
|
|
24
24
|
dependencies: mapPackages(dependencies, devDependencies, specifiers, packages, metadata.lockfileVersion.toString().endsWith('inlineSpecifiers')),
|
|
25
25
|
lockFileMetadata: Object.assign({}, metadata),
|
|
26
|
+
hash: (0, utils_1.hashString)(lockFile),
|
|
26
27
|
};
|
|
27
28
|
}
|
|
28
29
|
exports.parsePnpmLockFile = parsePnpmLockFile;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/pnpm.ts"],"names":[],"mappings":";;;;AACA,8CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/pnpm.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,3 +4,9 @@
|
|
|
4
4
|
* @returns
|
|
5
5
|
*/
|
|
6
6
|
export declare function sortObject<T = string>(obj: Record<string, T>, valueTransformator?: (value: T) => any): Record<string, T> | undefined;
|
|
7
|
+
/**
|
|
8
|
+
* Apply simple hashing of the content using the default hashing implementation
|
|
9
|
+
* @param fileContent
|
|
10
|
+
* @returns
|
|
11
|
+
*/
|
|
12
|
+
export declare function hashString(fileContent: string): string;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.sortObject = void 0;
|
|
3
|
+
exports.hashString = exports.sortObject = void 0;
|
|
4
|
+
const hashing_impl_1 = require("../../hasher/hashing-impl");
|
|
4
5
|
/**
|
|
5
6
|
* Simple sort function to ensure keys are ordered alphabetically
|
|
6
7
|
* @param obj
|
|
@@ -18,4 +19,13 @@ function sortObject(obj, valueTransformator = (value) => value) {
|
|
|
18
19
|
return result;
|
|
19
20
|
}
|
|
20
21
|
exports.sortObject = sortObject;
|
|
22
|
+
/**
|
|
23
|
+
* Apply simple hashing of the content using the default hashing implementation
|
|
24
|
+
* @param fileContent
|
|
25
|
+
* @returns
|
|
26
|
+
*/
|
|
27
|
+
function hashString(fileContent) {
|
|
28
|
+
return hashing_impl_1.defaultHashing.hashArray([fileContent]);
|
|
29
|
+
}
|
|
30
|
+
exports.hashString = hashString;
|
|
21
31
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/utils.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,SAAgB,UAAU,CACxB,GAAsB,EACtB,qBAAwC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IAExD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAdD,gCAcC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/utils.ts"],"names":[],"mappings":";;;AAAA,4DAA2D;AAE3D;;;;GAIG;AACH,SAAgB,UAAU,CACxB,GAAsB,EACtB,qBAAwC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IAExD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO;KACR;IAED,MAAM,MAAM,GAAsB,EAAE,CAAC;IACrC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAdD,gCAcC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,OAAO,6BAAc,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,gCAEC"}
|
|
@@ -17,6 +17,7 @@ function parseYarnLockFile(lockFile) {
|
|
|
17
17
|
// Yarn Berry has workspace packages includes, so we need to extract those to metadata
|
|
18
18
|
const [mappedPackages, workspacePackages] = mapPackages(dependencies);
|
|
19
19
|
const isBerry = !!__metadata;
|
|
20
|
+
const hash = (0, utils_1.hashString)(lockFile);
|
|
20
21
|
if (isBerry) {
|
|
21
22
|
return {
|
|
22
23
|
dependencies: mappedPackages,
|
|
@@ -24,10 +25,11 @@ function parseYarnLockFile(lockFile) {
|
|
|
24
25
|
__metadata,
|
|
25
26
|
workspacePackages,
|
|
26
27
|
},
|
|
28
|
+
hash,
|
|
27
29
|
};
|
|
28
30
|
}
|
|
29
31
|
else {
|
|
30
|
-
return { dependencies: mappedPackages };
|
|
32
|
+
return { dependencies: mappedPackages, hash };
|
|
31
33
|
}
|
|
32
34
|
}
|
|
33
35
|
exports.parseYarnLockFile = parseYarnLockFile;
|
|
@@ -122,19 +124,23 @@ function pruneYarnLockFile(lockFileData, packages) {
|
|
|
122
124
|
var _a;
|
|
123
125
|
const isBerry = !!((_a = lockFileData.lockFileMetadata) === null || _a === void 0 ? void 0 : _a.__metadata);
|
|
124
126
|
const prunedDependencies = pruneDependencies(lockFileData.dependencies, packages);
|
|
127
|
+
let prunedLockFileData;
|
|
125
128
|
if (isBerry) {
|
|
126
129
|
const { __metadata, workspacePackages } = lockFileData.lockFileMetadata;
|
|
127
|
-
|
|
130
|
+
prunedLockFileData = {
|
|
128
131
|
lockFileMetadata: {
|
|
129
132
|
__metadata,
|
|
130
133
|
workspacePackages: pruneWorkspacePackages(workspacePackages, prunedDependencies, packages),
|
|
131
134
|
},
|
|
132
135
|
dependencies: prunedDependencies,
|
|
136
|
+
hash: '',
|
|
133
137
|
};
|
|
134
138
|
}
|
|
135
139
|
else {
|
|
136
|
-
|
|
140
|
+
prunedLockFileData = { dependencies: prunedDependencies, hash: '' };
|
|
137
141
|
}
|
|
142
|
+
prunedLockFileData.hash = (0, utils_1.hashString)(JSON.stringify(prunedLockFileData));
|
|
143
|
+
return prunedLockFileData;
|
|
138
144
|
}
|
|
139
145
|
exports.pruneYarnLockFile = pruneYarnLockFile;
|
|
140
146
|
// iterate over packages to collect the affected tree of dependencies
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/yarn.ts"],"names":[],"mappings":";;;;AAAA,8CAA4D;AAC5D,gDAA8C;AAM9C,
|
|
1
|
+
{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/utils/lock-file/yarn.ts"],"names":[],"mappings":"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"}
|