@nrwl/js 15.3.3 → 15.4.0-beta.1
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 +5 -5
- package/src/executors/node/node.impl.js +16 -12
- package/src/executors/node/node.impl.js.map +1 -1
- package/src/utils/package-json/update-package-json.d.ts +1 -1
- package/src/utils/package-json/update-package-json.js +57 -13
- package/src/utils/package-json/update-package-json.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.4.0-beta.1](https://github.com/nrwl/nx/compare/15.3.3...15.4.0-beta.1) (2022-12-16)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/js
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/js",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.4.0-beta.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
|
|
6
6
|
"repository": {
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"executors": "./executors.json",
|
|
33
33
|
"builders": "./executors.json",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/devkit": "15.
|
|
36
|
-
"@nrwl/linter": "15.
|
|
37
|
-
"@nrwl/workspace": "15.
|
|
35
|
+
"@nrwl/devkit": "15.4.0-beta.1",
|
|
36
|
+
"@nrwl/linter": "15.4.0-beta.1",
|
|
37
|
+
"@nrwl/workspace": "15.4.0-beta.1",
|
|
38
38
|
"chalk": "4.1.0",
|
|
39
39
|
"fast-glob": "3.2.7",
|
|
40
40
|
"fs-extra": "^10.1.0",
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"access": "public"
|
|
49
49
|
},
|
|
50
50
|
"types": "./src/index.d.ts",
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "b94c7e58706ce3b2e70876b648c0b19bf649e01c"
|
|
52
52
|
}
|
|
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
7
7
|
const child_process_1 = require("child_process");
|
|
8
|
+
const crypto_1 = require("crypto");
|
|
8
9
|
const hashing_impl_1 = require("nx/src/hasher/hashing-impl");
|
|
9
10
|
const treeKill = require("tree-kill");
|
|
10
11
|
const util_1 = require("util");
|
|
@@ -14,16 +15,17 @@ const hashedMap = new Map();
|
|
|
14
15
|
function nodeExecutor(options, context) {
|
|
15
16
|
return tslib_1.__asyncGenerator(this, arguments, function* nodeExecutor_1() {
|
|
16
17
|
var e_1, _a;
|
|
18
|
+
const uniqueKey = (0, crypto_1.randomUUID)();
|
|
17
19
|
process.on('SIGTERM', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
18
|
-
yield killCurrentProcess(options, 'SIGTERM');
|
|
20
|
+
yield killCurrentProcess(uniqueKey, options, 'SIGTERM');
|
|
19
21
|
process.exit(128 + 15);
|
|
20
22
|
}));
|
|
21
23
|
process.on('SIGINT', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
yield killCurrentProcess(options, 'SIGINT');
|
|
24
|
+
yield killCurrentProcess(uniqueKey, options, 'SIGINT');
|
|
23
25
|
process.exit(128 + 2);
|
|
24
26
|
}));
|
|
25
27
|
process.on('SIGHUP', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
26
|
-
yield killCurrentProcess(options, 'SIGHUP');
|
|
28
|
+
yield killCurrentProcess(uniqueKey, options, 'SIGHUP');
|
|
27
29
|
process.exit(128 + 1);
|
|
28
30
|
}));
|
|
29
31
|
if (options.waitUntilTargets && options.waitUntilTargets.length > 0) {
|
|
@@ -42,7 +44,7 @@ function nodeExecutor(options, context) {
|
|
|
42
44
|
devkit_1.logger.error('There was an error with the build. See above.');
|
|
43
45
|
devkit_1.logger.info(`${event.outfile} was not restarted.`);
|
|
44
46
|
}
|
|
45
|
-
yield tslib_1.__await(handleBuildEvent(event, options, mappings));
|
|
47
|
+
yield tslib_1.__await(handleBuildEvent(uniqueKey, event, options, mappings));
|
|
46
48
|
yield yield tslib_1.__await(event);
|
|
47
49
|
}
|
|
48
50
|
}
|
|
@@ -66,11 +68,12 @@ function calculateResolveMappings(context, options) {
|
|
|
66
68
|
return m;
|
|
67
69
|
}, {});
|
|
68
70
|
}
|
|
69
|
-
function runProcess(event, options, mappings) {
|
|
71
|
+
function runProcess(uniqueKey, event, options, mappings) {
|
|
70
72
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
71
73
|
const execArgv = getExecArgv(options);
|
|
72
74
|
const hashed = hasher.hashArray(execArgv.concat(options.args));
|
|
73
|
-
|
|
75
|
+
const hashedKey = [uniqueKey, ...options.args];
|
|
76
|
+
hashedMap.set(hashedKey, hashed);
|
|
74
77
|
const subProcess = (0, child_process_1.fork)((0, devkit_1.joinPathFragments)(__dirname, 'node-with-require-overrides'), options.args, {
|
|
75
78
|
execArgv,
|
|
76
79
|
stdio: 'inherit',
|
|
@@ -105,21 +108,22 @@ function getExecArgv(options) {
|
|
|
105
108
|
}
|
|
106
109
|
return args;
|
|
107
110
|
}
|
|
108
|
-
function handleBuildEvent(event, options, mappings) {
|
|
111
|
+
function handleBuildEvent(uniqueKey, event, options, mappings) {
|
|
109
112
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
110
113
|
// Don't kill previous run unless new build is successful.
|
|
111
114
|
if (options.watch && event.success) {
|
|
112
|
-
yield killCurrentProcess(options);
|
|
115
|
+
yield killCurrentProcess(uniqueKey, options);
|
|
113
116
|
}
|
|
114
117
|
if (event.success) {
|
|
115
|
-
yield runProcess(event, options, mappings);
|
|
118
|
+
yield runProcess(uniqueKey, event, options, mappings);
|
|
116
119
|
}
|
|
117
120
|
});
|
|
118
121
|
}
|
|
119
122
|
const promisifiedTreeKill = (0, util_1.promisify)(treeKill);
|
|
120
|
-
function killCurrentProcess(options, signal = 'SIGTERM') {
|
|
123
|
+
function killCurrentProcess(uniqueKey, options, signal = 'SIGTERM') {
|
|
121
124
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
122
|
-
const
|
|
125
|
+
const hashedKey = [uniqueKey, ...options.args];
|
|
126
|
+
const currentProcessKey = hashedMap.get(hashedKey);
|
|
123
127
|
if (!currentProcessKey)
|
|
124
128
|
return;
|
|
125
129
|
const currentProcess = processMap.get(currentProcessKey);
|
|
@@ -144,7 +148,7 @@ function killCurrentProcess(options, signal = 'SIGTERM') {
|
|
|
144
148
|
}
|
|
145
149
|
finally {
|
|
146
150
|
processMap.delete(currentProcessKey);
|
|
147
|
-
hashedMap.delete(
|
|
151
|
+
hashedMap.delete(hashedKey);
|
|
148
152
|
}
|
|
149
153
|
});
|
|
150
154
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,6FAAkG;AAClG,iDAAmD;AACnD,6DAAyD;AACzD,sCAAsC;AACtC,+BAAiC;AAGjC,MAAM,MAAM,GAAG,IAAI,0BAAW,EAAE,CAAC;AACjC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAwB,CAAC;AACnD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;AAO9C,SAAuB,YAAY,CACjC,OAA4B,EAC5B,OAAwB;;;QAExB,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE;YAC/B,MAAM,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"node.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,4 +16,4 @@ export interface UpdatePackageJsonOption {
|
|
|
16
16
|
buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
|
|
17
17
|
}
|
|
18
18
|
export declare function updatePackageJson(options: UpdatePackageJsonOption, context: ExecutorContext, target: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[]): void;
|
|
19
|
-
export declare function
|
|
19
|
+
export declare function updatePackageJsonContent(packageJson: PackageJson, options: UpdatePackageJsonOption): PackageJson;
|
|
@@ -1,31 +1,75 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.updatePackageJsonContent = exports.updatePackageJson = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
6
5
|
const path_1 = require("path");
|
|
7
|
-
const
|
|
6
|
+
const lock_file_1 = require("nx/src/lock-file/lock-file");
|
|
7
|
+
const fs_extra_1 = require("fs-extra");
|
|
8
|
+
const operators_1 = require("nx/src/project-graph/operators");
|
|
8
9
|
function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
|
|
9
10
|
const mainFileDir = (0, path_1.dirname)(main);
|
|
10
11
|
const relativeDir = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, mainFileDir));
|
|
11
12
|
return relativeDir === '' ? `./` : `./${relativeDir}/`;
|
|
12
13
|
}
|
|
13
14
|
function updatePackageJson(options, context, target, dependencies) {
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
:
|
|
15
|
+
const packageJson = (0, devkit_1.createPackageJson)(context.projectName, context.projectGraph, {
|
|
16
|
+
root: context.root,
|
|
17
|
+
// By default we remove devDependencies since this is a production build.
|
|
18
|
+
isProduction: true,
|
|
19
|
+
});
|
|
20
|
+
// make custom modifications to package.json
|
|
21
|
+
updatePackageJsonContent(packageJson, options);
|
|
18
22
|
if (options.excludeLibsInPackageJson) {
|
|
19
23
|
dependencies = dependencies.filter((dep) => dep.node.type !== 'lib');
|
|
20
24
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
options.updateBuildableProjectDepsInPackageJson) {
|
|
24
|
-
(0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
|
|
25
|
+
if (options.updateBuildableProjectDepsInPackageJson) {
|
|
26
|
+
addMissingDependencies(packageJson, context, dependencies, options.buildableProjectDepsInPackageJsonType);
|
|
25
27
|
}
|
|
28
|
+
(0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
|
|
29
|
+
const lockFile = (0, devkit_1.createLockFile)(packageJson);
|
|
30
|
+
(0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, lock_file_1.getLockFileName)()}`, lockFile, {
|
|
31
|
+
encoding: 'utf-8',
|
|
32
|
+
});
|
|
26
33
|
}
|
|
27
34
|
exports.updatePackageJson = updatePackageJson;
|
|
28
|
-
function
|
|
35
|
+
function addMissingDependencies(packageJson, { projectName, targetName, configurationName, root }, dependencies, propType = 'dependencies') {
|
|
36
|
+
const workspacePackageJson = (0, devkit_1.readJsonFile)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json'));
|
|
37
|
+
dependencies.forEach((entry) => {
|
|
38
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
39
|
+
if ((0, operators_1.isNpmProject)(entry.node)) {
|
|
40
|
+
const { packageName, version } = entry.node.data;
|
|
41
|
+
if (((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[packageName]) ||
|
|
42
|
+
((_b = packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b[packageName]) ||
|
|
43
|
+
((_c = packageJson.peerDependencies) === null || _c === void 0 ? void 0 : _c[packageName])) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
if ((_d = workspacePackageJson.devDependencies) === null || _d === void 0 ? void 0 : _d[packageName]) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
(_e = packageJson[propType]) !== null && _e !== void 0 ? _e : (packageJson[propType] = {});
|
|
50
|
+
packageJson[propType][packageName] = version;
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
const packageName = entry.name;
|
|
54
|
+
if (!((_f = packageJson.dependencies) === null || _f === void 0 ? void 0 : _f[packageName]) &&
|
|
55
|
+
!((_g = packageJson.peerDependencies) === null || _g === void 0 ? void 0 : _g[packageName])) {
|
|
56
|
+
const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
|
|
57
|
+
overrides: {},
|
|
58
|
+
target: {
|
|
59
|
+
project: projectName,
|
|
60
|
+
target: targetName,
|
|
61
|
+
configuration: configurationName,
|
|
62
|
+
},
|
|
63
|
+
}, entry.node);
|
|
64
|
+
const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
|
|
65
|
+
const version = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
|
|
66
|
+
(_h = packageJson[propType]) !== null && _h !== void 0 ? _h : (packageJson[propType] = {});
|
|
67
|
+
packageJson[propType][packageName] = version;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
function updatePackageJsonContent(packageJson, options) {
|
|
29
73
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
30
74
|
var _o, _p;
|
|
31
75
|
// Default is CJS unless esm is explicitly passed.
|
|
@@ -78,5 +122,5 @@ function getUpdatedPackageJsonContent(packageJson, options) {
|
|
|
78
122
|
}
|
|
79
123
|
return packageJson;
|
|
80
124
|
}
|
|
81
|
-
exports.
|
|
125
|
+
exports.updatePackageJsonContent = updatePackageJsonContent;
|
|
82
126
|
//# sourceMappingURL=update-package-json.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/update-package-json.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/update-package-json.ts"],"names":[],"mappings":"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"}
|