@nrwl/js 13.8.1 → 13.8.4-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/executors.json +0 -10
- package/generators.json +0 -14
- package/migrations.json +8 -1
- package/package.json +5 -7
- package/src/executors/swc/schema.json +18 -1
- package/src/executors/swc/swc.impl.d.ts +4 -3
- package/src/executors/swc/swc.impl.js +25 -19
- package/src/executors/swc/swc.impl.js.map +1 -1
- package/src/executors/tsc/schema.json +11 -0
- package/src/executors/tsc/tsc.impl.d.ts +5 -2
- package/src/executors/tsc/tsc.impl.js +5 -10
- package/src/executors/tsc/tsc.impl.js.map +1 -1
- package/src/generators/library/files/tsconfig.lib.json__tmpl__ +1 -1
- package/src/generators/library/library.d.ts +12 -2
- package/src/generators/library/library.js +190 -3
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +1 -1
- package/src/index.d.ts +0 -1
- package/src/index.js +1 -3
- package/src/index.js.map +1 -1
- package/src/migrations/update-13-9-0/update-node-executor.d.ts +2 -0
- package/src/migrations/update-13-9-0/update-node-executor.js +28 -0
- package/src/migrations/update-13-9-0/update-node-executor.js.map +1 -0
- package/src/utils/check-dependencies.d.ts +4 -1
- package/src/utils/check-dependencies.js +4 -0
- package/src/utils/check-dependencies.js.map +1 -1
- package/src/utils/copy-assets-handler.js +2 -1
- package/src/utils/copy-assets-handler.js.map +1 -1
- package/src/utils/create-async-iterable/create-async-iteratable.d.ts +6 -0
- package/src/utils/create-async-iterable/create-async-iteratable.js +62 -0
- package/src/utils/create-async-iterable/create-async-iteratable.js.map +1 -0
- package/src/utils/schema.d.ts +5 -7
- package/src/utils/swc/compile-swc.d.ts +6 -3
- package/src/utils/swc/compile-swc.js +128 -108
- package/src/utils/swc/compile-swc.js.map +1 -1
- package/src/utils/typescript/compile-typescript-files.d.ts +4 -2
- package/src/utils/typescript/compile-typescript-files.js +34 -47
- package/src/utils/typescript/compile-typescript-files.js.map +1 -1
- package/src/utils/typescript/run-type-check.d.ts +1 -0
- package/src/utils/typescript/run-type-check.js +2 -2
- package/src/utils/typescript/run-type-check.js.map +1 -1
- package/src/utils/update-package-json.d.ts +4 -1
- package/src/utils/update-package-json.js +10 -9
- package/src/utils/update-package-json.js.map +1 -1
- package/src/utils/versions.d.ts +3 -3
- package/src/utils/versions.js +4 -4
- package/src/utils/versions.js.map +1 -1
- package/src/executors/node/compat.d.ts +0 -2
- package/src/executors/node/compat.js +0 -6
- package/src/executors/node/compat.js.map +0 -1
- package/src/executors/node/node-with-require-overrides.d.ts +0 -5
- package/src/executors/node/node-with-require-overrides.js +0 -20
- package/src/executors/node/node-with-require-overrides.js.map +0 -1
- package/src/executors/node/node.impl.d.ts +0 -5
- package/src/executors/node/node.impl.js +0 -142
- package/src/executors/node/node.impl.js.map +0 -1
- package/src/executors/node/schema.d.ts +0 -16
- package/src/executors/node/schema.json +0 -72
- package/src/generators/application/application.d.ts +0 -5
- package/src/generators/application/application.js +0 -17
- package/src/generators/application/application.js.map +0 -1
- package/src/generators/application/files/README.md +0 -19
- package/src/generators/application/files/package.json__tmpl__ +0 -5
- package/src/generators/application/files/src/app/__fileName__.spec.ts__tmpl__ +0 -7
- package/src/generators/application/files/src/app/__fileName__.ts__tmpl__ +0 -3
- package/src/generators/application/files/src/index.ts__tmpl__ +0 -3
- package/src/generators/application/files/tsconfig.app.json__tmpl__ +0 -10
- package/src/generators/application/files/tsconfig.json__tmpl__ +0 -14
- package/src/generators/application/schema.json +0 -99
- package/src/utils/project-generator.d.ts +0 -12
- package/src/utils/project-generator.js +0 -203
- package/src/utils/project-generator.js.map +0 -1
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const versions_1 = require("@nrwl/workspace/src/utils/versions");
|
|
6
|
+
function update(host) {
|
|
7
|
+
var _a, _b;
|
|
8
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
|
+
const projects = (0, devkit_1.getProjects)(host);
|
|
10
|
+
let installNeeded = false;
|
|
11
|
+
for (const [name, config] of projects.entries()) {
|
|
12
|
+
if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.serve) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/js:node')
|
|
13
|
+
continue;
|
|
14
|
+
config.targets.serve.executor = '@nrwl/node:node';
|
|
15
|
+
installNeeded = true;
|
|
16
|
+
(0, devkit_1.updateProjectConfiguration)(host, name, config);
|
|
17
|
+
}
|
|
18
|
+
const task = installNeeded
|
|
19
|
+
? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
20
|
+
'@nrwl/node': versions_1.nxVersion,
|
|
21
|
+
})
|
|
22
|
+
: undefined;
|
|
23
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
24
|
+
return task;
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
exports.default = update;
|
|
28
|
+
//# sourceMappingURL=update-node-executor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-node-executor.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-13-9-0/update-node-executor.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,iEAA+D;AAE/D,SAA8B,MAAM,CAAC,IAAU;;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,aAAa,GAAG,KAAK,CAAC;QAE1B,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YAC/C,IAAI,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,eAAe;gBAAE,SAAS;YAEnE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,iBAAiB,CAAC;YAElD,aAAa,GAAG,IAAI,CAAC;YACrB,IAAA,mCAA0B,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SAChD;QAED,MAAM,IAAI,GAAG,aAAa;YACxB,CAAC,CAAC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,YAAY,EAAE,oBAAS;aACxB,CACF;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;;CACb;AA1BD,yBA0BC"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
import { ExecutorContext } from '@nrwl/devkit';
|
|
1
|
+
import { ExecutorContext, ProjectGraphProjectNode } from '@nrwl/devkit';
|
|
2
|
+
import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
|
|
2
3
|
export declare function checkDependencies(context: ExecutorContext, tsConfigPath: string): {
|
|
3
4
|
tmpTsConfig: string | null;
|
|
4
5
|
projectRoot: string;
|
|
6
|
+
target: ProjectGraphProjectNode<any>;
|
|
7
|
+
dependencies: DependentBuildableProjectNode[];
|
|
5
8
|
};
|
|
@@ -20,11 +20,15 @@ function checkDependencies(context, tsConfigPath) {
|
|
|
20
20
|
return {
|
|
21
21
|
tmpTsConfig: (0, buildable_libs_utils_1.createTmpTsConfig)(tsConfigPath, context.root, projectRoot, dependencies),
|
|
22
22
|
projectRoot,
|
|
23
|
+
target,
|
|
24
|
+
dependencies,
|
|
23
25
|
};
|
|
24
26
|
}
|
|
25
27
|
return {
|
|
26
28
|
tmpTsConfig: null,
|
|
27
29
|
projectRoot,
|
|
30
|
+
target,
|
|
31
|
+
dependencies,
|
|
28
32
|
};
|
|
29
33
|
}
|
|
30
34
|
exports.checkDependencies = checkDependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/check-dependencies.ts"],"names":[],"mappings":";;;AACA,0EAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/check-dependencies.ts"],"names":[],"mappings":";;;AACA,0EAAgF;AAChF,6FAK4D;AAE5D,SAAgB,iBAAiB,CAC/B,OAAwB,EACxB,YAAoB;IAOpB,MAAM,YAAY,GAAG,IAAA,sCAAsB,GAAE,CAAC;IAC9C,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,wBAAwB,EAAE,GACtD,IAAA,mDAA4B,EAC1B,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;IACJ,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;IAErC,IAAI,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,yFACE,OAAO,CAAC,UACV,wCAAwC,wBAAwB;aAC7D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;aACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;KACH;IAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,MAAM,yBAAyB,GAAG,IAAA,0DAAmC,EACnE,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,CAAC;QACF,IAAI,CAAC,yBAAyB,EAAE;YAC9B,MAAM,IAAI,KAAK,CACb,yBAAyB,OAAO,CAAC,WAAW,mDAAmD,OAAO,CAAC,UAAU,8BAA8B,CAChJ,CAAC;SACH;QACD,OAAO;YACL,WAAW,EAAE,IAAA,wCAAiB,EAC5B,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,WAAW,EACX,YAAY,CACb;YACD,WAAW;YACX,MAAM;YACN,YAAY;SACb,CAAC;KACH;IAED,OAAO;QACL,WAAW,EAAE,IAAI;QACjB,WAAW;QACX,MAAM;QACN,YAAY;KACb,CAAC;AACJ,CAAC;AA7DD,8CA6DC"}
|
|
@@ -78,7 +78,8 @@ class CopyAssetsHandler {
|
|
|
78
78
|
else {
|
|
79
79
|
pattern = ag.pattern;
|
|
80
80
|
}
|
|
81
|
-
|
|
81
|
+
// fast-glob only supports Unix paths
|
|
82
|
+
const files = yield fg(pattern.replace(/\\/g, '/'), {
|
|
82
83
|
cwd: this.rootDir,
|
|
83
84
|
});
|
|
84
85
|
this.callback(files.reduce((acc, src) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy-assets-handler.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/copy-assets-handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"copy-assets-handler.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/copy-assets-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createAsyncIterable = void 0;
|
|
4
|
+
function createAsyncIterable(listener) {
|
|
5
|
+
let done = false;
|
|
6
|
+
let error = null;
|
|
7
|
+
const pushQueue = [];
|
|
8
|
+
const pullQueue = [];
|
|
9
|
+
return {
|
|
10
|
+
[Symbol.asyncIterator]() {
|
|
11
|
+
listener({
|
|
12
|
+
next: (value) => {
|
|
13
|
+
var _a;
|
|
14
|
+
if (done || error)
|
|
15
|
+
return;
|
|
16
|
+
if (pullQueue.length > 0) {
|
|
17
|
+
(_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[0]({ value, done: false });
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
pushQueue.push(value);
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
error: (err) => {
|
|
24
|
+
var _a;
|
|
25
|
+
if (done || error)
|
|
26
|
+
return;
|
|
27
|
+
if (pullQueue.length > 0) {
|
|
28
|
+
(_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[1](err);
|
|
29
|
+
}
|
|
30
|
+
error = err;
|
|
31
|
+
},
|
|
32
|
+
done: () => {
|
|
33
|
+
var _a;
|
|
34
|
+
if (pullQueue.length > 0) {
|
|
35
|
+
(_a = pullQueue.shift()) === null || _a === void 0 ? void 0 : _a[0]({ value: undefined, done: true });
|
|
36
|
+
}
|
|
37
|
+
done = true;
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
return {
|
|
41
|
+
next() {
|
|
42
|
+
return new Promise((resolve, reject) => {
|
|
43
|
+
if (pushQueue.length > 0) {
|
|
44
|
+
resolve({ value: pushQueue.shift(), done: false });
|
|
45
|
+
}
|
|
46
|
+
else if (done) {
|
|
47
|
+
resolve({ value: undefined, done: true });
|
|
48
|
+
}
|
|
49
|
+
else if (error) {
|
|
50
|
+
reject(error);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
pullQueue.push([resolve, reject]);
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
},
|
|
57
|
+
};
|
|
58
|
+
},
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
exports.createAsyncIterable = createAsyncIterable;
|
|
62
|
+
//# sourceMappingURL=create-async-iteratable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-async-iteratable.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/create-async-iterable/create-async-iteratable.ts"],"names":[],"mappings":";;;AAMA,SAAgB,mBAAmB,CACjC,QAA6C;IAE7C,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,KAAK,GAAmB,IAAI,CAAC;IAEjC,MAAM,SAAS,GAAQ,EAAE,CAAC;IAC1B,MAAM,SAAS,GAKX,EAAE,CAAC;IAEP,OAAO;QACL,CAAC,MAAM,CAAC,aAAa,CAAC;YACpB,QAAQ,CAAC;gBACP,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;;oBACd,IAAI,IAAI,IAAI,KAAK;wBAAE,OAAO;oBAC1B,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACxB,MAAA,SAAS,CAAC,KAAK,EAAE,0CAAG,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;qBAChD;yBAAM;wBACL,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACvB;gBACH,CAAC;gBACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;;oBACb,IAAI,IAAI,IAAI,KAAK;wBAAE,OAAO;oBAC1B,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACxB,MAAA,SAAS,CAAC,KAAK,EAAE,0CAAG,CAAC,EAAE,GAAG,CAAC,CAAC;qBAC7B;oBACD,KAAK,GAAG,GAAG,CAAC;gBACd,CAAC;gBACD,IAAI,EAAE,GAAG,EAAE;;oBACT,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;wBACxB,MAAA,SAAS,CAAC,KAAK,EAAE,0CAAG,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC1D;oBACD,IAAI,GAAG,IAAI,CAAC;gBACd,CAAC;aACF,CAAC,CAAC;YAEH,OAAO;gBACL,IAAI;oBACF,OAAO,IAAI,OAAO,CAChB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;wBAClB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;4BACxB,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;yBACpD;6BAAM,IAAI,IAAI,EAAE;4BACf,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;yBAC3C;6BAAM,IAAI,KAAK,EAAE;4BAChB,MAAM,CAAC,KAAK,CAAC,CAAC;yBACf;6BAAM;4BACL,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;yBACnC;oBACH,CAAC,CACF,CAAC;gBACJ,CAAC;aACF,CAAC;QACJ,CAAC;KACkB,CAAC;AACxB,CAAC;AA3DD,kDA2DC"}
|
package/src/utils/schema.d.ts
CHANGED
|
@@ -36,6 +36,8 @@ export interface ExecutorOptions {
|
|
|
36
36
|
tsConfig: string;
|
|
37
37
|
watch: boolean;
|
|
38
38
|
transformers: TransformerEntry[];
|
|
39
|
+
updateBuildableProjectDepsInPackageJson?: boolean;
|
|
40
|
+
buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
|
|
39
41
|
}
|
|
40
42
|
|
|
41
43
|
export interface NormalizedExecutorOptions extends ExecutorOptions {
|
|
@@ -52,19 +54,15 @@ export interface SwcExecutorOptions extends ExecutorOptions {
|
|
|
52
54
|
}
|
|
53
55
|
|
|
54
56
|
export interface SwcCliOptions {
|
|
55
|
-
|
|
57
|
+
srcPath: string;
|
|
56
58
|
destPath: string;
|
|
59
|
+
swcrcPath: string;
|
|
60
|
+
swcCwd: string;
|
|
57
61
|
}
|
|
58
62
|
|
|
59
63
|
export interface NormalizedSwcExecutorOptions
|
|
60
64
|
extends NormalizedExecutorOptions {
|
|
61
65
|
swcExclude: string[];
|
|
62
66
|
skipTypeCheck: boolean;
|
|
63
|
-
swcrcPath: string;
|
|
64
67
|
swcCliOptions: SwcCliOptions;
|
|
65
68
|
}
|
|
66
|
-
|
|
67
|
-
export interface ExecutorEvent {
|
|
68
|
-
outfile: string;
|
|
69
|
-
success: boolean;
|
|
70
|
-
}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
-
import { Observable } from 'rxjs';
|
|
3
2
|
import { NormalizedSwcExecutorOptions } from '../schema';
|
|
4
|
-
export declare function compileSwc(context: ExecutorContext, normalizedOptions: NormalizedSwcExecutorOptions, postCompilationCallback: () => Promise<void>):
|
|
5
|
-
success:
|
|
3
|
+
export declare function compileSwc(context: ExecutorContext, normalizedOptions: NormalizedSwcExecutorOptions, postCompilationCallback: () => Promise<void>): Promise<{
|
|
4
|
+
success: boolean;
|
|
6
5
|
}>;
|
|
6
|
+
export declare function compileSwcWatch(context: ExecutorContext, normalizedOptions: NormalizedSwcExecutorOptions, postCompilationCallback: () => Promise<void>): AsyncGenerator<{
|
|
7
|
+
success: boolean;
|
|
8
|
+
outfile: string;
|
|
9
|
+
}, any, undefined>;
|
|
@@ -1,127 +1,147 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.compileSwc = void 0;
|
|
3
|
+
exports.compileSwcWatch = exports.compileSwc = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const cache_directory_1 = require("@nrwl/workspace/src/utilities/cache-directory");
|
|
5
7
|
const child_process_1 = require("child_process");
|
|
6
|
-
const
|
|
7
|
-
const operators_1 = require("rxjs/operators");
|
|
8
|
+
const create_async_iteratable_1 = require("../create-async-iterable/create-async-iteratable");
|
|
8
9
|
const print_diagnostics_1 = require("../typescript/print-diagnostics");
|
|
9
10
|
const run_type_check_1 = require("../typescript/run-type-check");
|
|
11
|
+
function getSwcCmd({ swcrcPath, srcPath, destPath }, watch = false) {
|
|
12
|
+
let swcCmd = `npx swc ${srcPath} -d ${destPath} --source-maps --no-swcrc --config-file=${swcrcPath}`;
|
|
13
|
+
return watch ? swcCmd.concat(' --watch') : swcCmd;
|
|
14
|
+
}
|
|
15
|
+
function getTypeCheckOptions(normalizedOptions) {
|
|
16
|
+
const { projectRoot, watch, tsConfig, root, outputPath } = normalizedOptions;
|
|
17
|
+
const typeCheckOptions = {
|
|
18
|
+
mode: 'emitDeclarationOnly',
|
|
19
|
+
tsConfigPath: tsConfig,
|
|
20
|
+
outDir: outputPath.replace(`/${projectRoot}`, ''),
|
|
21
|
+
workspaceRoot: root,
|
|
22
|
+
};
|
|
23
|
+
if (watch) {
|
|
24
|
+
typeCheckOptions.incremental = true;
|
|
25
|
+
typeCheckOptions.cacheDir = cache_directory_1.cacheDir;
|
|
26
|
+
}
|
|
27
|
+
return typeCheckOptions;
|
|
28
|
+
}
|
|
10
29
|
function compileSwc(context, normalizedOptions, postCompilationCallback) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
if (success) {
|
|
16
|
-
return postCompilationCallback().then(() => ({ success }));
|
|
17
|
-
}
|
|
18
|
-
return rxjs_1.EMPTY;
|
|
19
|
-
});
|
|
20
|
-
const compile$ = new rxjs_1.Observable((subscriber) => {
|
|
21
|
-
if (normalizedOptions.watch) {
|
|
22
|
-
swcCmd += ' --watch';
|
|
23
|
-
const watchProcess = createSwcWatchProcess(swcCmd, normalizedOptions.projectRoot, (success) => {
|
|
24
|
-
subscriber.next({ success });
|
|
25
|
-
});
|
|
26
|
-
return () => {
|
|
27
|
-
watchProcess.close();
|
|
28
|
-
subscriber.complete();
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
const swcCmdLog = (0, child_process_1.execSync)(swcCmd, {
|
|
32
|
-
cwd: normalizedOptions.projectRoot,
|
|
30
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
31
|
+
devkit_1.logger.log(`Compiling with SWC for ${context.projectName}...`);
|
|
32
|
+
const swcCmdLog = (0, child_process_1.execSync)(getSwcCmd(normalizedOptions.swcCliOptions), {
|
|
33
|
+
cwd: normalizedOptions.swcCliOptions.swcCwd,
|
|
33
34
|
}).toString();
|
|
34
35
|
devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
const isCompileSuccess = swcCmdLog.includes('Successfully compiled');
|
|
37
|
+
yield postCompilationCallback();
|
|
38
|
+
if (normalizedOptions.skipTypeCheck) {
|
|
39
|
+
return { success: isCompileSuccess };
|
|
40
|
+
}
|
|
41
|
+
const { errors, warnings } = yield (0, run_type_check_1.runTypeCheck)(getTypeCheckOptions(normalizedOptions));
|
|
42
|
+
const hasErrors = errors.length > 0;
|
|
43
|
+
const hasWarnings = warnings.length > 0;
|
|
44
|
+
if (hasErrors || hasWarnings) {
|
|
45
|
+
yield (0, print_diagnostics_1.printDiagnostics)(errors, warnings);
|
|
46
|
+
}
|
|
47
|
+
return { success: !hasErrors && isCompileSuccess };
|
|
39
48
|
});
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
if (
|
|
66
|
-
const
|
|
67
|
-
if (
|
|
68
|
-
|
|
49
|
+
}
|
|
50
|
+
exports.compileSwc = compileSwc;
|
|
51
|
+
function compileSwcWatch(context, normalizedOptions, postCompilationCallback) {
|
|
52
|
+
return (0, tslib_1.__asyncGenerator)(this, arguments, function* compileSwcWatch_1() {
|
|
53
|
+
const getResult = (success) => ({
|
|
54
|
+
success,
|
|
55
|
+
outfile: normalizedOptions.mainOutputPath,
|
|
56
|
+
});
|
|
57
|
+
let typeCheckOptions;
|
|
58
|
+
let initialPostCompile = true;
|
|
59
|
+
return yield (0, tslib_1.__await)(yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)((0, create_async_iteratable_1.createAsyncIterable)(({ next, done }) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
60
|
+
let processOnExit;
|
|
61
|
+
let stdoutOnData;
|
|
62
|
+
let stderrOnData;
|
|
63
|
+
let watcherOnExit;
|
|
64
|
+
const swcWatcher = (0, child_process_1.exec)(getSwcCmd(normalizedOptions.swcCliOptions, true), { cwd: normalizedOptions.swcCliOptions.swcCwd });
|
|
65
|
+
processOnExit = () => {
|
|
66
|
+
swcWatcher.kill();
|
|
67
|
+
done();
|
|
68
|
+
process.off('SIGINT', processOnExit);
|
|
69
|
+
process.off('SIGTERM', processOnExit);
|
|
70
|
+
process.off('exit', processOnExit);
|
|
71
|
+
};
|
|
72
|
+
stdoutOnData = (data) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
73
|
+
process.stdout.write(data);
|
|
74
|
+
if (!data.startsWith('Watching')) {
|
|
75
|
+
const swcStatus = data.includes('Successfully');
|
|
76
|
+
if (initialPostCompile) {
|
|
77
|
+
yield postCompilationCallback();
|
|
78
|
+
initialPostCompile = false;
|
|
69
79
|
}
|
|
70
|
-
|
|
71
|
-
|
|
80
|
+
if (normalizedOptions.skipTypeCheck) {
|
|
81
|
+
next(getResult(swcStatus));
|
|
82
|
+
return;
|
|
72
83
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
84
|
+
if (!typeCheckOptions) {
|
|
85
|
+
typeCheckOptions = getTypeCheckOptions(normalizedOptions);
|
|
86
|
+
}
|
|
87
|
+
const delayed = delay(5000);
|
|
88
|
+
next(getResult(yield Promise.race([
|
|
89
|
+
delayed
|
|
90
|
+
.start()
|
|
91
|
+
.then(() => ({ tscStatus: false, type: 'timeout' })),
|
|
92
|
+
(0, run_type_check_1.runTypeCheck)(typeCheckOptions).then(({ errors, warnings }) => {
|
|
93
|
+
const hasErrors = errors.length > 0;
|
|
94
|
+
if (hasErrors) {
|
|
95
|
+
(0, print_diagnostics_1.printDiagnostics)(errors, warnings);
|
|
96
|
+
}
|
|
97
|
+
return {
|
|
98
|
+
tscStatus: !hasErrors,
|
|
99
|
+
type: 'tsc',
|
|
100
|
+
};
|
|
101
|
+
}),
|
|
102
|
+
]).then(({ type, tscStatus }) => {
|
|
103
|
+
if (type === 'tsc') {
|
|
104
|
+
delayed.cancel();
|
|
105
|
+
return tscStatus && swcStatus;
|
|
106
|
+
}
|
|
107
|
+
return swcStatus;
|
|
108
|
+
})));
|
|
79
109
|
}
|
|
80
|
-
typeCheckRunner = { close };
|
|
81
|
-
subscriber.next({ success: !hasErrors });
|
|
82
|
-
preEmit = true;
|
|
83
110
|
});
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
subscriber.complete();
|
|
111
|
+
stderrOnData = (err) => {
|
|
112
|
+
process.stderr.write(err);
|
|
113
|
+
next(getResult(false));
|
|
89
114
|
};
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
};
|
|
115
|
+
watcherOnExit = () => {
|
|
116
|
+
done();
|
|
117
|
+
swcWatcher.off('exit', watcherOnExit);
|
|
118
|
+
};
|
|
119
|
+
swcWatcher.stdout.on('data', stdoutOnData);
|
|
120
|
+
swcWatcher.stderr.on('data', stderrOnData);
|
|
121
|
+
process.on('SIGINT', processOnExit);
|
|
122
|
+
process.on('SIGTERM', processOnExit);
|
|
123
|
+
process.on('exit', processOnExit);
|
|
124
|
+
swcWatcher.on('exit', watcherOnExit);
|
|
125
|
+
}))))));
|
|
102
126
|
});
|
|
103
|
-
return (0, rxjs_1.zip)(compile$, typeCheck$).pipe((0, operators_1.map)(([compileResult, typeCheckResult]) => ({
|
|
104
|
-
success: compileResult.success && typeCheckResult.success,
|
|
105
|
-
})), postCompilationOperator());
|
|
106
127
|
}
|
|
107
|
-
exports.
|
|
108
|
-
function
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}
|
|
125
|
-
return { close: () => watchProcess.kill() };
|
|
128
|
+
exports.compileSwcWatch = compileSwcWatch;
|
|
129
|
+
function delay(ms) {
|
|
130
|
+
let timerId = undefined;
|
|
131
|
+
return {
|
|
132
|
+
start() {
|
|
133
|
+
return new Promise((resolve) => {
|
|
134
|
+
timerId = setTimeout(() => {
|
|
135
|
+
resolve();
|
|
136
|
+
}, ms);
|
|
137
|
+
});
|
|
138
|
+
},
|
|
139
|
+
cancel() {
|
|
140
|
+
if (timerId) {
|
|
141
|
+
clearTimeout(timerId);
|
|
142
|
+
timerId = undefined;
|
|
143
|
+
}
|
|
144
|
+
},
|
|
145
|
+
};
|
|
126
146
|
}
|
|
127
147
|
//# sourceMappingURL=compile-swc.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compile-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
-
import { Observable } from 'rxjs';
|
|
3
2
|
import { NormalizedExecutorOptions } from '../schema';
|
|
4
|
-
export declare function compileTypeScriptFiles(
|
|
3
|
+
export declare function compileTypeScriptFiles(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext, postCompilationCallback: () => void | Promise<void>): AsyncGenerator<{
|
|
4
|
+
success: boolean;
|
|
5
|
+
outfile: string;
|
|
6
|
+
}, any, undefined>;
|