@nrwl/js 13.8.4 → 13.8.7
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/LICENSE +22 -0
- package/migrations.json +8 -2
- package/package.json +5 -5
- package/src/executors/swc/swc.impl.js +1 -3
- package/src/executors/swc/swc.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/library/files/{package.json__tmpl__ → lib/package.json__tmpl__} +0 -0
- package/src/generators/library/files/{src → lib/src}/index.ts__tmpl__ +0 -0
- package/src/generators/library/files/{src → lib/src}/lib/__fileName__.spec.ts__tmpl__ +0 -0
- package/src/generators/library/files/{src → lib/src}/lib/__fileName__.ts__tmpl__ +0 -0
- package/src/generators/library/files/{tsconfig.json__tmpl__ → lib/tsconfig.json__tmpl__} +1 -1
- package/src/generators/library/files/{tsconfig.lib.json__tmpl__ → lib/tsconfig.lib.json__tmpl__} +0 -0
- package/src/generators/library/library.d.ts +5 -5
- package/src/generators/library/library.js +28 -7
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +5 -0
- package/src/migrations/{update-13-9-0 → update-13-8-5}/update-node-executor.d.ts +0 -0
- package/src/migrations/{update-13-9-0 → update-13-8-5}/update-node-executor.js +0 -0
- package/src/migrations/{update-13-9-0 → update-13-8-5}/update-node-executor.js.map +1 -1
- 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/schema.d.ts +5 -1
- 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 +1 -1
- package/src/utils/swc/compile-swc.js.map +1 -1
- package/src/utils/typescript/compile-typescript-files.js +3 -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/versions.js +1 -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/LICENSE
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
(The MIT License)
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2017-2022 Narwhal Technologies Inc.
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
|
6
|
+
a copy of this software and associated documentation files (the
|
|
7
|
+
'Software'), to deal in the Software without restriction, including
|
|
8
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
|
9
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
|
10
|
+
permit persons to whom the Software is furnished to do so, subject to
|
|
11
|
+
the following conditions:
|
|
12
|
+
|
|
13
|
+
The above copyright notice and this permission notice shall be
|
|
14
|
+
included in all copies or substantial portions of the Software.
|
|
15
|
+
|
|
16
|
+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
17
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
18
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
19
|
+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
20
|
+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
21
|
+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
22
|
+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
package/migrations.json
CHANGED
|
@@ -2,9 +2,15 @@
|
|
|
2
2
|
"generators": {
|
|
3
3
|
"update-node-executor": {
|
|
4
4
|
"cli": "nx",
|
|
5
|
-
"version": "13.
|
|
5
|
+
"version": "13.8.5-beta.1",
|
|
6
6
|
"description": "Renames @nrwl/js:node to @nrwl/node:node",
|
|
7
|
-
"factory": "./src/migrations/update-13-
|
|
7
|
+
"factory": "./src/migrations/update-13-8-5/update-node-executor"
|
|
8
|
+
},
|
|
9
|
+
"update-swcrc": {
|
|
10
|
+
"cli": "nx",
|
|
11
|
+
"version": "13.8.5-beta.1",
|
|
12
|
+
"description": "Adjust .swcrc to .lib.swcrc",
|
|
13
|
+
"factory": "./src/migrations/update-13-8-5/update-swcrc"
|
|
8
14
|
}
|
|
9
15
|
},
|
|
10
16
|
"packageJsonUpdates": {}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/js",
|
|
3
|
-
"version": "13.8.
|
|
3
|
+
"version": "13.8.7",
|
|
4
4
|
"description": "JavaScript Plugin for Nx",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"executors": "./executors.json",
|
|
32
32
|
"builders": "./executors.json",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/workspace": "13.8.
|
|
35
|
-
"@nrwl/devkit": "13.8.
|
|
36
|
-
"@nrwl/jest": "13.8.
|
|
37
|
-
"@nrwl/linter": "13.8.
|
|
34
|
+
"@nrwl/workspace": "13.8.7",
|
|
35
|
+
"@nrwl/devkit": "13.8.7",
|
|
36
|
+
"@nrwl/jest": "13.8.7",
|
|
37
|
+
"@nrwl/linter": "13.8.7",
|
|
38
38
|
"@parcel/watcher": "2.0.4",
|
|
39
39
|
"chalk": "4.1.0",
|
|
40
40
|
"fast-glob": "^3.2.7",
|
|
@@ -6,7 +6,6 @@ const assets_1 = require("@nrwl/workspace/src/utilities/assets");
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const check_dependencies_1 = require("../../utils/check-dependencies");
|
|
8
8
|
const copy_assets_handler_1 = require("../../utils/copy-assets-handler");
|
|
9
|
-
const add_temp_swcrc_1 = require("../../utils/swc/add-temp-swcrc");
|
|
10
9
|
const compile_swc_1 = require("../../utils/swc/compile-swc");
|
|
11
10
|
const update_package_json_1 = require("../../utils/update-package-json");
|
|
12
11
|
const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-file-changes");
|
|
@@ -28,7 +27,7 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
|
28
27
|
srcPath: projectDir,
|
|
29
28
|
destPath: (0, path_1.relative)((0, path_1.join)(contextRoot, swcCwd), outputPath),
|
|
30
29
|
swcCwd,
|
|
31
|
-
swcrcPath: (0, path_1.join)(projectRoot, '.swcrc'),
|
|
30
|
+
swcrcPath: (0, path_1.join)(contextRoot, projectRoot, '.lib.swcrc'),
|
|
32
31
|
};
|
|
33
32
|
return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
|
|
34
33
|
projectRoot,
|
|
@@ -44,7 +43,6 @@ function swcExecutor(_options, context) {
|
|
|
44
43
|
return (0, tslib_1.__asyncGenerator)(this, arguments, function* swcExecutor_1() {
|
|
45
44
|
const { sourceRoot, root } = context.workspace.projects[context.projectName];
|
|
46
45
|
const options = normalizeOptions(_options, context.root, sourceRoot, root);
|
|
47
|
-
options.swcCliOptions.swcrcPath = (0, add_temp_swcrc_1.addTempSwcrc)(options);
|
|
48
46
|
const { tmpTsConfig, projectRoot, target, dependencies } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
|
|
49
47
|
if (tmpTsConfig) {
|
|
50
48
|
options.tsConfig = tmpTsConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":";;;;AACA,iEAG8C;AAE9C,+BAA+C;AAE/C,uEAAmE;AACnE,yEAAoE;AAKpE,
|
|
1
|
+
{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ function updateProjectBuildTargets(tree, projectConfiguration, projectName, proj
|
|
|
32
32
|
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
33
33
|
}
|
|
34
34
|
function checkSwcDependencies(tree, projectConfiguration) {
|
|
35
|
-
const isSwcrcPresent = tree.exists((0, path_1.join)(projectConfiguration.root, '.swcrc'));
|
|
35
|
+
const isSwcrcPresent = tree.exists((0, path_1.join)(projectConfiguration.root, '.lib.swcrc'));
|
|
36
36
|
const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
|
|
37
37
|
const hasSwcDependency = packageJson.dependencies && packageJson.dependencies['@swc/core'];
|
|
38
38
|
if (isSwcrcPresent && hasSwcDependency)
|
|
@@ -1 +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,
|
|
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,CAChC,IAAA,WAAI,EAAC,oBAAoB,CAAC,IAAI,EAAE,YAAY,CAAC,CAC9C,CAAC;IAEF,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,17 @@
|
|
|
1
|
+
const fs = require('fs');
|
|
2
|
+
|
|
3
|
+
// Reading the SWC compilation config and remove the "exclude"
|
|
4
|
+
// for the test files to be compiled by SWC
|
|
5
|
+
const { exclude: _, ...swcJestConfig } = JSON.parse(
|
|
6
|
+
fs.readFileSync(`${__dirname}/.lib.swcrc`, 'utf-8')
|
|
7
|
+
);
|
|
8
|
+
|
|
9
|
+
module.exports = {
|
|
10
|
+
displayName: '<%= project %>',
|
|
11
|
+
preset: '<%= offsetFromRoot %>jest.preset.js',
|
|
12
|
+
transform: {
|
|
13
|
+
'^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
|
|
14
|
+
},
|
|
15
|
+
moduleFileExtensions: ['ts', 'js', 'html'],
|
|
16
|
+
coverageDirectory: '<%= offsetFromRoot %>coverage/<%= projectRoot %>'
|
|
17
|
+
};
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
package/src/generators/library/files/{tsconfig.lib.json__tmpl__ → lib/tsconfig.lib.json__tmpl__}
RENAMED
|
File without changes
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
|
-
import {
|
|
3
|
-
export declare function libraryGenerator(tree: Tree, schema:
|
|
4
|
-
export declare function projectGenerator(tree: Tree, schema:
|
|
5
|
-
export interface NormalizedSchema extends
|
|
2
|
+
import { LibraryGeneratorSchema } from '../../utils/schema';
|
|
3
|
+
export declare function libraryGenerator(tree: Tree, schema: LibraryGeneratorSchema): Promise<GeneratorCallback>;
|
|
4
|
+
export declare function projectGenerator(tree: Tree, schema: LibraryGeneratorSchema, destinationDir: string, filesDir: string): Promise<GeneratorCallback>;
|
|
5
|
+
export interface NormalizedSchema extends LibraryGeneratorSchema {
|
|
6
6
|
name: string;
|
|
7
7
|
fileName: string;
|
|
8
8
|
projectRoot: string;
|
|
@@ -12,4 +12,4 @@ export interface NormalizedSchema extends GeneratorSchema {
|
|
|
12
12
|
}
|
|
13
13
|
export declare function addLint(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
|
|
14
14
|
export default libraryGenerator;
|
|
15
|
-
export declare const librarySchematic: (options:
|
|
15
|
+
export declare const librarySchematic: (options: LibraryGeneratorSchema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.librarySchematic = exports.addLint = exports.projectGenerator = exports.libraryGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const path_1 = require("path");
|
|
7
|
-
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
8
|
-
const linter_1 = require("@nrwl/linter");
|
|
9
6
|
const jest_1 = require("@nrwl/jest");
|
|
10
|
-
const
|
|
7
|
+
const linter_1 = require("@nrwl/linter");
|
|
8
|
+
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
9
|
+
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
10
|
+
const path_1 = require("path");
|
|
11
11
|
const add_swc_config_1 = require("../../utils/swc/add-swc-config");
|
|
12
|
+
const add_swc_dependencies_1 = require("../../utils/swc/add-swc-dependencies");
|
|
12
13
|
function libraryGenerator(tree, schema) {
|
|
13
14
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
14
15
|
const { libsDir } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
@@ -19,7 +20,7 @@ exports.libraryGenerator = libraryGenerator;
|
|
|
19
20
|
function projectGenerator(tree, schema, destinationDir, filesDir) {
|
|
20
21
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
21
22
|
const options = normalizeOptions(tree, schema, destinationDir);
|
|
22
|
-
createFiles(tree, options, filesDir);
|
|
23
|
+
createFiles(tree, options, `${filesDir}/lib`);
|
|
23
24
|
addProject(tree, options, destinationDir);
|
|
24
25
|
if (!schema.skipTsConfig) {
|
|
25
26
|
updateRootTsConfig(tree, options);
|
|
@@ -32,6 +33,9 @@ function projectGenerator(tree, schema, destinationDir, filesDir) {
|
|
|
32
33
|
if (options.unitTestRunner === 'jest') {
|
|
33
34
|
const jestCallback = yield addJest(tree, options);
|
|
34
35
|
tasks.push(jestCallback);
|
|
36
|
+
if (options.compiler === 'swc') {
|
|
37
|
+
replaceJestConfig(tree, options, `${filesDir}/jest-config`);
|
|
38
|
+
}
|
|
35
39
|
}
|
|
36
40
|
if (!options.skipFormat) {
|
|
37
41
|
yield (0, devkit_1.formatFiles)(tree);
|
|
@@ -103,7 +107,7 @@ function createFiles(tree, options, filesDir) {
|
|
|
103
107
|
const { className, name, propertyName } = (0, devkit_1.names)(options.name);
|
|
104
108
|
(0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, Object.assign(Object.assign({}, options), { dot: '.', className,
|
|
105
109
|
name,
|
|
106
|
-
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
|
+
propertyName, js: !!options.js, cliCommand: 'nx', strict: undefined, tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(tree, options.projectRoot), buildable: options.buildable === true, hasUnitTestRunner: options.unitTestRunner !== 'none' }));
|
|
107
111
|
if (options.buildable && options.compiler === 'swc') {
|
|
108
112
|
(0, add_swc_dependencies_1.addSwcDependencies)(tree);
|
|
109
113
|
(0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot);
|
|
@@ -143,8 +147,25 @@ function addJest(tree, options) {
|
|
|
143
147
|
});
|
|
144
148
|
});
|
|
145
149
|
}
|
|
150
|
+
function replaceJestConfig(tree, options, filesDir) {
|
|
151
|
+
// remove the generated jest config by Jest generator
|
|
152
|
+
tree.delete((0, path_1.join)(options.projectRoot, 'jest.config.js'));
|
|
153
|
+
// replace with JS:SWC specific jest config
|
|
154
|
+
(0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
|
|
155
|
+
tmpl: '',
|
|
156
|
+
project: options.name,
|
|
157
|
+
offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
|
|
158
|
+
projectRoot: options.projectRoot,
|
|
159
|
+
});
|
|
160
|
+
}
|
|
146
161
|
function normalizeOptions(tree, options, destinationDir) {
|
|
147
162
|
var _a;
|
|
163
|
+
if (options.publishable) {
|
|
164
|
+
if (!options.importPath) {
|
|
165
|
+
throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
|
|
166
|
+
}
|
|
167
|
+
options.buildable = true;
|
|
168
|
+
}
|
|
148
169
|
if (options.config === 'npm-scripts') {
|
|
149
170
|
options.unitTestRunner = 'none';
|
|
150
171
|
options.linter = linter_1.Linter.None;
|
|
@@ -186,7 +207,7 @@ function getCaseAwareFileName(options) {
|
|
|
186
207
|
return options.pascalCaseFiles ? normalized.className : normalized.fileName;
|
|
187
208
|
}
|
|
188
209
|
function updateRootTsConfig(host, options) {
|
|
189
|
-
(0, devkit_1.updateJson)(host,
|
|
210
|
+
(0, devkit_1.updateJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host), (json) => {
|
|
190
211
|
const c = json.compilerOptions;
|
|
191
212
|
c.paths = c.paths || {};
|
|
192
213
|
delete c.paths[options.name];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAcsB;AACtB
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,6 +77,11 @@
|
|
|
77
77
|
"description": "Whether to enable tsconfig strict mode or not.",
|
|
78
78
|
"default": true
|
|
79
79
|
},
|
|
80
|
+
"publishable": {
|
|
81
|
+
"type": "boolean",
|
|
82
|
+
"default": false,
|
|
83
|
+
"description": "Generate a publishable library."
|
|
84
|
+
},
|
|
80
85
|
"buildable": {
|
|
81
86
|
"type": "boolean",
|
|
82
87
|
"default": true,
|
|
File without changes
|
|
File without changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-node-executor.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-13-
|
|
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"}
|
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';
|
|
@@ -50,6 +51,9 @@ export interface NormalizedExecutorOptions extends ExecutorOptions {
|
|
|
50
51
|
|
|
51
52
|
export interface SwcExecutorOptions extends ExecutorOptions {
|
|
52
53
|
skipTypeCheck?: boolean;
|
|
54
|
+
/**
|
|
55
|
+
* @deprecated
|
|
56
|
+
*/
|
|
53
57
|
swcExclude?: string[];
|
|
54
58
|
}
|
|
55
59
|
|
|
@@ -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"}
|
|
@@ -9,7 +9,7 @@ const create_async_iteratable_1 = require("../create-async-iterable/create-async
|
|
|
9
9
|
const print_diagnostics_1 = require("../typescript/print-diagnostics");
|
|
10
10
|
const run_type_check_1 = require("../typescript/run-type-check");
|
|
11
11
|
function getSwcCmd({ swcrcPath, srcPath, destPath }, watch = false) {
|
|
12
|
-
let swcCmd = `npx swc ${srcPath} -d ${destPath} --
|
|
12
|
+
let swcCmd = `npx swc ${srcPath} -d ${destPath} --no-swcrc --config-file=${swcrcPath}`;
|
|
13
13
|
return watch ? swcCmd.concat(' --watch') : swcCmd;
|
|
14
14
|
}
|
|
15
15
|
function getTypeCheckOptions(normalizedOptions) {
|
|
@@ -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,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAiB,EAC/C,KAAK,GAAG,KAAK;IAEb,IAAI,MAAM,GAAG,WAAW,OAAO,OAAO,QAAQ,
|
|
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)),
|
|
@@ -29,6 +29,7 @@ function compileTypeScriptFiles(normalizedOptions, context, postCompilationCallb
|
|
|
29
29
|
if (normalizedOptions.watch) {
|
|
30
30
|
(0, compilation_1.compileTypeScriptWatcher)(tscOptions, (d) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
31
31
|
if (d.code === 6194) {
|
|
32
|
+
yield postCompilationCallback();
|
|
32
33
|
next(getResult(true));
|
|
33
34
|
}
|
|
34
35
|
}));
|
|
@@ -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,MAAM,uBAAuB,EAAE,CAAC;wBAChC,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;AApDD,wDAoDC"}
|
|
@@ -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"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
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.
|
|
4
|
+
exports.nxVersion = '13.8.7';
|
|
5
5
|
exports.swcCoreVersion = '~1.2.143';
|
|
6
6
|
exports.swcCliVersion = '~0.1.55';
|
|
7
7
|
exports.swcHelpersVersion = '~0.3.3';
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addTempSwcrc = void 0;
|
|
4
|
-
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const fs_1 = require("fs");
|
|
6
|
-
const path_1 = require("path");
|
|
7
|
-
// TODO(chau): "exclude" is required here to exclude spec files as --ignore cli option is not working atm
|
|
8
|
-
// Open issue: https://github.com/swc-project/cli/issues/20
|
|
9
|
-
function addTempSwcrc(options) {
|
|
10
|
-
const tmpPath = (0, path_1.join)(options.root, 'tmp', options.projectRoot, '.swcrc.generated');
|
|
11
|
-
const swcrcJson = (0, devkit_1.readJsonFile)((0, path_1.join)(options.projectRoot, '.swcrc'));
|
|
12
|
-
process.on('exit', cleanUpSwcrc(tmpPath));
|
|
13
|
-
(0, devkit_1.writeJsonFile)(tmpPath, Object.assign(Object.assign({}, swcrcJson), { exclude: options.swcExclude }));
|
|
14
|
-
return tmpPath;
|
|
15
|
-
}
|
|
16
|
-
exports.addTempSwcrc = addTempSwcrc;
|
|
17
|
-
function cleanUpSwcrc(tmpPath) {
|
|
18
|
-
return () => {
|
|
19
|
-
try {
|
|
20
|
-
if (tmpPath) {
|
|
21
|
-
(0, fs_1.unlinkSync)(tmpPath);
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
catch (e) { }
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
//# sourceMappingURL=add-temp-swcrc.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"add-temp-swcrc.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/add-temp-swcrc.ts"],"names":[],"mappings":";;;AAAA,yCAA2D;AAC3D,2BAAgC;AAChC,+BAA4B;AAG5B,yGAAyG;AACzG,2DAA2D;AAC3D,SAAgB,YAAY,CAAC,OAAqC;IAChE,MAAM,OAAO,GAAG,IAAA,WAAI,EAClB,OAAO,CAAC,IAAI,EACZ,KAAK,EACL,OAAO,CAAC,WAAW,EACnB,kBAAkB,CACnB,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEpE,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IAE1C,IAAA,sBAAa,EAAC,OAAO,kCAChB,SAAS,KACZ,OAAO,EAAE,OAAO,CAAC,UAAU,IAC3B,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC;AAjBD,oCAiBC;AAED,SAAS,YAAY,CAAC,OAAe;IACnC,OAAO,GAAG,EAAE;QACV,IAAI;YACF,IAAI,OAAO,EAAE;gBACX,IAAA,eAAU,EAAC,OAAO,CAAC,CAAC;aACrB;SACF;QAAC,OAAO,CAAC,EAAE,GAAE;IAChB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"load-ts-plugins.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/typescript/load-ts-plugins.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,+BAA4B;AAQ5B,SAAgB,aAAa,CAC3B,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,sCA4EC"}
|