@nrwl/js 15.0.0-beta.1 → 15.0.0-beta.2
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 -6
- package/src/executors/node/node.impl.js +0 -3
- package/src/executors/node/node.impl.js.map +1 -1
- package/src/executors/swc/schema.json +23 -0
- package/src/executors/swc/swc.impl.d.ts +4 -0
- package/src/executors/swc/swc.impl.js +41 -4
- package/src/executors/swc/swc.impl.js.map +1 -1
- package/src/executors/tsc/schema.json +23 -0
- package/src/executors/tsc/tsc.impl.d.ts +1 -1
- package/src/executors/tsc/tsc.impl.js +22 -3
- package/src/executors/tsc/tsc.impl.js.map +1 -1
- package/src/utils/inline.d.ts +19 -0
- package/src/utils/inline.js +188 -0
- package/src/utils/inline.js.map +1 -0
- package/src/utils/schema.d.ts +3 -0
- package/src/utils/swc/compile-swc.d.ts +4 -0
- package/src/utils/swc/compile-swc.js +8 -5
- package/src/utils/swc/compile-swc.js.map +1 -1
- package/src/utils/swc/inline.d.ts +2 -0
- package/src/utils/swc/inline.js +13 -0
- package/src/utils/swc/inline.js.map +1 -0
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
- package/src/utils/versions.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.0.0-beta.
|
|
6
|
+
# [15.0.0-beta.2](https://github.com/nrwl/nx/compare/14.8.0...15.0.0-beta.2) (2022-10-11)
|
|
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.0.0-beta.
|
|
3
|
+
"version": "15.0.0-beta.2",
|
|
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,10 +32,10 @@
|
|
|
32
32
|
"executors": "./executors.json",
|
|
33
33
|
"builders": "./executors.json",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nrwl/devkit": "15.0.0-beta.
|
|
36
|
-
"@nrwl/jest": "15.0.0-beta.
|
|
37
|
-
"@nrwl/linter": "15.0.0-beta.
|
|
38
|
-
"@nrwl/workspace": "15.0.0-beta.
|
|
35
|
+
"@nrwl/devkit": "15.0.0-beta.2",
|
|
36
|
+
"@nrwl/jest": "15.0.0-beta.2",
|
|
37
|
+
"@nrwl/linter": "15.0.0-beta.2",
|
|
38
|
+
"@nrwl/workspace": "15.0.0-beta.2",
|
|
39
39
|
"@parcel/watcher": "2.0.4",
|
|
40
40
|
"chalk": "4.1.0",
|
|
41
41
|
"fast-glob": "3.2.7",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
52
|
"types": "./src/index.d.ts",
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "66a086413b95691f5c3859dac6879ccba0404531"
|
|
54
54
|
}
|
|
@@ -149,11 +149,8 @@ function killCurrentProcess(options, signal = 'SIGTERM') {
|
|
|
149
149
|
});
|
|
150
150
|
}
|
|
151
151
|
function startBuild(options, context) {
|
|
152
|
-
var _a;
|
|
153
152
|
return tslib_1.__asyncGenerator(this, arguments, function* startBuild_1() {
|
|
154
153
|
const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget);
|
|
155
|
-
// TODO(jack): [Nx 14] Remove this line once we generate `development` configuration by default + add migration for it if missing
|
|
156
|
-
(_a = buildTarget.configuration) !== null && _a !== void 0 ? _a : (buildTarget.configuration = '');
|
|
157
154
|
yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)(buildTarget, Object.assign(Object.assign({}, options.buildTargetOptions), { watch: options.watch }), context)))));
|
|
158
155
|
});
|
|
159
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"node.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,6 +72,29 @@
|
|
|
72
72
|
"description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
|
|
73
73
|
"enum": ["dependencies", "peerDependencies"],
|
|
74
74
|
"default": "peerDependencies"
|
|
75
|
+
},
|
|
76
|
+
"external": {
|
|
77
|
+
"description": "A list projects to be treated as external. This feature is experimental",
|
|
78
|
+
"oneOf": [
|
|
79
|
+
{
|
|
80
|
+
"type": "string",
|
|
81
|
+
"enum": ["all", "none"]
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
"type": "array",
|
|
85
|
+
"items": {
|
|
86
|
+
"type": "string"
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
]
|
|
90
|
+
},
|
|
91
|
+
"externalBuildTargets": {
|
|
92
|
+
"type": "array",
|
|
93
|
+
"items": {
|
|
94
|
+
"type": "string"
|
|
95
|
+
},
|
|
96
|
+
"description": "List of target names that annotate a build target for a project",
|
|
97
|
+
"default": ["build"]
|
|
75
98
|
}
|
|
76
99
|
},
|
|
77
100
|
"required": ["main", "outputPath", "tsConfig"],
|
|
@@ -3,5 +3,9 @@ import { NormalizedSwcExecutorOptions, SwcExecutorOptions } from '../../utils/sc
|
|
|
3
3
|
export declare function normalizeOptions(options: SwcExecutorOptions, contextRoot: string, sourceRoot?: string, projectRoot?: string): NormalizedSwcExecutorOptions;
|
|
4
4
|
export declare function swcExecutor(_options: SwcExecutorOptions, context: ExecutorContext): AsyncGenerator<{
|
|
5
5
|
success: boolean;
|
|
6
|
+
outfile?: undefined;
|
|
7
|
+
} | {
|
|
8
|
+
success: boolean;
|
|
9
|
+
outfile: string;
|
|
6
10
|
}, any, undefined>;
|
|
7
11
|
export default swcExecutor;
|
|
@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.swcExecutor = exports.normalizeOptions = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const assets_1 = require("@nrwl/workspace/src/utilities/assets");
|
|
6
|
+
const fs_extra_1 = require("fs-extra");
|
|
6
7
|
const path_1 = require("path");
|
|
8
|
+
const assets_2 = require("../../utils/assets");
|
|
7
9
|
const check_dependencies_1 = require("../../utils/check-dependencies");
|
|
8
10
|
const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
|
|
11
|
+
const inline_1 = require("../../utils/inline");
|
|
12
|
+
const package_json_1 = require("../../utils/package-json");
|
|
9
13
|
const compile_swc_1 = require("../../utils/swc/compile-swc");
|
|
10
14
|
const get_swcrc_path_1 = require("../../utils/swc/get-swcrc-path");
|
|
11
|
-
const
|
|
12
|
-
const package_json_1 = require("../../utils/package-json");
|
|
15
|
+
const inline_2 = require("../../utils/swc/inline");
|
|
13
16
|
function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
14
17
|
const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
|
|
15
18
|
if (options.skipTypeCheck == null) {
|
|
@@ -18,6 +21,18 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
|
18
21
|
if (options.watch == null) {
|
|
19
22
|
options.watch = false;
|
|
20
23
|
}
|
|
24
|
+
// TODO: put back when inlining story is more stable
|
|
25
|
+
// if (options.external == null) {
|
|
26
|
+
// options.external = 'all';
|
|
27
|
+
// } else if (Array.isArray(options.external) && options.external.length === 0) {
|
|
28
|
+
// options.external = 'none';
|
|
29
|
+
// }
|
|
30
|
+
if (Array.isArray(options.external) && options.external.length > 0) {
|
|
31
|
+
const firstItem = options.external[0];
|
|
32
|
+
if (firstItem === 'all' || firstItem === 'none') {
|
|
33
|
+
options.external = firstItem;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
21
36
|
const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
|
|
22
37
|
const projectRootParts = projectRoot.split('/');
|
|
23
38
|
// We pop the last part of the `projectRoot` to pass
|
|
@@ -34,8 +49,7 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
|
34
49
|
swcrcPath,
|
|
35
50
|
};
|
|
36
51
|
return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
|
|
37
|
-
projectRoot,
|
|
38
|
-
outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), swcCliOptions });
|
|
52
|
+
projectRoot, originalProjectRoot: projectRoot, outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), swcCliOptions });
|
|
39
53
|
}
|
|
40
54
|
exports.normalizeOptions = normalizeOptions;
|
|
41
55
|
function swcExecutor(_options, context) {
|
|
@@ -50,6 +64,21 @@ function swcExecutor(_options, context) {
|
|
|
50
64
|
if (swcHelperDependency) {
|
|
51
65
|
dependencies.push(swcHelperDependency);
|
|
52
66
|
}
|
|
67
|
+
const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, options.tsConfig);
|
|
68
|
+
if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
|
|
69
|
+
options.projectRoot = '.'; // set to root of workspace to include other libs for type check
|
|
70
|
+
// remap paths for SWC compilation
|
|
71
|
+
options.swcCliOptions.srcPath = options.swcCliOptions.swcCwd;
|
|
72
|
+
options.swcCliOptions.swcCwd = '.';
|
|
73
|
+
options.swcCliOptions.destPath = options.swcCliOptions.destPath
|
|
74
|
+
.split('../')
|
|
75
|
+
.at(-1)
|
|
76
|
+
.concat('/', options.swcCliOptions.srcPath);
|
|
77
|
+
// tmp swcrc with dependencies to exclude
|
|
78
|
+
// - buildable libraries
|
|
79
|
+
// - other libraries that are not dependent on the current project
|
|
80
|
+
options.swcCliOptions.swcrcPath = (0, inline_2.generateTmpSwcrc)(inlineProjectGraph, options.swcCliOptions.swcrcPath);
|
|
81
|
+
}
|
|
53
82
|
if (options.watch) {
|
|
54
83
|
let disposeFn;
|
|
55
84
|
process.on('SIGINT', () => disposeFn());
|
|
@@ -57,6 +86,7 @@ function swcExecutor(_options, context) {
|
|
|
57
86
|
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, compile_swc_1.compileSwcWatch)(context, options, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
58
87
|
const assetResult = yield (0, assets_2.copyAssets)(options, context);
|
|
59
88
|
const packageJsonResult = yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { skipTypings: !options.skipTypeCheck }), context);
|
|
89
|
+
removeTmpSwcrc(options.swcCliOptions.swcrcPath);
|
|
60
90
|
disposeFn = () => {
|
|
61
91
|
assetResult === null || assetResult === void 0 ? void 0 : assetResult.stop();
|
|
62
92
|
packageJsonResult === null || packageJsonResult === void 0 ? void 0 : packageJsonResult.stop();
|
|
@@ -67,10 +97,17 @@ function swcExecutor(_options, context) {
|
|
|
67
97
|
return yield tslib_1.__await(yield yield tslib_1.__await((0, compile_swc_1.compileSwc)(context, options, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
68
98
|
yield (0, assets_2.copyAssets)(options, context);
|
|
69
99
|
yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { generateExportsField: true, skipTypings: !options.skipTypeCheck, extraDependencies: swcHelperDependency ? [swcHelperDependency] : [] }), context);
|
|
100
|
+
removeTmpSwcrc(options.swcCliOptions.swcrcPath);
|
|
101
|
+
(0, inline_1.postProcessInlinedDependencies)(options.outputPath, options.originalProjectRoot, inlineProjectGraph);
|
|
70
102
|
}))));
|
|
71
103
|
}
|
|
72
104
|
});
|
|
73
105
|
}
|
|
74
106
|
exports.swcExecutor = swcExecutor;
|
|
107
|
+
function removeTmpSwcrc(swcrcPath) {
|
|
108
|
+
if (swcrcPath.startsWith('tmp/')) {
|
|
109
|
+
(0, fs_extra_1.removeSync)((0, path_1.dirname)(swcrcPath));
|
|
110
|
+
}
|
|
111
|
+
}
|
|
75
112
|
exports.default = swcExecutor;
|
|
76
113
|
//# sourceMappingURL=swc.impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":";;;;AACA,iEAG8C;AAC9C,+
|
|
1
|
+
{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,29 @@
|
|
|
61
61
|
"description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
|
|
62
62
|
"enum": ["dependencies", "peerDependencies"],
|
|
63
63
|
"default": "peerDependencies"
|
|
64
|
+
},
|
|
65
|
+
"external": {
|
|
66
|
+
"description": "A list projects to be treated as external. This feature is experimental",
|
|
67
|
+
"oneOf": [
|
|
68
|
+
{
|
|
69
|
+
"type": "string",
|
|
70
|
+
"enum": ["all", "none"]
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
"type": "array",
|
|
74
|
+
"items": {
|
|
75
|
+
"type": "string"
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
]
|
|
79
|
+
},
|
|
80
|
+
"externalBuildTargets": {
|
|
81
|
+
"type": "array",
|
|
82
|
+
"items": {
|
|
83
|
+
"type": "string"
|
|
84
|
+
},
|
|
85
|
+
"description": "List of target names that annotate a build target for a project",
|
|
86
|
+
"default": ["build"]
|
|
64
87
|
}
|
|
65
88
|
},
|
|
66
89
|
"required": ["main", "outputPath", "tsConfig"],
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
-
import { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities/typescript/compilation';
|
|
2
|
+
import type { TypeScriptCompilationOptions } from '@nrwl/workspace/src/utilities/typescript/compilation';
|
|
3
3
|
import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
|
|
4
4
|
export declare function normalizeOptions(options: ExecutorOptions, contextRoot: string, sourceRoot: string, projectRoot: string): NormalizedExecutorOptions;
|
|
5
5
|
export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;
|
|
@@ -4,12 +4,13 @@ exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.norma
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const assets_1 = require("@nrwl/workspace/src/utilities/assets");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
+
const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
|
|
7
8
|
const check_dependencies_1 = require("../../utils/check-dependencies");
|
|
8
9
|
const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
|
|
9
|
-
const
|
|
10
|
+
const inline_1 = require("../../utils/inline");
|
|
11
|
+
const update_package_json_1 = require("../../utils/package-json/update-package-json");
|
|
10
12
|
const compile_typescript_files_1 = require("../../utils/typescript/compile-typescript-files");
|
|
11
13
|
const load_ts_transformers_1 = require("../../utils/typescript/load-ts-transformers");
|
|
12
|
-
const update_package_json_1 = require("../../utils/package-json/update-package-json");
|
|
13
14
|
const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-file-changes");
|
|
14
15
|
function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
15
16
|
const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
|
|
@@ -19,6 +20,18 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
|
19
20
|
if (options.watch == null) {
|
|
20
21
|
options.watch = false;
|
|
21
22
|
}
|
|
23
|
+
// TODO: put back when inlining story is more stable
|
|
24
|
+
// if (options.external == null) {
|
|
25
|
+
// options.external = 'all';
|
|
26
|
+
// } else if (Array.isArray(options.external) && options.external.length === 0) {
|
|
27
|
+
// options.external = 'none';
|
|
28
|
+
// }
|
|
29
|
+
if (Array.isArray(options.external) && options.external.length > 0) {
|
|
30
|
+
const firstItem = options.external[0];
|
|
31
|
+
if (firstItem === 'all' || firstItem === 'none') {
|
|
32
|
+
options.external = firstItem;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
22
35
|
const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
|
|
23
36
|
return Object.assign(Object.assign({}, options), { root: contextRoot, sourceRoot,
|
|
24
37
|
projectRoot,
|
|
@@ -73,9 +86,15 @@ function tscExecutor(_options, context) {
|
|
|
73
86
|
process.on('SIGINT', () => handleTermination());
|
|
74
87
|
process.on('SIGTERM', () => handleTermination());
|
|
75
88
|
}
|
|
76
|
-
|
|
89
|
+
const tsCompilationOptions = createTypeScriptCompilationOptions(options, context);
|
|
90
|
+
const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, tsCompilationOptions.tsConfig);
|
|
91
|
+
if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
|
|
92
|
+
tsCompilationOptions.rootDir = '.';
|
|
93
|
+
}
|
|
94
|
+
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, compile_typescript_files_1.compileTypeScriptFiles)(options, tsCompilationOptions, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
77
95
|
yield assetHandler.processAllAssetsOnce();
|
|
78
96
|
(0, update_package_json_1.updatePackageJson)(options, context, target, dependencies);
|
|
97
|
+
(0, inline_1.postProcessInlinedDependencies)(tsCompilationOptions.outputPath, tsCompilationOptions.projectRoot, inlineProjectGraph);
|
|
79
98
|
}))))));
|
|
80
99
|
});
|
|
81
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":";;;;AACA,iEAG8C;AAE9C,+BAAqC;AAOrC,uEAAmE;AACnE,uFAGgD;AAChD,
|
|
1
|
+
{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { ExecutorContext } from '@nrwl/devkit';
|
|
2
|
+
import type { NormalizedExecutorOptions } from './schema';
|
|
3
|
+
interface InlineProjectNode {
|
|
4
|
+
name: string;
|
|
5
|
+
root: string;
|
|
6
|
+
sourceRoot: string;
|
|
7
|
+
pathAlias: string;
|
|
8
|
+
buildOutputPath?: string;
|
|
9
|
+
}
|
|
10
|
+
export interface InlineProjectGraph {
|
|
11
|
+
nodes: Record<string, InlineProjectNode>;
|
|
12
|
+
externals: Record<string, InlineProjectNode>;
|
|
13
|
+
dependencies: Record<string, string[]>;
|
|
14
|
+
}
|
|
15
|
+
export declare function isInlineGraphEmpty(inlineGraph: InlineProjectGraph): boolean;
|
|
16
|
+
export declare function handleInliningBuild(context: ExecutorContext, options: NormalizedExecutorOptions, tsConfigPath: string): InlineProjectGraph;
|
|
17
|
+
export declare function postProcessInlinedDependencies(outputPath: string, parentOutputPath: string, inlineGraph: InlineProjectGraph): void;
|
|
18
|
+
export declare function movePackage(from: string, to: string): void;
|
|
19
|
+
export {};
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.movePackage = exports.postProcessInlinedDependencies = exports.handleInliningBuild = exports.isInlineGraphEmpty = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const fs_extra_1 = require("fs-extra");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
function isInlineGraphEmpty(inlineGraph) {
|
|
8
|
+
return Object.keys(inlineGraph.nodes).length === 0;
|
|
9
|
+
}
|
|
10
|
+
exports.isInlineGraphEmpty = isInlineGraphEmpty;
|
|
11
|
+
function handleInliningBuild(context, options, tsConfigPath) {
|
|
12
|
+
const tsConfigJson = (0, devkit_1.readJsonFile)(tsConfigPath);
|
|
13
|
+
const pathAliases = tsConfigJson['compilerOptions']['paths'] || readBasePathAliases(context);
|
|
14
|
+
const inlineGraph = createInlineGraph(context, options, pathAliases);
|
|
15
|
+
if (isInlineGraphEmpty(inlineGraph)) {
|
|
16
|
+
return inlineGraph;
|
|
17
|
+
}
|
|
18
|
+
buildInlineGraphExternals(context, inlineGraph, pathAliases);
|
|
19
|
+
return inlineGraph;
|
|
20
|
+
}
|
|
21
|
+
exports.handleInliningBuild = handleInliningBuild;
|
|
22
|
+
function postProcessInlinedDependencies(outputPath, parentOutputPath, inlineGraph) {
|
|
23
|
+
if (isInlineGraphEmpty(inlineGraph)) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
const parentDistPath = (0, path_1.join)(outputPath, parentOutputPath);
|
|
27
|
+
// move parentOutput
|
|
28
|
+
movePackage(parentDistPath, outputPath);
|
|
29
|
+
const inlinedDepsDestOutputRecord = {};
|
|
30
|
+
// move inlined outputs
|
|
31
|
+
for (const inlineDependenciesNames of Object.values(inlineGraph.dependencies)) {
|
|
32
|
+
for (const inlineDependenciesName of inlineDependenciesNames) {
|
|
33
|
+
const inlineDependency = inlineGraph.nodes[inlineDependenciesName];
|
|
34
|
+
const depOutputPath = inlineDependency.buildOutputPath ||
|
|
35
|
+
(0, path_1.join)(outputPath, inlineDependency.root);
|
|
36
|
+
const destDepOutputPath = (0, path_1.join)(outputPath, inlineDependency.name);
|
|
37
|
+
movePackage(depOutputPath, destDepOutputPath);
|
|
38
|
+
// TODO: hard-coded "src"
|
|
39
|
+
inlinedDepsDestOutputRecord[inlineDependency.pathAlias] =
|
|
40
|
+
destDepOutputPath + '/src';
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
updateImports(outputPath, inlinedDepsDestOutputRecord);
|
|
44
|
+
}
|
|
45
|
+
exports.postProcessInlinedDependencies = postProcessInlinedDependencies;
|
|
46
|
+
function readBasePathAliases(context) {
|
|
47
|
+
var _a;
|
|
48
|
+
const tsConfigPath = (0, path_1.join)(context.root, 'tsconfig.base.json');
|
|
49
|
+
return ((_a = (0, devkit_1.readJsonFile)(tsConfigPath)) === null || _a === void 0 ? void 0 : _a['compilerOptions']['paths']) || {};
|
|
50
|
+
}
|
|
51
|
+
function emptyInlineGraph() {
|
|
52
|
+
return { nodes: {}, externals: {}, dependencies: {} };
|
|
53
|
+
}
|
|
54
|
+
function projectNodeToInlineProjectNode(projectNode, pathAlias = '', buildOutputPath = '') {
|
|
55
|
+
return {
|
|
56
|
+
name: projectNode.name,
|
|
57
|
+
root: projectNode.data.root,
|
|
58
|
+
sourceRoot: projectNode.data.sourceRoot,
|
|
59
|
+
pathAlias,
|
|
60
|
+
buildOutputPath,
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
function createInlineGraph(context, options, pathAliases, projectName = context.projectName, inlineGraph = emptyInlineGraph()) {
|
|
64
|
+
var _a;
|
|
65
|
+
var _b;
|
|
66
|
+
if (options.external == null)
|
|
67
|
+
return inlineGraph;
|
|
68
|
+
const projectDependencies = context.projectGraph.dependencies[projectName] || [];
|
|
69
|
+
if (projectDependencies.length === 0)
|
|
70
|
+
return inlineGraph;
|
|
71
|
+
if (!inlineGraph.nodes[projectName]) {
|
|
72
|
+
inlineGraph.nodes[projectName] = projectNodeToInlineProjectNode(context.projectGraph.nodes[projectName]);
|
|
73
|
+
}
|
|
74
|
+
const implicitDependencies = context.projectGraph.nodes[projectName].data.implicitDependencies || [];
|
|
75
|
+
for (const projectDependency of projectDependencies) {
|
|
76
|
+
// skip npm packages
|
|
77
|
+
if (projectDependency.target.startsWith('npm')) {
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
80
|
+
// skip implicitDependencies
|
|
81
|
+
if (implicitDependencies.includes(projectDependency.target)) {
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
const pathAlias = getPathAliasForPackage(context.projectGraph.nodes[projectDependency.target], pathAliases);
|
|
85
|
+
const buildOutputPath = getBuildOutputPath(projectDependency.target, context, options);
|
|
86
|
+
const shouldInline =
|
|
87
|
+
/**
|
|
88
|
+
* if all buildable libraries are marked as external,
|
|
89
|
+
* then push the project dependency that doesn't have a build target
|
|
90
|
+
*/
|
|
91
|
+
(options.external === 'all' && !buildOutputPath) ||
|
|
92
|
+
/**
|
|
93
|
+
* if all buildable libraries are marked as internal,
|
|
94
|
+
* then push every project dependency to be inlined
|
|
95
|
+
*/
|
|
96
|
+
options.external === 'none' ||
|
|
97
|
+
/**
|
|
98
|
+
* if some buildable libraries are marked as external,
|
|
99
|
+
* then push the project dependency that IS NOT marked as external OR doesn't have a build target
|
|
100
|
+
*/
|
|
101
|
+
(Array.isArray(options.external) &&
|
|
102
|
+
options.external.length > 0 &&
|
|
103
|
+
!options.external.includes(projectDependency.target)) ||
|
|
104
|
+
!buildOutputPath;
|
|
105
|
+
if (shouldInline) {
|
|
106
|
+
(_a = (_b = inlineGraph.dependencies)[projectName]) !== null && _a !== void 0 ? _a : (_b[projectName] = []);
|
|
107
|
+
inlineGraph.dependencies[projectName].push(projectDependency.target);
|
|
108
|
+
}
|
|
109
|
+
inlineGraph.nodes[projectDependency.target] =
|
|
110
|
+
projectNodeToInlineProjectNode(context.projectGraph.nodes[projectDependency.target], pathAlias, buildOutputPath);
|
|
111
|
+
if (context.projectGraph.dependencies[projectDependency.target].length > 0) {
|
|
112
|
+
inlineGraph = createInlineGraph(context, options, pathAliases, projectDependency.target, inlineGraph);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return inlineGraph;
|
|
116
|
+
}
|
|
117
|
+
function buildInlineGraphExternals(context, inlineProjectGraph, pathAliases) {
|
|
118
|
+
const allNodes = Object.assign({}, context.projectGraph.nodes);
|
|
119
|
+
for (const [parent, dependencies] of Object.entries(inlineProjectGraph.dependencies)) {
|
|
120
|
+
if (allNodes[parent]) {
|
|
121
|
+
delete allNodes[parent];
|
|
122
|
+
}
|
|
123
|
+
for (const dependencyName of dependencies) {
|
|
124
|
+
const dependencyNode = inlineProjectGraph.nodes[dependencyName];
|
|
125
|
+
// buildable is still external even if it is a dependency
|
|
126
|
+
if (dependencyNode.buildOutputPath) {
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
if (allNodes[dependencyName]) {
|
|
130
|
+
delete allNodes[dependencyName];
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
for (const [projectName, projectNode] of Object.entries(allNodes)) {
|
|
135
|
+
if (!inlineProjectGraph.externals[projectName]) {
|
|
136
|
+
inlineProjectGraph.externals[projectName] =
|
|
137
|
+
projectNodeToInlineProjectNode(projectNode, getPathAliasForPackage(projectNode, pathAliases));
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
function movePackage(from, to) {
|
|
142
|
+
(0, fs_extra_1.copySync)(from, to, { overwrite: true, recursive: true });
|
|
143
|
+
(0, fs_extra_1.removeSync)(from);
|
|
144
|
+
}
|
|
145
|
+
exports.movePackage = movePackage;
|
|
146
|
+
function updateImports(destOutputPath, inlinedDepsDestOutputRecord) {
|
|
147
|
+
const importRegex = new RegExp(Object.keys(inlinedDepsDestOutputRecord)
|
|
148
|
+
.map((pathAlias) => `["'](${pathAlias})["']`)
|
|
149
|
+
.join('|'), 'g');
|
|
150
|
+
recursiveUpdateImport(destOutputPath, importRegex, inlinedDepsDestOutputRecord);
|
|
151
|
+
}
|
|
152
|
+
function recursiveUpdateImport(dirPath, importRegex, inlinedDepsDestOutputRecord) {
|
|
153
|
+
const files = (0, fs_extra_1.readdirSync)(dirPath, { withFileTypes: true });
|
|
154
|
+
for (const file of files) {
|
|
155
|
+
// only check .js and .d.ts files
|
|
156
|
+
if (file.isFile() &&
|
|
157
|
+
(file.name.endsWith('.js') || file.name.endsWith('.d.ts'))) {
|
|
158
|
+
const filePath = (0, path_1.join)(dirPath, file.name);
|
|
159
|
+
const fileContent = (0, fs_extra_1.readFileSync)(filePath, 'utf-8');
|
|
160
|
+
const updatedContent = fileContent.replace(importRegex, (matched) => {
|
|
161
|
+
const result = matched.replace(/['"]/g, '');
|
|
162
|
+
return `"${(0, path_1.relative)(dirPath, inlinedDepsDestOutputRecord[result])}"`;
|
|
163
|
+
});
|
|
164
|
+
(0, fs_extra_1.writeFileSync)(filePath, updatedContent);
|
|
165
|
+
}
|
|
166
|
+
else if (file.isDirectory()) {
|
|
167
|
+
recursiveUpdateImport((0, path_1.join)(dirPath, file.name), importRegex, inlinedDepsDestOutputRecord);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
function getPathAliasForPackage(packageNode, pathAliases) {
|
|
172
|
+
if (!packageNode)
|
|
173
|
+
return '';
|
|
174
|
+
for (const [alias, paths] of Object.entries(pathAliases)) {
|
|
175
|
+
if (paths.some((path) => path.includes(packageNode.data.root))) {
|
|
176
|
+
return alias;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
return '';
|
|
180
|
+
}
|
|
181
|
+
function getBuildOutputPath(projectName, context, options) {
|
|
182
|
+
var _a;
|
|
183
|
+
const buildTarget = options.externalBuildTargets.find((buildTarget) => { var _a, _b, _c; return (_c = (_b = (_a = context.projectGraph.nodes[projectName]) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.targets) === null || _c === void 0 ? void 0 : _c[buildTarget]; });
|
|
184
|
+
if (buildTarget)
|
|
185
|
+
return (_a = context.projectGraph.nodes[projectName].data.targets) === null || _a === void 0 ? void 0 : _a[buildTarget].options['outputPath'];
|
|
186
|
+
return '';
|
|
187
|
+
}
|
|
188
|
+
//# sourceMappingURL=inline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inline.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/inline.ts"],"names":[],"mappings":"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"}
|
package/src/utils/schema.d.ts
CHANGED
|
@@ -45,6 +45,8 @@ export interface ExecutorOptions {
|
|
|
45
45
|
transformers: TransformerEntry[];
|
|
46
46
|
updateBuildableProjectDepsInPackageJson?: boolean;
|
|
47
47
|
buildableProjectDepsInPackageJsonType?: 'dependencies' | 'peerDependencies';
|
|
48
|
+
external?: 'all' | 'none' | string[];
|
|
49
|
+
externalBuildTargets?: string[];
|
|
48
50
|
}
|
|
49
51
|
|
|
50
52
|
export interface NormalizedExecutorOptions extends ExecutorOptions {
|
|
@@ -72,6 +74,7 @@ export interface SwcCliOptions {
|
|
|
72
74
|
|
|
73
75
|
export interface NormalizedSwcExecutorOptions
|
|
74
76
|
extends NormalizedExecutorOptions {
|
|
77
|
+
originalProjectRoot: string;
|
|
75
78
|
swcExclude: string[];
|
|
76
79
|
skipTypeCheck: boolean;
|
|
77
80
|
swcCliOptions: SwcCliOptions;
|
|
@@ -2,6 +2,10 @@ import { ExecutorContext } from '@nrwl/devkit';
|
|
|
2
2
|
import { NormalizedSwcExecutorOptions } from '../schema';
|
|
3
3
|
export declare function compileSwc(context: ExecutorContext, normalizedOptions: NormalizedSwcExecutorOptions, postCompilationCallback: () => Promise<void>): Promise<{
|
|
4
4
|
success: boolean;
|
|
5
|
+
outfile?: undefined;
|
|
6
|
+
} | {
|
|
7
|
+
success: boolean;
|
|
8
|
+
outfile: string;
|
|
5
9
|
}>;
|
|
6
10
|
export declare function compileSwcWatch(context: ExecutorContext, normalizedOptions: NormalizedSwcExecutorOptions, postCompilationCallback: () => Promise<void>): AsyncGenerator<{
|
|
7
11
|
success: boolean;
|
|
@@ -4,11 +4,10 @@ exports.compileSwcWatch = exports.compileSwc = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
7
|
-
const
|
|
7
|
+
const fs_extra_1 = require("fs-extra");
|
|
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
|
-
const fs_extra_1 = require("fs-extra");
|
|
12
11
|
function getSwcCmd({ swcrcPath, srcPath, destPath }, watch = false) {
|
|
13
12
|
let swcCmd = `npx swc ${srcPath} -d ${destPath} --no-swcrc --config-file=${swcrcPath}`;
|
|
14
13
|
return watch ? swcCmd.concat(' --watch') : swcCmd;
|
|
@@ -24,7 +23,7 @@ function getTypeCheckOptions(normalizedOptions) {
|
|
|
24
23
|
};
|
|
25
24
|
if (watch) {
|
|
26
25
|
typeCheckOptions.incremental = true;
|
|
27
|
-
typeCheckOptions.cacheDir =
|
|
26
|
+
typeCheckOptions.cacheDir = devkit_1.cacheDir;
|
|
28
27
|
}
|
|
29
28
|
return typeCheckOptions;
|
|
30
29
|
}
|
|
@@ -39,8 +38,8 @@ function compileSwc(context, normalizedOptions, postCompilationCallback) {
|
|
|
39
38
|
}).toString();
|
|
40
39
|
devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
|
|
41
40
|
const isCompileSuccess = swcCmdLog.includes('Successfully compiled');
|
|
42
|
-
yield postCompilationCallback();
|
|
43
41
|
if (normalizedOptions.skipTypeCheck) {
|
|
42
|
+
yield postCompilationCallback();
|
|
44
43
|
return { success: isCompileSuccess };
|
|
45
44
|
}
|
|
46
45
|
const { errors, warnings } = yield (0, run_type_check_1.runTypeCheck)(getTypeCheckOptions(normalizedOptions));
|
|
@@ -49,7 +48,11 @@ function compileSwc(context, normalizedOptions, postCompilationCallback) {
|
|
|
49
48
|
if (hasErrors || hasWarnings) {
|
|
50
49
|
yield (0, print_diagnostics_1.printDiagnostics)(errors, warnings);
|
|
51
50
|
}
|
|
52
|
-
|
|
51
|
+
yield postCompilationCallback();
|
|
52
|
+
return {
|
|
53
|
+
success: !hasErrors && isCompileSuccess,
|
|
54
|
+
outfile: normalizedOptions.mainOutputPath,
|
|
55
|
+
};
|
|
53
56
|
});
|
|
54
57
|
}
|
|
55
58
|
exports.compileSwc = compileSwc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"compile-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/compile-swc.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.generateTmpSwcrc = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
function generateTmpSwcrc(inlineProjectGraph, swcrcPath) {
|
|
6
|
+
const swcrc = (0, devkit_1.readJsonFile)(swcrcPath);
|
|
7
|
+
swcrc['exclude'] = swcrc['exclude'].concat(Object.values(inlineProjectGraph.externals).map((external) => `${external.root}/**/.*.ts$`), 'node_modules/**/*.ts$');
|
|
8
|
+
const tmpSwcrcPath = `tmp${swcrcPath}`;
|
|
9
|
+
(0, devkit_1.writeJsonFile)(tmpSwcrcPath, swcrc);
|
|
10
|
+
return tmpSwcrcPath;
|
|
11
|
+
}
|
|
12
|
+
exports.generateTmpSwcrc = generateTmpSwcrc;
|
|
13
|
+
//# sourceMappingURL=inline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inline.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/inline.ts"],"names":[],"mappings":";;;AAAA,yCAA2D;AAG3D,SAAgB,gBAAgB,CAC9B,kBAAsC,EACtC,SAAiB;IAEjB,MAAM,KAAK,GAAG,IAAA,qBAAY,EAAC,SAAS,CAAC,CAAC;IAEtC,KAAK,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CACxC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAAG,CAC7C,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,YAAY,CAC3C,EACD,uBAAuB,CACxB,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,SAAS,EAAE,CAAC;IACvC,IAAA,sBAAa,EAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAEnC,OAAO,YAAY,CAAC;AACtB,CAAC;AAjBD,4CAiBC"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -2,5 +2,5 @@ export { swcCoreVersion } from 'nx/src/utils/versions';
|
|
|
2
2
|
export declare const nxVersion: any;
|
|
3
3
|
export declare const esbuildVersion = "^0.15.7";
|
|
4
4
|
export declare const swcCliVersion = "~0.1.55";
|
|
5
|
-
export declare const swcHelpersVersion = "~0.
|
|
5
|
+
export declare const swcHelpersVersion = "~0.4.11";
|
|
6
6
|
export declare const typesNodeVersion = "18.7.1";
|
package/src/utils/versions.js
CHANGED
|
@@ -6,6 +6,6 @@ Object.defineProperty(exports, "swcCoreVersion", { enumerable: true, get: functi
|
|
|
6
6
|
exports.nxVersion = require('../../package.json').version;
|
|
7
7
|
exports.esbuildVersion = '^0.15.7';
|
|
8
8
|
exports.swcCliVersion = '~0.1.55';
|
|
9
|
-
exports.swcHelpersVersion = '~0.
|
|
9
|
+
exports.swcHelpersVersion = '~0.4.11';
|
|
10
10
|
exports.typesNodeVersion = '18.7.1';
|
|
11
11
|
//# sourceMappingURL=versions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/versions.ts"],"names":[],"mappings":";;;AAAA,kDAAuD;AAA9C,0GAAA,cAAc,OAAA;AAEV,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/versions.ts"],"names":[],"mappings":";;;AAAA,kDAAuD;AAA9C,0GAAA,cAAc,OAAA;AAEV,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,gBAAgB,GAAG,QAAQ,CAAC"}
|