@nrwl/js 13.4.0-beta.1 → 13.4.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/executors.json +20 -0
- package/generators.json +14 -0
- package/package.json +10 -6
- package/src/executors/node/compat.d.ts +2 -0
- package/src/executors/node/compat.js +6 -0
- package/src/executors/node/compat.js.map +1 -0
- package/src/executors/node/node-with-require-overrides.d.ts +5 -0
- package/src/executors/node/node-with-require-overrides.js +20 -0
- package/src/executors/node/node-with-require-overrides.js.map +1 -0
- package/src/executors/node/node.impl.d.ts +5 -0
- package/src/executors/node/node.impl.js +141 -0
- package/src/executors/node/node.impl.js.map +1 -0
- package/src/executors/node/schema.d.ts +16 -0
- package/src/executors/node/schema.json +67 -0
- package/src/executors/swc/compat.d.ts +2 -0
- package/src/executors/swc/compat.js +6 -0
- package/src/executors/swc/compat.js.map +1 -0
- package/src/executors/swc/schema.d.ts +10 -0
- package/src/executors/swc/schema.json +75 -0
- package/src/executors/swc/swc.impl.d.ts +5 -0
- package/src/executors/swc/swc.impl.js +50 -0
- package/src/executors/swc/swc.impl.js.map +1 -0
- package/src/executors/tsc/schema.json +34 -1
- package/src/executors/tsc/tsc.impl.d.ts +3 -4
- package/src/executors/tsc/tsc.impl.js +35 -50
- package/src/executors/tsc/tsc.impl.js.map +1 -1
- package/src/generators/application/application.d.ts +3 -3
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/convert-to-swc/convert-to-swc.d.ts +5 -0
- package/src/generators/convert-to-swc/convert-to-swc.js +54 -0
- package/src/generators/convert-to-swc/convert-to-swc.js.map +1 -0
- package/src/generators/convert-to-swc/schema.d.ts +4 -0
- package/src/generators/convert-to-swc/schema.json +35 -0
- package/src/generators/library/library.d.ts +3 -3
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +6 -1
- package/src/index.d.ts +2 -0
- package/src/index.js +5 -0
- package/src/index.js.map +1 -1
- package/src/utils/check-dependencies.d.ts +5 -0
- package/src/utils/check-dependencies.js +32 -0
- package/src/utils/check-dependencies.js.map +1 -0
- package/src/utils/normalize-ts-compilation-options.d.ts +2 -0
- package/src/utils/normalize-ts-compilation-options.js +9 -0
- package/src/utils/normalize-ts-compilation-options.js.map +1 -0
- package/src/utils/project-generator.d.ts +3 -3
- package/src/utils/project-generator.js +30 -16
- package/src/utils/project-generator.js.map +1 -1
- package/src/utils/schema.d.ts +42 -2
- package/src/utils/swc/add-swc-config.d.ts +2 -0
- package/src/utils/swc/add-swc-config.js +36 -0
- package/src/utils/swc/add-swc-config.js.map +1 -0
- package/src/utils/swc/add-swc-dependencies.d.ts +2 -0
- package/src/utils/swc/add-swc-dependencies.js +14 -0
- package/src/utils/swc/add-swc-dependencies.js.map +1 -0
- package/src/utils/swc/compile-swc.d.ts +6 -0
- package/src/utils/swc/compile-swc.js +128 -0
- package/src/utils/swc/compile-swc.js.map +1 -0
- package/src/utils/typescript/__mocks__/plugin-a.d.ts +1 -0
- package/src/utils/typescript/__mocks__/plugin-a.js +6 -0
- package/src/utils/typescript/__mocks__/plugin-a.js.map +1 -0
- package/src/utils/typescript/__mocks__/plugin-b.d.ts +1 -0
- package/src/utils/typescript/__mocks__/plugin-b.js +6 -0
- package/src/utils/typescript/__mocks__/plugin-b.js.map +1 -0
- package/src/utils/typescript/compile-typescript-files.d.ts +4 -0
- package/src/utils/typescript/compile-typescript-files.js +59 -0
- package/src/utils/typescript/compile-typescript-files.js.map +1 -0
- package/src/utils/typescript/load-ts-plugins.d.ts +5 -0
- package/src/utils/typescript/load-ts-plugins.js +63 -0
- package/src/utils/typescript/load-ts-plugins.js.map +1 -0
- package/src/utils/typescript/print-diagnostics.d.ts +1 -2
- package/src/utils/typescript/print-diagnostics.js +7 -7
- package/src/utils/typescript/print-diagnostics.js.map +1 -1
- package/src/utils/typescript/run-type-check.d.ts +8 -3
- package/src/utils/typescript/run-type-check.js +90 -58
- package/src/utils/typescript/run-type-check.js.map +1 -1
- package/src/utils/typescript/types.d.ts +18 -0
- package/src/utils/typescript/types.js +3 -0
- package/src/utils/typescript/types.js.map +1 -0
- package/src/utils/update-package-json.d.ts +1 -0
- package/src/utils/update-package-json.js +30 -0
- package/src/utils/update-package-json.js.map +1 -0
- package/src/utils/versions.d.ts +2 -0
- package/src/utils/versions.js +4 -2
- package/src/utils/versions.js.map +1 -1
- package/src/executors/tsc/schema.d.ts +0 -6
|
@@ -1,63 +1,48 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.tscExecutor = void 0;
|
|
3
|
+
exports.tscExecutor = exports.normalizeOptions = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
7
5
|
const assets_1 = require("@nrwl/workspace/src/utilities/assets");
|
|
8
|
-
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
9
|
-
const compilation_1 = require("@nrwl/workspace/src/utilities/typescript/compilation");
|
|
10
6
|
const path_1 = require("path");
|
|
7
|
+
const rxjs_for_await_1 = require("rxjs-for-await");
|
|
8
|
+
const operators_1 = require("rxjs/operators");
|
|
9
|
+
const check_dependencies_1 = require("../../utils/check-dependencies");
|
|
10
|
+
const compile_typescript_files_1 = require("../../utils/typescript/compile-typescript-files");
|
|
11
|
+
const update_package_json_1 = require("../../utils/update-package-json");
|
|
12
|
+
function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
13
|
+
const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
|
|
14
|
+
if (options.watch == null) {
|
|
15
|
+
options.watch = false;
|
|
16
|
+
}
|
|
17
|
+
const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
|
|
18
|
+
return Object.assign(Object.assign({}, options), { root: contextRoot, sourceRoot,
|
|
19
|
+
projectRoot,
|
|
20
|
+
files,
|
|
21
|
+
outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')) });
|
|
22
|
+
}
|
|
23
|
+
exports.normalizeOptions = normalizeOptions;
|
|
11
24
|
function tscExecutor(options, context) {
|
|
12
|
-
return (0, tslib_1.
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
if (dependencies.length > 0) {
|
|
19
|
-
const areDependentProjectsBuilt = (0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies);
|
|
20
|
-
if (!areDependentProjectsBuilt) {
|
|
21
|
-
return { success: false };
|
|
22
|
-
}
|
|
23
|
-
normalizedOptions.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, options.tsConfig), context.root, projectRoot, dependencies);
|
|
25
|
+
return (0, tslib_1.__asyncGenerator)(this, arguments, function* tscExecutor_1() {
|
|
26
|
+
const { sourceRoot, root } = context.workspace.projects[context.projectName];
|
|
27
|
+
const normalizedOptions = normalizeOptions(options, context.root, sourceRoot, root);
|
|
28
|
+
const { projectRoot, tmpTsConfig } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
|
|
29
|
+
if (tmpTsConfig) {
|
|
30
|
+
normalizedOptions.tsConfig = tmpTsConfig;
|
|
24
31
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
});
|
|
32
|
-
yield (0, assets_1.copyAssets)(normalizedOptions.assets, context.root, normalizedOptions.outputPath);
|
|
33
|
-
updatePackageJson(normalizedOptions, projectRoot);
|
|
34
|
-
return result;
|
|
32
|
+
return yield (0, tslib_1.__await)(yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)((0, rxjs_for_await_1.eachValueFrom)((0, compile_typescript_files_1.compileTypeScriptFiles)(normalizedOptions, context, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
33
|
+
yield updatePackageAndCopyAssets(normalizedOptions, projectRoot);
|
|
34
|
+
})).pipe((0, operators_1.map)(({ success }) => ({
|
|
35
|
+
success,
|
|
36
|
+
outfile: normalizedOptions.mainOutputPath,
|
|
37
|
+
}))))))));
|
|
35
38
|
});
|
|
36
39
|
}
|
|
37
40
|
exports.tscExecutor = tscExecutor;
|
|
38
|
-
function
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
function normalizeOptions(options, context) {
|
|
45
|
-
return Object.assign(Object.assign({}, options), { outputPath: (0, path_1.join)(context.root, options.outputPath), tsConfig: (0, path_1.join)(context.root, options.tsConfig) });
|
|
46
|
-
}
|
|
47
|
-
function updatePackageJson(options, projectRoot) {
|
|
48
|
-
var _a, _b;
|
|
49
|
-
const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(projectRoot, 'package.json'));
|
|
50
|
-
if (packageJson.main && packageJson.typings) {
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
|
|
54
|
-
const relativeMainFileDir = getMainFileDirRelativeToProjectRoot(options.main, projectRoot);
|
|
55
|
-
const mainJsFile = `${relativeMainFileDir}${mainFile}.js`;
|
|
56
|
-
const typingsFile = `${relativeMainFileDir}${mainFile}.d.ts`;
|
|
57
|
-
packageJson.main = (_a = packageJson.main) !== null && _a !== void 0 ? _a : mainJsFile;
|
|
58
|
-
packageJson.typings = (_b = packageJson.typings) !== null && _b !== void 0 ? _b : typingsFile;
|
|
59
|
-
const outputPackageJson = (0, path_1.join)(options.outputPath, 'package.json');
|
|
60
|
-
(0, devkit_1.writeJsonFile)(outputPackageJson, packageJson);
|
|
41
|
+
function updatePackageAndCopyAssets(options, projectRoot) {
|
|
42
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
43
|
+
yield (0, assets_1.copyAssetFiles)(options.files);
|
|
44
|
+
(0, update_package_json_1.updatePackageJson)(options.main, options.outputPath, projectRoot);
|
|
45
|
+
});
|
|
61
46
|
}
|
|
62
47
|
exports.default = tscExecutor;
|
|
63
48
|
//# sourceMappingURL=tsc.impl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"tsc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/tsc/tsc.impl.ts"],"names":[],"mappings":";;;;AACA,iEAI8C;AAC9C,+BAAqC;AACrC,mDAA+C;AAC/C,8CAAqC;AACrC,uEAAmE;AAMnE,8FAAyF;AACzF,yEAAoE;AAEpE,SAAgB,gBAAgB,CAC9B,OAAwB,EACxB,WAAmB,EACnB,UAAmB,EACnB,WAAoB;IAEpB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzD,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;QACzB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;KACvB;IAED,MAAM,KAAK,GAAsB,IAAA,0BAAiB,EAChD,OAAO,CAAC,MAAM,EACd,WAAW,EACX,UAAU,CACX,CAAC;IAEF,uCACK,OAAO,KACV,IAAI,EAAE,WAAW,EACjB,UAAU;QACV,WAAW;QACX,KAAK;QACL,UAAU,EACV,QAAQ,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7C,cAAc,EAAE,IAAA,cAAO,EACrB,UAAU,EACV,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAClE,IACD;AACJ,CAAC;AA/BD,4CA+BC;AAED,SAAuB,WAAW,CAChC,OAAwB,EACxB,OAAwB;;QAExB,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC7E,MAAM,iBAAiB,GAAG,gBAAgB,CACxC,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,UAAU,EACV,IAAI,CACL,CAAC;QAEF,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAA,sCAAiB,EACpD,OAAO,EACP,OAAO,CAAC,QAAQ,CACjB,CAAC;QAEF,IAAI,WAAW,EAAE;YACf,iBAAiB,CAAC,QAAQ,GAAG,WAAW,CAAC;SAC1C;QAED,kCAAO,2BAAA,KAAK,CAAC,CAAC,8BAAA,2BAAA,IAAA,8BAAa,EACzB,IAAA,iDAAsB,EAAC,iBAAiB,EAAE,OAAO,EAAE,GAAS,EAAE;YAC5D,MAAM,0BAA0B,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC,CAAA,CAAC,CAAC,IAAI,CACL,IAAA,eAAG,EACD,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACd,CAAC;YACC,OAAO;YACP,OAAO,EAAE,iBAAiB,CAAC,cAAc;SACxB,CAAA,CACtB,CACF,CACF,CAAA,CAAA,CAAA,EAAC;IACJ,CAAC;CAAA;AAlCD,kCAkCC;AAED,SAAe,0BAA0B,CACvC,OAAkC,EAClC,WAAmB;;QAEnB,MAAM,IAAA,uBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpC,IAAA,uCAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACnE,CAAC;CAAA;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
|
-
import {
|
|
3
|
-
export declare function applicationGenerator(tree: Tree, schema:
|
|
2
|
+
import { GeneratorSchema } from '../../utils/schema';
|
|
3
|
+
export declare function applicationGenerator(tree: Tree, schema: GeneratorSchema): Promise<import("@nrwl/devkit").GeneratorCallback>;
|
|
4
4
|
export default applicationGenerator;
|
|
5
|
-
export declare const applicationSchematic: (options:
|
|
5
|
+
export declare const applicationSchematic: (options: GeneratorSchema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAC5E,+BAA4B;AAC5B,qEAAiE;AAGjE,SAAsB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAC5E,+BAA4B;AAC5B,qEAAiE;AAGjE,SAAsB,oBAAoB,CACxC,IAAU,EACV,MAAuB;;QAEvB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,IAAA,oCAAgB,EACrB,IAAI,kCACC,MAAM,KAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,KAChD,OAAO,EACP,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAC1B,aAAa,CACd,CAAC;IACJ,CAAC;CAAA;AAZD,oDAYC;AAED,kBAAe,oBAAoB,CAAC;AACvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
|
2
|
+
import { ConvertToSwcGeneratorSchema } from './schema';
|
|
3
|
+
export declare function convertToSwcGenerator(tree: Tree, schema: ConvertToSwcGeneratorSchema): Promise<() => void>;
|
|
4
|
+
export default convertToSwcGenerator;
|
|
5
|
+
export declare const convertToSwcSchematic: (options: ConvertToSwcGeneratorSchema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.convertToSwcSchematic = exports.convertToSwcGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const add_swc_config_1 = require("../../utils/swc/add-swc-config");
|
|
8
|
+
const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
|
|
9
|
+
function convertToSwcGenerator(tree, schema) {
|
|
10
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
|
+
const options = normalizeOptions(schema);
|
|
12
|
+
const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
13
|
+
updateProjectBuildTargets(tree, projectConfiguration, options.project, options.targets);
|
|
14
|
+
return checkSwcDependencies(tree, projectConfiguration);
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
exports.convertToSwcGenerator = convertToSwcGenerator;
|
|
18
|
+
function normalizeOptions(schema) {
|
|
19
|
+
const options = Object.assign({}, schema);
|
|
20
|
+
if (!options.targets) {
|
|
21
|
+
options.targets = ['build'];
|
|
22
|
+
}
|
|
23
|
+
return options;
|
|
24
|
+
}
|
|
25
|
+
function updateProjectBuildTargets(tree, projectConfiguration, projectName, projectTargets) {
|
|
26
|
+
for (const target of projectTargets) {
|
|
27
|
+
const targetConfiguration = projectConfiguration.targets[target];
|
|
28
|
+
if (!targetConfiguration || targetConfiguration.executor !== '@nrwl/js:tsc')
|
|
29
|
+
continue;
|
|
30
|
+
targetConfiguration.executor = '@nrwl/js:swc';
|
|
31
|
+
}
|
|
32
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
33
|
+
}
|
|
34
|
+
function checkSwcDependencies(tree, projectConfiguration) {
|
|
35
|
+
const isSwcrcPresent = tree.exists((0, path_1.join)(projectConfiguration.root, '.swcrc'));
|
|
36
|
+
const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
37
|
+
const hasSwcDependency = packageJson.dependencies && packageJson.dependencies['@swc/core'];
|
|
38
|
+
if (isSwcrcPresent && hasSwcDependency)
|
|
39
|
+
return;
|
|
40
|
+
if (!isSwcrcPresent) {
|
|
41
|
+
(0, add_swc_config_1.addSwcConfig)(tree, projectConfiguration.root);
|
|
42
|
+
}
|
|
43
|
+
if (!hasSwcDependency) {
|
|
44
|
+
(0, add_swc_dependencies_1.addSwcDependencies)(tree);
|
|
45
|
+
}
|
|
46
|
+
return () => {
|
|
47
|
+
if (!hasSwcDependency) {
|
|
48
|
+
(0, devkit_1.installPackagesTask)(tree);
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
exports.default = convertToSwcGenerator;
|
|
53
|
+
exports.convertToSwcSchematic = (0, devkit_1.convertNxGenerator)(convertToSwcGenerator);
|
|
54
|
+
//# sourceMappingURL=convert-to-swc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"convert-to-swc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/convert-to-swc/convert-to-swc.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AACtB,+BAA4B;AAC5B,mEAA8D;AAC9D,+EAA0E;AAG1E,SAAsB,qBAAqB,CACzC,IAAU,EACV,MAAmC;;QAEnC,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7E,yBAAyB,CACvB,IAAI,EACJ,oBAAoB,EACpB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,OAAO,CAChB,CAAC;QAEF,OAAO,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAC1D,CAAC;CAAA;AAfD,sDAeC;AAED,SAAS,gBAAgB,CACvB,MAAmC;IAEnC,MAAM,OAAO,qBAAQ,MAAM,CAAE,CAAC;IAE9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;KAC7B;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,yBAAyB,CAChC,IAAU,EACV,oBAA0C,EAC1C,WAAmB,EACnB,cAAwB;IAExB,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE;QACnC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,QAAQ,KAAK,cAAc;YACzE,SAAS;QACX,mBAAmB,CAAC,QAAQ,GAAG,cAAc,CAAC;KAC/C;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAU,EACV,oBAA0C;IAE1C,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE9E,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,MAAM,gBAAgB,GACpB,WAAW,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEpE,IAAI,cAAc,IAAI,gBAAgB;QAAE,OAAO;IAE/C,IAAI,CAAC,cAAc,EAAE;QACnB,IAAA,6BAAY,EAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;KAC/C;IAED,IAAI,CAAC,gBAAgB,EAAE;QACrB,IAAA,yCAAkB,EAAC,IAAI,CAAC,CAAC;KAC1B;IAED,OAAO,GAAG,EAAE;QACV,IAAI,CAAC,gBAAgB,EAAE;YACrB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,qBAAqB,CAAC;AACxB,QAAA,qBAAqB,GAAG,IAAA,2BAAkB,EAAC,qBAAqB,CAAC,CAAC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"$id": "NxTypescriptLibrary",
|
|
4
|
+
"cli": "nx",
|
|
5
|
+
"title": "Convert a tsc library to swc",
|
|
6
|
+
"type": "object",
|
|
7
|
+
"examples": [
|
|
8
|
+
{
|
|
9
|
+
"command": "g swc mylib",
|
|
10
|
+
"description": "Convert libs/myapp/mylib to swc"
|
|
11
|
+
}
|
|
12
|
+
],
|
|
13
|
+
"properties": {
|
|
14
|
+
"project": {
|
|
15
|
+
"type": "string",
|
|
16
|
+
"description": "Library name",
|
|
17
|
+
"$default": {
|
|
18
|
+
"$source": "argv",
|
|
19
|
+
"index": 0
|
|
20
|
+
},
|
|
21
|
+
"x-prompt": "What name would you like to use for the library?",
|
|
22
|
+
"pattern": "^[a-zA-Z].*$"
|
|
23
|
+
},
|
|
24
|
+
"targets": {
|
|
25
|
+
"type": "array",
|
|
26
|
+
"description": "List of targets to convert",
|
|
27
|
+
"items": {
|
|
28
|
+
"type": "string",
|
|
29
|
+
"description": "Target to convert"
|
|
30
|
+
},
|
|
31
|
+
"default": ["build"]
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
"required": ["project"]
|
|
35
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
|
2
|
-
import {
|
|
3
|
-
export declare function libraryGenerator(tree: Tree, schema:
|
|
2
|
+
import { GeneratorSchema } from '../../utils/schema';
|
|
3
|
+
export declare function libraryGenerator(tree: Tree, schema: GeneratorSchema): Promise<import("@nrwl/devkit").GeneratorCallback>;
|
|
4
4
|
export default libraryGenerator;
|
|
5
|
-
export declare const librarySchematic: (options:
|
|
5
|
+
export declare const librarySchematic: (options: GeneratorSchema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAA4E;AAC5E,+BAA4B;AAC5B,qEAAiE;AAGjE,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAuB;;QACxE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,IAAA,oCAAgB,EACrB,IAAI,EACJ,MAAM,EACN,OAAO,EACP,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAC1B,SAAS,CACV,CAAC;IACJ,CAAC;CAAA;AATD,4CASC;AAED,kBAAe,gBAAgB,CAAC;AACnB,QAAA,gBAAgB,GAAG,IAAA,2BAAkB,EAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -97,7 +97,12 @@
|
|
|
97
97
|
"type": "string",
|
|
98
98
|
"enum": ["tsc", "swc"],
|
|
99
99
|
"default": "tsc",
|
|
100
|
-
"description": "The compiler used by the build and test targets"
|
|
100
|
+
"description": "The compiler used by the build and test targets (EXPERIMENTAL)"
|
|
101
|
+
},
|
|
102
|
+
"skipTypeCheck": {
|
|
103
|
+
"type": "boolean",
|
|
104
|
+
"description": "Whether to skip TypeScript type checking for SWC compiler.",
|
|
105
|
+
"default": false
|
|
101
106
|
}
|
|
102
107
|
},
|
|
103
108
|
"required": ["name"]
|
package/src/index.d.ts
CHANGED
package/src/index.js
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applicationGenerator = exports.libraryGenerator = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
5
|
(0, tslib_1.__exportStar)(require("./utils/typescript/print-diagnostics"), exports);
|
|
5
6
|
(0, tslib_1.__exportStar)(require("./utils/typescript/run-type-check"), exports);
|
|
7
|
+
var library_1 = require("./generators/library/library");
|
|
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; } });
|
|
6
11
|
//# 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":"
|
|
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;AACzB,oEAA4E;AAAnE,mHAAA,oBAAoB,OAAA"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.checkDependencies = void 0;
|
|
4
|
+
const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
|
|
5
|
+
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
function checkDependencies(context, tsConfigPath) {
|
|
8
|
+
const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
|
|
9
|
+
const { target, dependencies, nonBuildableDependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
|
|
10
|
+
const projectRoot = target.data.root;
|
|
11
|
+
if (nonBuildableDependencies.length > 0) {
|
|
12
|
+
throw new Error(`Buildable libraries can only depend on other buildable libraries. You must define the ${context.targetName} target for the following libraries: ${nonBuildableDependencies
|
|
13
|
+
.map((t) => `"${t}"`)
|
|
14
|
+
.join(', ')}`);
|
|
15
|
+
}
|
|
16
|
+
if (dependencies.length > 0) {
|
|
17
|
+
const areDependentProjectsBuilt = (0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies);
|
|
18
|
+
if (!areDependentProjectsBuilt) {
|
|
19
|
+
throw new Error(`Some dependencies of '${context.projectName}' have not been built. This probably due to the ${context.targetName} target being misconfigured.`);
|
|
20
|
+
}
|
|
21
|
+
return {
|
|
22
|
+
tmpTsConfig: (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, tsConfigPath), context.root, projectRoot, dependencies),
|
|
23
|
+
projectRoot,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
return {
|
|
27
|
+
tmpTsConfig: null,
|
|
28
|
+
projectRoot,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
exports.checkDependencies = checkDependencies;
|
|
32
|
+
//# sourceMappingURL=check-dependencies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/check-dependencies.ts"],"names":[],"mappings":";;;AACA,0EAAgF;AAChF,6FAI4D;AAC5D,+BAA4B;AAE5B,SAAgB,iBAAiB,CAC/B,OAAwB,EACxB,YAAoB;IAKpB,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,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,EAChC,OAAO,CAAC,IAAI,EACZ,WAAW,EACX,YAAY,CACb;YACD,WAAW;SACZ,CAAC;KACH;IAED,OAAO;QACL,WAAW,EAAE,IAAI;QACjB,WAAW;KACZ,CAAC;AACJ,CAAC;AAvDD,8CAuDC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeTsCompilationOptions = void 0;
|
|
4
|
+
function normalizeTsCompilationOptions(options) {
|
|
5
|
+
var _a, _b;
|
|
6
|
+
return Object.assign(Object.assign({}, options), { deleteOutputPath: (_a = options.deleteOutputPath) !== null && _a !== void 0 ? _a : true, rootDir: (_b = options.rootDir) !== null && _b !== void 0 ? _b : options.projectRoot });
|
|
7
|
+
}
|
|
8
|
+
exports.normalizeTsCompilationOptions = normalizeTsCompilationOptions;
|
|
9
|
+
//# sourceMappingURL=normalize-ts-compilation-options.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalize-ts-compilation-options.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/normalize-ts-compilation-options.ts"],"names":[],"mappings":";;;AAEA,SAAgB,6BAA6B,CAC3C,OAAqC;;IAErC,uCACK,OAAO,KACV,gBAAgB,EAAE,MAAA,OAAO,CAAC,gBAAgB,mCAAI,IAAI,EAClD,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO,CAAC,WAAW,IAC/C;AACJ,CAAC;AARD,sEAQC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
|
-
import {
|
|
3
|
-
export declare function projectGenerator(tree: Tree, schema:
|
|
4
|
-
export interface NormalizedSchema extends
|
|
2
|
+
import { GeneratorSchema } from './schema';
|
|
3
|
+
export declare function projectGenerator(tree: Tree, schema: GeneratorSchema, destinationDir: string, filesDir: string, projectType: 'library' | 'application'): Promise<GeneratorCallback>;
|
|
4
|
+
export interface NormalizedSchema extends GeneratorSchema {
|
|
5
5
|
name: string;
|
|
6
6
|
fileName: string;
|
|
7
7
|
projectRoot: string;
|
|
@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addLint = exports.projectGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const path_1 = require("path");
|
|
7
6
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
const add_swc_config_1 = require("./swc/add-swc-config");
|
|
9
|
+
const add_swc_dependencies_1 = require("./swc/add-swc-dependencies");
|
|
8
10
|
// nx-ignore-next-line
|
|
9
11
|
const { jestProjectGenerator } = require('@nrwl/jest');
|
|
10
12
|
// nx-ignore-next-line
|
|
@@ -42,23 +44,27 @@ function addProject(tree, options, destinationDir, projectType) {
|
|
|
42
44
|
tags: options.parsedTags,
|
|
43
45
|
};
|
|
44
46
|
if (options.buildable && options.config != 'npm-scripts') {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
projectConfiguration.targets.build = {
|
|
48
|
+
executor: `@nrwl/js:${options.compiler}`,
|
|
49
|
+
outputs: ['{options.outputPath}'],
|
|
50
|
+
options: {
|
|
51
|
+
outputPath: `dist/${destinationDir}/${options.projectDirectory}`,
|
|
52
|
+
main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
|
|
53
|
+
tsConfig: `${options.projectRoot}/${projectType === 'library' ? 'tsconfig.lib.json' : 'tsconfig.app.json'}`,
|
|
54
|
+
assets: [`${options.projectRoot}/*.md`],
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
if (options.compiler === 'swc' && options.skipTypeCheck) {
|
|
58
|
+
projectConfiguration.targets.build.options.skipTypeCheck = true;
|
|
59
|
+
}
|
|
60
|
+
if (projectType === 'application') {
|
|
61
|
+
projectConfiguration.targets.serve = {
|
|
62
|
+
executor: `@nrwl/js:node`,
|
|
49
63
|
options: {
|
|
50
|
-
|
|
51
|
-
main: `${options.projectRoot}/src/index` + (options.js ? '.js' : '.ts'),
|
|
52
|
-
tsConfig: `${options.projectRoot}/${projectType === 'library'
|
|
53
|
-
? 'tsconfig.lib.json'
|
|
54
|
-
: 'tsconfig.app.json'}`,
|
|
55
|
-
assets: [`${options.projectRoot}/*.md`],
|
|
64
|
+
buildTarget: `${options.name}:build`,
|
|
56
65
|
},
|
|
57
66
|
};
|
|
58
67
|
}
|
|
59
|
-
else {
|
|
60
|
-
throw new Error(`Compiler ${options.compiler} is not supported`);
|
|
61
|
-
}
|
|
62
68
|
}
|
|
63
69
|
if (options.config === 'workspace') {
|
|
64
70
|
(0, devkit_1.addProjectConfiguration)(tree, options.name, projectConfiguration, false);
|
|
@@ -91,7 +97,7 @@ exports.addLint = addLint;
|
|
|
91
97
|
function updateTsConfig(tree, options) {
|
|
92
98
|
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'tsconfig.json'), (json) => {
|
|
93
99
|
if (options.strict) {
|
|
94
|
-
json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
|
|
100
|
+
json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
|
|
95
101
|
}
|
|
96
102
|
return json;
|
|
97
103
|
});
|
|
@@ -101,6 +107,10 @@ function createFiles(tree, options, filesDir) {
|
|
|
101
107
|
(0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, Object.assign(Object.assign({}, options), { dot: '.', className,
|
|
102
108
|
name,
|
|
103
109
|
propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), buildable: options.buildable === true, hasUnitTestRunner: options.unitTestRunner !== 'none' }));
|
|
110
|
+
if (options.buildable && options.compiler === 'swc') {
|
|
111
|
+
(0, add_swc_dependencies_1.addSwcDependencies)(tree);
|
|
112
|
+
(0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot);
|
|
113
|
+
}
|
|
104
114
|
if (options.unitTestRunner === 'none') {
|
|
105
115
|
tree.delete((0, path_1.join)(options.projectRoot, 'src/lib', `${options.fileName}.spec.ts`));
|
|
106
116
|
tree.delete((0, path_1.join)(options.projectRoot, 'src/app', `${options.fileName}.spec.ts`));
|
|
@@ -128,10 +138,11 @@ function addJest(tree, options) {
|
|
|
128
138
|
return yield jestProjectGenerator(tree, {
|
|
129
139
|
project: options.name,
|
|
130
140
|
setupFile: 'none',
|
|
131
|
-
supportTsx:
|
|
141
|
+
supportTsx: false,
|
|
132
142
|
skipSerializers: true,
|
|
133
143
|
testEnvironment: options.testEnvironment,
|
|
134
144
|
skipFormat: true,
|
|
145
|
+
compiler: 'tsc'
|
|
135
146
|
});
|
|
136
147
|
});
|
|
137
148
|
}
|
|
@@ -141,6 +152,9 @@ function normalizeOptions(tree, options, destinationDir) {
|
|
|
141
152
|
options.linter = Linter.None;
|
|
142
153
|
options.buildable = false;
|
|
143
154
|
}
|
|
155
|
+
if (options.compiler === 'swc' && options.skipTypeCheck == null) {
|
|
156
|
+
options.skipTypeCheck = false;
|
|
157
|
+
}
|
|
144
158
|
const name = (0, devkit_1.names)(options.name).fileName;
|
|
145
159
|
const projectDirectory = options.directory
|
|
146
160
|
? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-generator.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/project-generator.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,+BAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"project-generator.js","sourceRoot":"","sources":["../../../../../packages/js/src/utils/project-generator.ts"],"names":[],"mappings":"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"}
|
package/src/utils/schema.d.ts
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
// nx-ignore-next-line
|
|
2
2
|
const { Linter } = require('@nrwl/linter');
|
|
3
|
+
import type {
|
|
4
|
+
AssetGlob,
|
|
5
|
+
FileInputOutput,
|
|
6
|
+
} from '@nrwl/workspace/src/utilities/assets';
|
|
7
|
+
import { TransformerEntry } from './typescript/types';
|
|
3
8
|
|
|
4
|
-
export
|
|
9
|
+
export type Compiler = 'tsc' | 'swc';
|
|
10
|
+
|
|
11
|
+
export interface GeneratorSchema {
|
|
5
12
|
name: string;
|
|
6
13
|
directory?: string;
|
|
7
14
|
skipFormat?: boolean;
|
|
@@ -18,5 +25,38 @@ export interface Schema {
|
|
|
18
25
|
buildable?: boolean;
|
|
19
26
|
setParserOptionsProject?: boolean;
|
|
20
27
|
config?: 'workspace' | 'project' | 'npm-scripts';
|
|
21
|
-
compiler?:
|
|
28
|
+
compiler?: Compiler;
|
|
29
|
+
skipTypeCheck?: boolean;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export interface ExecutorOptions {
|
|
33
|
+
assets: Array<AssetGlob | string>;
|
|
34
|
+
main: string;
|
|
35
|
+
outputPath: string;
|
|
36
|
+
tsConfig: string;
|
|
37
|
+
watch: boolean;
|
|
38
|
+
transformers: TransformerEntry[];
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export interface NormalizedExecutorOptions extends ExecutorOptions {
|
|
42
|
+
root?: string;
|
|
43
|
+
sourceRoot?: string;
|
|
44
|
+
projectRoot?: string;
|
|
45
|
+
mainOutputPath: string;
|
|
46
|
+
files: Array<FileInputOutput>;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export interface SwcExecutorOptions extends ExecutorOptions {
|
|
50
|
+
skipTypeCheck?: boolean;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
export interface NormalizedSwcExecutorOptions
|
|
54
|
+
extends NormalizedExecutorOptions {
|
|
55
|
+
skipTypeCheck: boolean;
|
|
56
|
+
swcrcPath: string;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export interface ExecutorEvent {
|
|
60
|
+
outfile: string;
|
|
61
|
+
success: boolean;
|
|
22
62
|
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addSwcConfig = void 0;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
const swcOptionsString = () => `{
|
|
6
|
+
"jsc": {
|
|
7
|
+
"target": "es2017",
|
|
8
|
+
"parser": {
|
|
9
|
+
"syntax": "typescript",
|
|
10
|
+
"decorators": true,
|
|
11
|
+
"dynamicImport": true
|
|
12
|
+
},
|
|
13
|
+
"transform": {
|
|
14
|
+
"decoratorMetadata": true,
|
|
15
|
+
"legacyDecorator": true
|
|
16
|
+
},
|
|
17
|
+
"keepClassNames": true,
|
|
18
|
+
"externalHelpers": true,
|
|
19
|
+
"loose": true
|
|
20
|
+
},
|
|
21
|
+
"module": {
|
|
22
|
+
"type": "commonjs",
|
|
23
|
+
"strict": true,
|
|
24
|
+
"noInterop": true
|
|
25
|
+
},
|
|
26
|
+
"exclude": ["./src/**/.*.spec.ts$", "./**/.*.js$"]
|
|
27
|
+
}`;
|
|
28
|
+
function addSwcConfig(tree, projectDir) {
|
|
29
|
+
const swcrcPath = (0, path_1.join)(projectDir, '.swcrc');
|
|
30
|
+
const isSwcConfigExist = tree.exists(swcrcPath);
|
|
31
|
+
if (isSwcConfigExist)
|
|
32
|
+
return;
|
|
33
|
+
tree.write(swcrcPath, swcOptionsString());
|
|
34
|
+
}
|
|
35
|
+
exports.addSwcConfig = addSwcConfig;
|
|
36
|
+
//# sourceMappingURL=add-swc-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-swc-config.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/add-swc-config.ts"],"names":[],"mappings":";;;AAKA,+BAA4B;AAE5B,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;EAsB7B,CAAC;AAEH,SAAgB,YAAY,CAAC,IAAU,EAAE,UAAkB;IACzD,MAAM,SAAS,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,gBAAgB;QAAE,OAAO;IAE7B,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAC5C,CAAC;AAND,oCAMC"}
|