@nrwl/js 13.8.3 → 13.8.5
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 +14 -1
- package/package.json +5 -5
- package/src/executors/swc/schema.json +18 -1
- package/src/executors/swc/swc.impl.js +16 -12
- package/src/executors/swc/swc.impl.js.map +1 -1
- package/src/executors/tsc/schema.json +11 -0
- package/src/executors/tsc/tsc.impl.js +3 -3
- package/src/executors/tsc/tsc.impl.js.map +1 -1
- package/src/generators/convert-to-swc/convert-to-swc.js +1 -1
- package/src/generators/convert-to-swc/convert-to-swc.js.map +1 -1
- package/src/generators/library/files/jest-config/jest.config.js__tmpl__ +17 -0
- package/src/generators/library/files/{README.md → lib/README.md} +0 -0
- package/src/generators/{application/files → library/files/lib}/package.json__tmpl__ +0 -0
- package/src/generators/library/files/{src → lib/src}/index.ts__tmpl__ +0 -0
- package/src/generators/{application/files/src/app → library/files/lib/src/lib}/__fileName__.spec.ts__tmpl__ +0 -0
- package/src/generators/{application/files/src/app → library/files/lib/src/lib}/__fileName__.ts__tmpl__ +0 -0
- package/src/generators/library/files/{tsconfig.json__tmpl__ → lib/tsconfig.json__tmpl__} +0 -0
- package/src/generators/library/files/{tsconfig.lib.json__tmpl__ → lib/tsconfig.lib.json__tmpl__} +0 -0
- package/src/generators/library/library.d.ts +14 -4
- package/src/generators/library/library.js +210 -3
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +5 -0
- 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-8-5/update-node-executor.d.ts +2 -0
- package/src/migrations/update-13-8-5/update-node-executor.js +28 -0
- package/src/migrations/update-13-8-5/update-node-executor.js.map +1 -0
- package/src/migrations/update-13-8-5/update-swcrc.d.ts +2 -0
- package/src/migrations/update-13-8-5/update-swcrc.js +35 -0
- package/src/migrations/update-13-8-5/update-swcrc.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/schema.d.ts +10 -8
- package/src/utils/swc/add-swc-config.d.ts +1 -0
- package/src/utils/swc/add-swc-config.js +13 -5
- package/src/utils/swc/add-swc-config.js.map +1 -1
- package/src/utils/swc/compile-swc.js +5 -8
- package/src/utils/swc/compile-swc.js.map +1 -1
- package/src/utils/typescript/compile-typescript-files.js +2 -2
- package/src/utils/typescript/compile-typescript-files.js.map +1 -1
- package/src/utils/typescript/{load-ts-plugins.d.ts → load-ts-transformers.d.ts} +1 -1
- package/src/utils/typescript/{load-ts-plugins.js → load-ts-transformers.js} +4 -4
- package/src/utils/typescript/load-ts-transformers.js.map +1 -0
- 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/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/generators/library/files/package.json__tmpl__ +0 -5
- package/src/generators/library/files/src/lib/__fileName__.spec.ts__tmpl__ +0 -7
- package/src/generators/library/files/src/lib/__fileName__.ts__tmpl__ +0 -3
- 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
- package/src/utils/swc/add-temp-swcrc.d.ts +0 -2
- package/src/utils/swc/add-temp-swcrc.js +0 -27
- package/src/utils/swc/add-temp-swcrc.js.map +0 -1
- package/src/utils/typescript/load-ts-plugins.js.map +0 -1
package/src/index.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.libraryGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
(0, tslib_1.__exportStar)(require("./utils/typescript/print-diagnostics"), exports);
|
|
6
6
|
(0, tslib_1.__exportStar)(require("./utils/typescript/run-type-check"), exports);
|
|
7
7
|
var library_1 = require("./generators/library/library");
|
|
8
8
|
Object.defineProperty(exports, "libraryGenerator", { enumerable: true, get: function () { return library_1.libraryGenerator; } });
|
|
9
|
-
var application_1 = require("./generators/application/application");
|
|
10
|
-
Object.defineProperty(exports, "applicationGenerator", { enumerable: true, get: function () { return application_1.applicationGenerator; } });
|
|
11
9
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/js/src/index.ts"],"names":[],"mappings":";;;;AAAA,oFAAqD;AACrD,iFAAkD;AAClD,wDAAgE;AAAvD,2GAAA,gBAAgB,OAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/js/src/index.ts"],"names":[],"mappings":";;;;AAAA,oFAAqD;AACrD,iFAAkD;AAClD,wDAAgE;AAAvD,2GAAA,gBAAgB,OAAA"}
|
|
@@ -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-8-5/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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
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 path_1 = require("path");
|
|
6
|
+
const add_swc_config_1 = require("../../utils/swc/add-swc-config");
|
|
7
|
+
function update(host) {
|
|
8
|
+
var _a, _b, _c, _d;
|
|
9
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
|
+
const projects = (0, devkit_1.getProjects)(host);
|
|
11
|
+
for (const config of projects.values()) {
|
|
12
|
+
if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) !== '@nrwl/js:swc')
|
|
13
|
+
continue;
|
|
14
|
+
const swcrcPath = (0, path_1.join)(config.root, '.swcrc');
|
|
15
|
+
if (!host.exists(swcrcPath))
|
|
16
|
+
continue;
|
|
17
|
+
// rename
|
|
18
|
+
const libSwcrcPath = (0, path_1.join)(config.root, '.lib.swcrc');
|
|
19
|
+
host.rename(swcrcPath, libSwcrcPath);
|
|
20
|
+
const swcrcContent = (0, devkit_1.readJson)(host, libSwcrcPath);
|
|
21
|
+
// skip if swcrc already has "exclude" field
|
|
22
|
+
if (swcrcContent['exclude'])
|
|
23
|
+
continue;
|
|
24
|
+
// check swcExclude build options
|
|
25
|
+
const exclude = ((_d = (_c = config === null || config === void 0 ? void 0 : config.targets) === null || _c === void 0 ? void 0 : _c.build) === null || _d === void 0 ? void 0 : _d.options['swcExclude']) || add_swc_config_1.defaultExclude;
|
|
26
|
+
(0, devkit_1.updateJson)(host, libSwcrcPath, (swcrc) => {
|
|
27
|
+
swcrc['exclude'] = exclude;
|
|
28
|
+
return swcrc;
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
exports.default = update;
|
|
35
|
+
//# sourceMappingURL=update-swcrc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-swcrc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-13-8-5/update-swcrc.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAA4B;AAC5B,mEAAgE;AAEhE,SAA8B,MAAM,CAAC,IAAU;;;QAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;YACtC,IAAI,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,cAAc;gBAAE,SAAS;YAElE,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;gBAAE,SAAS;YAEtC,SAAS;YACT,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;YACrD,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YAErC,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;YAElD,4CAA4C;YAC5C,IAAI,YAAY,CAAC,SAAS,CAAC;gBAAE,SAAS;YAEtC,iCAAiC;YACjC,MAAM,OAAO,GACX,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,OAAO,CAAC,YAAY,CAAC,KAAI,+BAAc,CAAC;YAClE,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvC,KAAK,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;gBAC3B,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AA5BD,yBA4BC"}
|
|
@@ -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"}
|
package/src/utils/schema.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { TransformerEntry } from './typescript/types';
|
|
|
8
8
|
|
|
9
9
|
export type Compiler = 'tsc' | 'swc';
|
|
10
10
|
|
|
11
|
-
export interface
|
|
11
|
+
export interface LibraryGeneratorSchema {
|
|
12
12
|
name: string;
|
|
13
13
|
directory?: string;
|
|
14
14
|
skipFormat?: boolean;
|
|
@@ -22,6 +22,7 @@ export interface GeneratorSchema {
|
|
|
22
22
|
js?: boolean;
|
|
23
23
|
pascalCaseFiles?: boolean;
|
|
24
24
|
strict?: boolean;
|
|
25
|
+
publishable?: boolean;
|
|
25
26
|
buildable?: boolean;
|
|
26
27
|
setParserOptionsProject?: boolean;
|
|
27
28
|
config?: 'workspace' | 'project' | 'npm-scripts';
|
|
@@ -36,6 +37,8 @@ export interface ExecutorOptions {
|
|
|
36
37
|
tsConfig: string;
|
|
37
38
|
watch: boolean;
|
|
38
39
|
transformers: TransformerEntry[];
|
|
40
|
+
updateBuildableProjectDepsInPackageJson?: boolean;
|
|
41
|
+
buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
|
|
39
42
|
}
|
|
40
43
|
|
|
41
44
|
export interface NormalizedExecutorOptions extends ExecutorOptions {
|
|
@@ -48,23 +51,22 @@ export interface NormalizedExecutorOptions extends ExecutorOptions {
|
|
|
48
51
|
|
|
49
52
|
export interface SwcExecutorOptions extends ExecutorOptions {
|
|
50
53
|
skipTypeCheck?: boolean;
|
|
54
|
+
/**
|
|
55
|
+
* @deprecated
|
|
56
|
+
*/
|
|
51
57
|
swcExclude?: string[];
|
|
52
58
|
}
|
|
53
59
|
|
|
54
60
|
export interface SwcCliOptions {
|
|
55
|
-
|
|
61
|
+
srcPath: string;
|
|
56
62
|
destPath: string;
|
|
63
|
+
swcrcPath: string;
|
|
64
|
+
swcCwd: string;
|
|
57
65
|
}
|
|
58
66
|
|
|
59
67
|
export interface NormalizedSwcExecutorOptions
|
|
60
68
|
extends NormalizedExecutorOptions {
|
|
61
69
|
swcExclude: string[];
|
|
62
70
|
skipTypeCheck: boolean;
|
|
63
|
-
swcrcPath: string;
|
|
64
71
|
swcCliOptions: SwcCliOptions;
|
|
65
72
|
}
|
|
66
|
-
|
|
67
|
-
export interface ExecutorEvent {
|
|
68
|
-
outfile: string;
|
|
69
|
-
success: boolean;
|
|
70
|
-
}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addSwcConfig = void 0;
|
|
3
|
+
exports.addSwcConfig = exports.defaultExclude = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
|
+
exports.defaultExclude = [
|
|
6
|
+
'./src/**/.*.spec.ts$',
|
|
7
|
+
'./**/.*.spec.ts$',
|
|
8
|
+
'./src/**/jest-setup.ts$',
|
|
9
|
+
'./**/jest-setup.ts$',
|
|
10
|
+
'./**/.*.js$',
|
|
11
|
+
];
|
|
5
12
|
const swcOptionsString = () => `{
|
|
6
13
|
"jsc": {
|
|
7
14
|
"target": "es2017",
|
|
@@ -22,12 +29,13 @@ const swcOptionsString = () => `{
|
|
|
22
29
|
"type": "commonjs",
|
|
23
30
|
"strict": true,
|
|
24
31
|
"noInterop": true
|
|
25
|
-
}
|
|
32
|
+
},
|
|
33
|
+
"sourceMaps": true,
|
|
34
|
+
"exclude": ${JSON.stringify(exports.defaultExclude)}
|
|
26
35
|
}`;
|
|
27
36
|
function addSwcConfig(tree, projectDir) {
|
|
28
|
-
const swcrcPath = (0, path_1.join)(projectDir, '.swcrc');
|
|
29
|
-
|
|
30
|
-
if (isSwcConfigExist)
|
|
37
|
+
const swcrcPath = (0, path_1.join)(projectDir, '.lib.swcrc');
|
|
38
|
+
if (tree.exists(swcrcPath))
|
|
31
39
|
return;
|
|
32
40
|
tree.write(swcrcPath, swcOptionsString());
|
|
33
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-swc-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/add-swc-config.ts"],"names":[],"mappings":";;;AAGA,+BAA4B;
|
|
1
|
+
{"version":3,"file":"add-swc-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/add-swc-config.ts"],"names":[],"mappings":";;;AAGA,+BAA4B;AAEf,QAAA,cAAc,GAAG;IAC5B,sBAAsB;IACtB,kBAAkB;IAClB,yBAAyB;IACzB,qBAAqB;IACrB,aAAa;CACd,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;eAsBhB,IAAI,CAAC,SAAS,CAAC,sBAAc,CAAC;EAC3C,CAAC;AAEH,SAAgB,YAAY,CAAC,IAAU,EAAE,UAAkB;IACzD,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACjD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QAAE,OAAO;IAEnC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAC5C,CAAC;AALD,oCAKC"}
|
|
@@ -8,9 +8,8 @@ const child_process_1 = require("child_process");
|
|
|
8
8
|
const create_async_iteratable_1 = require("../create-async-iterable/create-async-iteratable");
|
|
9
9
|
const print_diagnostics_1 = require("../typescript/print-diagnostics");
|
|
10
10
|
const run_type_check_1 = require("../typescript/run-type-check");
|
|
11
|
-
function getSwcCmd(
|
|
12
|
-
|
|
13
|
-
let swcCmd = `npx swc ${srcPath} -d ${normalizedOptions.swcCliOptions.destPath} --source-maps --no-swcrc --config-file=${normalizedOptions.swcrcPath}`;
|
|
11
|
+
function getSwcCmd({ swcrcPath, srcPath, destPath }, watch = false) {
|
|
12
|
+
let swcCmd = `npx swc ${srcPath} -d ${destPath} --no-swcrc --config-file=${swcrcPath}`;
|
|
14
13
|
return watch ? swcCmd.concat(' --watch') : swcCmd;
|
|
15
14
|
}
|
|
16
15
|
function getTypeCheckOptions(normalizedOptions) {
|
|
@@ -30,8 +29,8 @@ function getTypeCheckOptions(normalizedOptions) {
|
|
|
30
29
|
function compileSwc(context, normalizedOptions, postCompilationCallback) {
|
|
31
30
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
32
31
|
devkit_1.logger.log(`Compiling with SWC for ${context.projectName}...`);
|
|
33
|
-
const swcCmdLog = (0, child_process_1.execSync)(getSwcCmd(normalizedOptions), {
|
|
34
|
-
cwd: normalizedOptions.
|
|
32
|
+
const swcCmdLog = (0, child_process_1.execSync)(getSwcCmd(normalizedOptions.swcCliOptions), {
|
|
33
|
+
cwd: normalizedOptions.swcCliOptions.swcCwd,
|
|
35
34
|
}).toString();
|
|
36
35
|
devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
|
|
37
36
|
const isCompileSuccess = swcCmdLog.includes('Successfully compiled');
|
|
@@ -62,9 +61,7 @@ function compileSwcWatch(context, normalizedOptions, postCompilationCallback) {
|
|
|
62
61
|
let stdoutOnData;
|
|
63
62
|
let stderrOnData;
|
|
64
63
|
let watcherOnExit;
|
|
65
|
-
const swcWatcher = (0, child_process_1.exec)(getSwcCmd(normalizedOptions, true), {
|
|
66
|
-
cwd: normalizedOptions.projectRoot,
|
|
67
|
-
});
|
|
64
|
+
const swcWatcher = (0, child_process_1.exec)(getSwcCmd(normalizedOptions.swcCliOptions, true), { cwd: normalizedOptions.swcCliOptions.swcCwd });
|
|
68
65
|
processOnExit = () => {
|
|
69
66
|
swcWatcher.kill();
|
|
70
67
|
done();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":";;;;AAAA,yCAAuD;AACvD,mFAAyE;AACzE,iDAA+C;AAC/C,8FAAuF;AAEvF,uEAAmE;AACnE,iEAA8E;AAE9E,SAAS,SAAS,CAChB,
|
|
1
|
+
{"version":3,"file":"compile-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,14 @@ exports.compileTypeScriptFiles = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const compilation_1 = require("@nrwl/workspace/src/utilities/typescript/compilation");
|
|
6
6
|
const create_async_iteratable_1 = require("../create-async-iterable/create-async-iteratable");
|
|
7
|
-
const
|
|
7
|
+
const load_ts_transformers_1 = require("./load-ts-transformers");
|
|
8
8
|
function compileTypeScriptFiles(normalizedOptions, context, postCompilationCallback) {
|
|
9
9
|
return (0, tslib_1.__asyncGenerator)(this, arguments, function* compileTypeScriptFiles_1() {
|
|
10
10
|
const getResult = (success) => ({
|
|
11
11
|
success,
|
|
12
12
|
outfile: normalizedOptions.mainOutputPath,
|
|
13
13
|
});
|
|
14
|
-
const { compilerPluginHooks } = (0,
|
|
14
|
+
const { compilerPluginHooks } = (0, load_ts_transformers_1.loadTsTransformers)(normalizedOptions.transformers);
|
|
15
15
|
const getCustomTransformers = (program) => ({
|
|
16
16
|
before: compilerPluginHooks.beforeHooks.map((hook) => hook(program)),
|
|
17
17
|
after: compilerPluginHooks.afterHooks.map((hook) => hook(program)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-typescript-files.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/compile-typescript-files.ts"],"names":[],"mappings":";;;;AACA,sFAG8D;AAQ9D,8FAAuF;AAEvF,
|
|
1
|
+
{"version":3,"file":"compile-typescript-files.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/compile-typescript-files.ts"],"names":[],"mappings":";;;;AACA,sFAG8D;AAQ9D,8FAAuF;AAEvF,iEAA4D;AAE5D,SAAuB,sBAAsB,CAC3C,iBAA4C,EAC5C,OAAwB,EACxB,uBAAmD;;QAEnD,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC;YACvC,OAAO;YACP,OAAO,EAAE,iBAAiB,CAAC,cAAc;SAC1C,CAAC,CAAC;QAEH,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,yCAAkB,EAChD,iBAAiB,CAAC,YAAY,CAC/B,CAAC;QAEF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAsB,EAAE,CAAC,CAAC;YACvE,MAAM,EAAE,mBAAmB,CAAC,WAAW,CAAC,GAAG,CACzC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAmC,CAC1D;YACD,KAAK,EAAE,mBAAmB,CAAC,UAAU,CAAC,GAAG,CACvC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAmC,CAC1D;YACD,iBAAiB,EAAE,mBAAmB,CAAC,sBAAsB,CAAC,GAAG,CAC/D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAmC,CAC1D;SACF,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG;YACjB,UAAU,EAAE,iBAAiB,CAAC,UAAU;YACxC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,WAAW,EAAE,iBAAiB,CAAC,WAAW;YAC1C,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;YACpC,KAAK,EAAE,iBAAiB,CAAC,KAAK;YAC9B,qBAAqB;SACtB,CAAC;QAEF,kCAAO,2BAAA,KAAK,CAAC,CAAC,8BAAA,2BAAA,IAAA,6CAAmB,EAC/B,CAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACvB,IAAI,iBAAiB,CAAC,KAAK,EAAE;gBAC3B,IAAA,sCAAwB,EAAC,UAAU,EAAE,CAAO,CAAa,EAAE,EAAE;oBAC3D,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,EAAE;wBACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;qBACvB;gBACH,CAAC,CAAA,CAAC,CAAC;aACJ;iBAAM;gBACL,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,+BAAiB,EAAC,UAAU,CAAC,CAAC;gBAClD,MAAM,uBAAuB,EAAE,CAAC;gBAChC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzB,IAAI,EAAE,CAAC;aACR;QACH,CAAC,CAAA,CACF,CAAA,CAAA,CAAA,EAAC;IACJ,CAAC;CAAA;AAnDD,wDAmDC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CompilerPluginHooks, TransformerEntry } from './types';
|
|
2
|
-
export declare function
|
|
2
|
+
export declare function loadTsTransformers(plugins: TransformerEntry[], moduleResolver?: typeof require.resolve): {
|
|
3
3
|
compilerPluginHooks: CompilerPluginHooks;
|
|
4
4
|
hasPlugin: boolean;
|
|
5
5
|
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.loadTsTransformers = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
-
function
|
|
6
|
+
function loadTsTransformers(plugins, moduleResolver = require.resolve) {
|
|
7
7
|
const beforeHooks = [];
|
|
8
8
|
const afterHooks = [];
|
|
9
9
|
const afterDeclarationsHooks = [];
|
|
@@ -59,5 +59,5 @@ function loadTsPlugins(plugins, moduleResolver = require.resolve) {
|
|
|
59
59
|
hasPlugin: true,
|
|
60
60
|
};
|
|
61
61
|
}
|
|
62
|
-
exports.
|
|
63
|
-
//# sourceMappingURL=load-ts-
|
|
62
|
+
exports.loadTsTransformers = loadTsTransformers;
|
|
63
|
+
//# sourceMappingURL=load-ts-transformers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"load-ts-transformers.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/load-ts-transformers.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,+BAA4B;AAQ5B,SAAgB,kBAAkB,CAChC,OAA2B,EAC3B,iBAAyC,OAAO,CAAC,OAAO;IAKxD,MAAM,WAAW,GAAuC,EAAE,CAAC;IAC3D,MAAM,UAAU,GAAsC,EAAE,CAAC;IACzD,MAAM,sBAAsB,GAC1B,EAAE,CAAC;IAEL,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM;QAC7B,OAAO;YACL,mBAAmB,EAAE;gBACnB,WAAW;gBACX,UAAU;gBACV,sBAAsB;aACvB;YACD,SAAS,EAAE,KAAK;SACjB,CAAC;IAEJ,MAAM,iBAAiB,GAAwB,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACpE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CACpE,CAAC;IAEF,MAAM,eAAe,GAAG;QACtB,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC;QACnC,GAAG,MAAM,CAAC,KAAK;KAChB,CAAC;IAEF,MAAM,UAAU,GAAqB,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACtE,IAAI;YACF,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,EAAE;gBACtC,KAAK,EAAE,eAAe;aACvB,CAAC,CAAC;YACH,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;SAC5B;QAAC,OAAO,CAAC,EAAE;YACV,eAAM,CAAC,IAAI,CAAC,IAAI,IAAI,8BAA8B,CAAC,CAAC;YACpD,OAAO,EAAE,CAAC;SACX;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAC1E,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC,iBAAiB,EAAE;YAC3C,eAAM,CAAC,IAAI,CACT,GAAG,UAAU,sGAAsG,CACpH,CAAC;YACF,SAAS;SACV;QAED,IAAI,MAAM,EAAE;YACV,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;SACtD;QAED,IAAI,KAAK,EAAE;YACT,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;SACnD;QAED,IAAI,iBAAiB,EAAE;YACrB,sBAAsB,CAAC,IAAI,CACzB,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CACzD,CAAC;SACH;KACF;IAED,OAAO;QACL,mBAAmB,EAAE;YACnB,WAAW;YACX,UAAU;YACV,sBAAsB;SACvB;QACD,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC;AA5ED,gDA4EC"}
|
|
@@ -1 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
import { ExecutorContext, ProjectGraphProjectNode } from '@nrwl/devkit';
|
|
2
|
+
import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
|
|
3
|
+
import { NormalizedExecutorOptions } from './schema';
|
|
4
|
+
export declare function updatePackageJson(options: NormalizedExecutorOptions, context: ExecutorContext, target: ProjectGraphProjectNode<any>, dependencies: DependentBuildableProjectNode[], withTypings?: boolean): void;
|
|
@@ -3,28 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updatePackageJson = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const fileutils_1 = require("@nrwl/tao/src/utils/fileutils");
|
|
6
|
+
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
6
7
|
const path_1 = require("path");
|
|
7
8
|
function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
|
|
8
9
|
const mainFileDir = (0, path_1.dirname)(main);
|
|
9
10
|
const relativeDir = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, mainFileDir));
|
|
10
11
|
return relativeDir === '' ? `./` : `./${relativeDir}/`;
|
|
11
12
|
}
|
|
12
|
-
function updatePackageJson(
|
|
13
|
+
function updatePackageJson(options, context, target, dependencies, withTypings = true) {
|
|
13
14
|
var _a, _b;
|
|
14
|
-
const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(projectRoot, 'package.json'));
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
const mainFile = (0, path_1.basename)(main).replace(/\.[tj]s$/, '');
|
|
19
|
-
const relativeMainFileDir = getMainFileDirRelativeToProjectRoot(main, projectRoot);
|
|
15
|
+
const packageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(options.projectRoot, 'package.json'));
|
|
16
|
+
const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
|
|
17
|
+
const relativeMainFileDir = getMainFileDirRelativeToProjectRoot(options.main, options.projectRoot);
|
|
20
18
|
const mainJsFile = `${relativeMainFileDir}${mainFile}.js`;
|
|
21
19
|
const typingsFile = `${relativeMainFileDir}${mainFile}.d.ts`;
|
|
22
20
|
packageJson.main = (_a = packageJson.main) !== null && _a !== void 0 ? _a : mainJsFile;
|
|
23
21
|
if (withTypings) {
|
|
24
22
|
packageJson.typings = (_b = packageJson.typings) !== null && _b !== void 0 ? _b : typingsFile;
|
|
25
23
|
}
|
|
26
|
-
|
|
27
|
-
(0
|
|
24
|
+
(0, fileutils_1.writeJsonFile)(`${options.outputPath}/package.json`, packageJson);
|
|
25
|
+
if (dependencies.length > 0 &&
|
|
26
|
+
options.updateBuildableProjectDepsInPackageJson) {
|
|
27
|
+
(0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
|
|
28
|
+
}
|
|
28
29
|
}
|
|
29
30
|
exports.updatePackageJson = updatePackageJson;
|
|
30
31
|
//# sourceMappingURL=update-package-json.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/update-package-json.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/update-package-json.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,6DAA4E;AAC5E,6FAG4D;AAC5D,+BAAyD;AAGzD,SAAS,mCAAmC,CAC1C,IAAY,EACZ,WAAmB;IAEnB,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,IAAA,sBAAa,EAAC,IAAA,eAAQ,EAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IACtE,OAAO,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,GAAG,CAAC;AACzD,CAAC;AAED,SAAgB,iBAAiB,CAC/B,OAAkC,EAClC,OAAwB,EACxB,MAAoC,EACpC,YAA6C,EAC7C,WAAW,GAAG,IAAI;;IAElB,MAAM,WAAW,GAAG,IAAA,wBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAChE,MAAM,mBAAmB,GAAG,mCAAmC,CAC7D,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,CACpB,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,mBAAmB,GAAG,QAAQ,KAAK,CAAC;IAC1D,MAAM,WAAW,GAAG,GAAG,mBAAmB,GAAG,QAAQ,OAAO,CAAC;IAE7D,WAAW,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,IAAI,mCAAI,UAAU,CAAC;IAElD,IAAI,WAAW,EAAE;QACf,WAAW,CAAC,OAAO,GAAG,MAAA,WAAW,CAAC,OAAO,mCAAI,WAAW,CAAC;KAC1D;IAED,IAAA,yBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,eAAe,EAAE,WAAW,CAAC,CAAC;IAEjE,IACE,YAAY,CAAC,MAAM,GAAG,CAAC;QACvB,OAAO,CAAC,uCAAuC,EAC/C;QACA,IAAA,oEAA6C,EAC3C,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,EACzB,MAAM,EACN,YAAY,EACZ,OAAO,CAAC,qCAAqC,CAC9C,CAAC;KACH;AACH,CAAC;AAvCD,8CAuCC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const nxVersion = "*";
|
|
2
|
-
export declare const swcCoreVersion = "1.2.
|
|
3
|
-
export declare const swcCliVersion = "~0.1.
|
|
4
|
-
export declare const swcHelpersVersion = "~0.
|
|
2
|
+
export declare const swcCoreVersion = "~1.2.143";
|
|
3
|
+
export declare const swcCliVersion = "~0.1.55";
|
|
4
|
+
export declare const swcHelpersVersion = "~0.3.3";
|
package/src/utils/versions.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.swcHelpersVersion = exports.swcCliVersion = exports.swcCoreVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '13.8.
|
|
5
|
-
exports.swcCoreVersion = '1.2.
|
|
6
|
-
exports.swcCliVersion = '~0.1.
|
|
7
|
-
exports.swcHelpersVersion = '~0.
|
|
4
|
+
exports.nxVersion = '13.8.5';
|
|
5
|
+
exports.swcCoreVersion = '~1.2.143';
|
|
6
|
+
exports.swcCliVersion = '~0.1.55';
|
|
7
|
+
exports.swcHelpersVersion = '~0.3.3';
|
|
8
8
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,GAAG,CAAC;AAEhB,QAAA,cAAc,GAAG,UAAU,CAAC;AAC5B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC"}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
4
|
-
const node_impl_1 = require("./node.impl");
|
|
5
|
-
exports.default = (0, devkit_1.convertNxExecutor)(node_impl_1.default);
|
|
6
|
-
//# sourceMappingURL=compat.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AACjD,2CAAuC;AAEvC,kBAAe,IAAA,0BAAiB,EAAC,mBAAY,CAAC,CAAC"}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
const Module = require('module');
|
|
2
|
-
const originalLoader = Module._load;
|
|
3
|
-
const mappings = JSON.parse(process.env.NX_MAPPINGS);
|
|
4
|
-
const keys = Object.keys(mappings);
|
|
5
|
-
const fileToRun = process.env.NX_FILE_TO_RUN;
|
|
6
|
-
Module._load = function (request, parent) {
|
|
7
|
-
if (!parent)
|
|
8
|
-
return originalLoader.apply(this, arguments);
|
|
9
|
-
const match = keys.find((k) => request === k);
|
|
10
|
-
if (match) {
|
|
11
|
-
const newArguments = [...arguments];
|
|
12
|
-
newArguments[0] = mappings[match];
|
|
13
|
-
return originalLoader.apply(this, newArguments);
|
|
14
|
-
}
|
|
15
|
-
else {
|
|
16
|
-
return originalLoader.apply(this, arguments);
|
|
17
|
-
}
|
|
18
|
-
};
|
|
19
|
-
require(fileToRun);
|
|
20
|
-
//# sourceMappingURL=node-with-require-overrides.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"node-with-require-overrides.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node-with-require-overrides.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC;AAEpC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AACrD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACnC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;AAE7C,MAAM,CAAC,KAAK,GAAG,UAAU,OAAO,EAAE,MAAM;IACtC,IAAI,CAAC,MAAM;QAAE,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;IAC9C,IAAI,KAAK,EAAE;QACT,MAAM,YAAY,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;QACpC,YAAY,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;KACjD;SAAM;QACL,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC9C;AACH,CAAC,CAAC;AAEF,OAAO,CAAC,SAAS,CAAC,CAAC"}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
-
import { ExecutorEvent } from '../../utils/schema';
|
|
3
|
-
import { NodeExecutorOptions } from './schema';
|
|
4
|
-
export declare function nodeExecutor(options: NodeExecutorOptions, context: ExecutorContext): AsyncGenerator<ExecutorEvent, void, unknown>;
|
|
5
|
-
export default nodeExecutor;
|