@nrwl/js 15.3.0-beta.6 → 15.3.0-beta.8
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 +6 -7
- package/src/executors/tsc/tsc.impl.js +3 -3
- package/src/executors/tsc/tsc.impl.js.map +1 -1
- package/src/utils/assets/copy-assets-handler.d.ts +1 -1
- package/src/utils/assets/copy-assets-handler.js +12 -5
- package/src/utils/assets/copy-assets-handler.js.map +1 -1
- package/src/utils/package-json/index.js +1 -2
- package/src/utils/package-json/index.js.map +1 -1
- package/src/utils/watch-for-single-file-changes.d.ts +1 -1
- package/src/utils/watch-for-single-file-changes.js +11 -13
- package/src/utils/watch-for-single-file-changes.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.3.0-beta.
|
|
6
|
+
# [15.3.0-beta.8](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.8) (2022-11-30)
|
|
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.0-beta.
|
|
3
|
+
"version": "15.3.0-beta.8",
|
|
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,11 +32,10 @@
|
|
|
32
32
|
"executors": "./executors.json",
|
|
33
33
|
"builders": "./executors.json",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/devkit": "15.3.0-beta.
|
|
36
|
-
"@nrwl/jest": "15.3.0-beta.
|
|
37
|
-
"@nrwl/linter": "15.3.0-beta.
|
|
38
|
-
"@nrwl/workspace": "15.3.0-beta.
|
|
39
|
-
"@parcel/watcher": "2.0.4",
|
|
35
|
+
"@nrwl/devkit": "15.3.0-beta.8",
|
|
36
|
+
"@nrwl/jest": "15.3.0-beta.8",
|
|
37
|
+
"@nrwl/linter": "15.3.0-beta.8",
|
|
38
|
+
"@nrwl/workspace": "15.3.0-beta.8",
|
|
40
39
|
"chalk": "4.1.0",
|
|
41
40
|
"fast-glob": "3.2.7",
|
|
42
41
|
"fs-extra": "^10.1.0",
|
|
@@ -50,5 +49,5 @@
|
|
|
50
49
|
"access": "public"
|
|
51
50
|
},
|
|
52
51
|
"types": "./src/index.d.ts",
|
|
53
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "ee65e6a1001330a44d3d3ff8f53aad953095f956"
|
|
54
53
|
}
|
|
@@ -88,11 +88,11 @@ function tscExecutor(_options, context) {
|
|
|
88
88
|
}));
|
|
89
89
|
if (options.watch) {
|
|
90
90
|
const disposeWatchAssetChanges = yield tslib_1.__await(assetHandler.watchAndProcessOnAssetChange());
|
|
91
|
-
const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)(
|
|
91
|
+
const disposePackageJsonChanges = yield tslib_1.__await((0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies)));
|
|
92
92
|
const handleTermination = (exitCode) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
93
|
-
yield disposeWatchAssetChanges();
|
|
94
|
-
yield disposePackageJsonChanges();
|
|
95
93
|
yield typescriptCompilation.close();
|
|
94
|
+
disposeWatchAssetChanges();
|
|
95
|
+
disposePackageJsonChanges();
|
|
96
96
|
process.exit(exitCode);
|
|
97
97
|
});
|
|
98
98
|
process.on('SIGINT', () => handleTermination(128 + 2));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export declare class CopyAssetsHandler {
|
|
|
22
22
|
private readonly callback;
|
|
23
23
|
constructor(opts: CopyAssetHandlerOptions);
|
|
24
24
|
processAllAssetsOnce(): Promise<void>;
|
|
25
|
-
watchAndProcessOnAssetChange(): Promise<() =>
|
|
25
|
+
watchAndProcessOnAssetChange(): Promise<() => void>;
|
|
26
26
|
private processEvents;
|
|
27
27
|
}
|
|
28
28
|
export {};
|
|
@@ -8,6 +8,7 @@ const fse = require("fs-extra");
|
|
|
8
8
|
const ignore_1 = require("ignore");
|
|
9
9
|
const fg = require("fast-glob");
|
|
10
10
|
const devkit_1 = require("@nrwl/devkit");
|
|
11
|
+
const client_1 = require("nx/src/daemon/client/client");
|
|
11
12
|
const defaultFileEventHandler = (events) => {
|
|
12
13
|
const dirs = new Set(events.map((event) => path.dirname(event.dest)));
|
|
13
14
|
dirs.forEach((d) => fse.ensureDirSync(d));
|
|
@@ -104,17 +105,23 @@ class CopyAssetsHandler {
|
|
|
104
105
|
}
|
|
105
106
|
watchAndProcessOnAssetChange() {
|
|
106
107
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
107
|
-
const
|
|
108
|
-
|
|
108
|
+
const unregisterFileWatcher = yield client_1.daemonClient.registerFileWatcher({
|
|
109
|
+
watchProjects: 'all',
|
|
110
|
+
includeGlobalWorkspaceFiles: true,
|
|
111
|
+
}, (err, data) => {
|
|
109
112
|
var _a;
|
|
110
|
-
if (err) {
|
|
113
|
+
if (err === 'closed') {
|
|
114
|
+
devkit_1.logger.error(`Watch error: Daemon closed the connection`);
|
|
115
|
+
process.exit(1);
|
|
116
|
+
}
|
|
117
|
+
else if (err) {
|
|
111
118
|
devkit_1.logger.error(`Watch error: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : 'Unknown'}`);
|
|
112
119
|
}
|
|
113
120
|
else {
|
|
114
|
-
this.processEvents(
|
|
121
|
+
this.processEvents(data.changedFiles);
|
|
115
122
|
}
|
|
116
123
|
});
|
|
117
|
-
return () =>
|
|
124
|
+
return () => unregisterFileWatcher();
|
|
118
125
|
});
|
|
119
126
|
}
|
|
120
127
|
processEvents(events) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy-assets-handler.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"copy-assets-handler.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/assets/copy-assets-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.copyPackageJson = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const path_1 = require("path");
|
|
6
5
|
const watch_for_single_file_changes_1 = require("../watch-for-single-file-changes");
|
|
7
6
|
const update_package_json_1 = require("./update-package-json");
|
|
8
7
|
const check_dependencies_1 = require("../check-dependencies");
|
|
@@ -20,7 +19,7 @@ function copyPackageJson(_options, context) {
|
|
|
20
19
|
dependencies = options.overrideDependencies;
|
|
21
20
|
}
|
|
22
21
|
if (options.watch) {
|
|
23
|
-
const dispose = yield (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(
|
|
22
|
+
const dispose = yield (0, watch_for_single_file_changes_1.watchForSingleFileChanges)(context.projectName, options.projectRoot, 'package.json', () => (0, update_package_json_1.updatePackageJson)(options, context, target, dependencies));
|
|
24
23
|
// Copy it once before changes
|
|
25
24
|
(0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
|
|
26
25
|
return { success: true, stop: dispose };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/index.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/index.ts"],"names":[],"mappings":";;;;AAIA,oFAA6E;AAE7E,+DAA0D;AAC1D,8DAA0D;AAe1D,SAAsB,eAAe,CACnC,QAAgC,EAChC,OAAwB;;QAExB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,uCAAuC,OAAO,CAAC,UAAU,gBAAgB,OAAO,CAAC,WAAW,8DAA8D,CAC3J,CAAC;SACH;QACD,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,IAAA,sCAAiB,EAC3D,OAAO,EACP,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAChC,CAAC;QACF,MAAM,OAAO,mCAAQ,QAAQ,KAAE,WAAW,GAAE,CAAC;QAE7C,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;SACjD;QACD,IAAI,OAAO,CAAC,oBAAoB,EAAE;YAChC,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC;SAC7C;QAED,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,MAAM,OAAO,GAAG,MAAM,IAAA,yDAAyB,EAC7C,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,WAAW,EACnB,cAAc,EACd,GAAG,EAAE,CAAC,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAChE,CAAC;YACF,8BAA8B;YAC9B,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SACzC;aAAM;YACL,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;YAC1D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;IACH,CAAC;CAAA;AApCD,0CAoCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function watchForSingleFileChanges(
|
|
1
|
+
export declare function watchForSingleFileChanges(projectName: string, projectRoot: string, relativeFilePath: string, callback: () => void): Promise<() => void>;
|
|
@@ -3,26 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.watchForSingleFileChanges = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const client_1 = require("nx/src/daemon/client/client");
|
|
6
7
|
const path_1 = require("path");
|
|
7
|
-
function watchForSingleFileChanges(
|
|
8
|
+
function watchForSingleFileChanges(projectName, projectRoot, relativeFilePath, callback) {
|
|
8
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
-
const
|
|
10
|
-
const subscription = yield watcher.subscribe(watchDir, (err, events) => {
|
|
10
|
+
const unregisterFileWatcher = yield client_1.daemonClient.registerFileWatcher({ watchProjects: [projectName] }, (err, data) => {
|
|
11
11
|
var _a;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
if (err === 'closed') {
|
|
13
|
+
devkit_1.logger.error(`Watch error: Daemon closed the connection`);
|
|
14
|
+
process.exit(1);
|
|
15
|
+
}
|
|
16
|
+
else if (err) {
|
|
14
17
|
devkit_1.logger.error(`Watch error: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : 'Unknown'}`);
|
|
15
18
|
}
|
|
16
|
-
else {
|
|
17
|
-
|
|
18
|
-
if (event.path === file) {
|
|
19
|
-
callback();
|
|
20
|
-
break;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
19
|
+
else if (data.changedFiles.some((file) => file.path == (0, path_1.join)(projectRoot, relativeFilePath))) {
|
|
20
|
+
callback();
|
|
23
21
|
}
|
|
24
22
|
});
|
|
25
|
-
return () =>
|
|
23
|
+
return () => unregisterFileWatcher();
|
|
26
24
|
});
|
|
27
25
|
}
|
|
28
26
|
exports.watchForSingleFileChanges = watchForSingleFileChanges;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch-for-single-file-changes.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/watch-for-single-file-changes.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,+BAA4B;AAE5B,SAAsB,yBAAyB,CAC7C,
|
|
1
|
+
{"version":3,"file":"watch-for-single-file-changes.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/watch-for-single-file-changes.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,wDAA2D;AAC3D,+BAA4B;AAE5B,SAAsB,yBAAyB,CAC7C,WAAmB,EACnB,WAAmB,EACnB,gBAAwB,EACxB,QAAoB;;QAEpB,MAAM,qBAAqB,GAAG,MAAM,qBAAY,CAAC,mBAAmB,CAClE,EAAE,aAAa,EAAE,CAAC,WAAW,CAAC,EAAE,EAChC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;;YACZ,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACpB,eAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;iBAAM,IAAI,GAAG,EAAE;gBACd,eAAM,CAAC,KAAK,CAAC,gBAAgB,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,mCAAI,SAAS,EAAE,CAAC,CAAC;aAC3D;iBAAM,IACL,IAAI,CAAC,YAAY,CAAC,IAAI,CACpB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,IAAA,WAAI,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAC3D,EACD;gBACA,QAAQ,EAAE,CAAC;aACZ;QACH,CAAC,CACF,CAAC;QAEF,OAAO,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC;IACvC,CAAC;CAAA;AAzBD,8DAyBC"}
|