@nrwl/js 14.1.6-beta.1 → 14.1.6
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/migrations.json +6 -0
- package/package.json +6 -6
- package/src/executors/swc/schema.json +2 -3
- package/src/executors/swc/swc.impl.js +4 -1
- package/src/executors/swc/swc.impl.js.map +1 -1
- package/src/generators/library/files/jest-config/jest.config.__ext__ +5 -5
- package/src/generators/library/library.js +7 -3
- package/src/generators/library/library.js.map +1 -1
- package/src/migrations/update-14.1.5-beta.0/update-swcrc-path.d.ts +3 -0
- package/src/migrations/update-14.1.5-beta.0/update-swcrc-path.js +22 -0
- package/src/migrations/update-14.1.5-beta.0/update-swcrc-path.js.map +1 -0
- package/src/utils/schema.d.ts +1 -1
- package/src/utils/swc/add-swc-dependencies.js +3 -2
- package/src/utils/swc/add-swc-dependencies.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/migrations.json
CHANGED
|
@@ -23,6 +23,12 @@
|
|
|
23
23
|
"version": "14.0.0-beta.2",
|
|
24
24
|
"description": "Exclude jest config from .lib.swcrc",
|
|
25
25
|
"factory": "./src/migrations/update-14-0-0/exclude-jest-config-swcrc"
|
|
26
|
+
},
|
|
27
|
+
"update-swcrc-path": {
|
|
28
|
+
"cli": "nx",
|
|
29
|
+
"version": "14.1.5-beta.0",
|
|
30
|
+
"description": "Rename option swcrcPath to swcrc, and resolve relative to workspace root",
|
|
31
|
+
"factory": "./src/migrations/update-14.1.5-beta.0/update-swcrc-path"
|
|
26
32
|
}
|
|
27
33
|
},
|
|
28
34
|
"packageJsonUpdates": {}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/js",
|
|
3
|
-
"version": "14.1.6
|
|
3
|
+
"version": "14.1.6",
|
|
4
4
|
"description": "The Nx plugin that provides the best experience for developing JavaScript and TypeScript projects.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,14 +31,14 @@
|
|
|
31
31
|
"executors": "./executors.json",
|
|
32
32
|
"builders": "./executors.json",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@nrwl/workspace": "14.1.6
|
|
35
|
-
"@nrwl/devkit": "14.1.6
|
|
36
|
-
"@nrwl/jest": "14.1.6
|
|
37
|
-
"@nrwl/linter": "14.1.6
|
|
34
|
+
"@nrwl/workspace": "14.1.6",
|
|
35
|
+
"@nrwl/devkit": "14.1.6",
|
|
36
|
+
"@nrwl/jest": "14.1.6",
|
|
37
|
+
"@nrwl/linter": "14.1.6",
|
|
38
38
|
"@parcel/watcher": "2.0.4",
|
|
39
39
|
"chalk": "4.1.0",
|
|
40
40
|
"fast-glob": "3.2.7",
|
|
41
|
-
"fs-extra": "^
|
|
41
|
+
"fs-extra": "^10.1.0",
|
|
42
42
|
"ignore": "^5.0.4",
|
|
43
43
|
"js-tokens": "^4.0.0",
|
|
44
44
|
"minimatch": "3.0.4",
|
|
@@ -17,10 +17,9 @@
|
|
|
17
17
|
"type": "string",
|
|
18
18
|
"description": "The path to the Typescript configuration file."
|
|
19
19
|
},
|
|
20
|
-
"
|
|
20
|
+
"swcrc": {
|
|
21
21
|
"type": "string",
|
|
22
|
-
"description": "The path to the SWC configuration file."
|
|
23
|
-
"default": ".lib.swcrc"
|
|
22
|
+
"description": "The path to the SWC configuration file. Default: .lib.swcrc"
|
|
24
23
|
},
|
|
25
24
|
"assets": {
|
|
26
25
|
"type": "array",
|
|
@@ -25,11 +25,14 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
|
|
|
25
25
|
// default to current directory if projectRootParts is [].
|
|
26
26
|
// Eg: when a project is at the root level, outside of layout dir
|
|
27
27
|
const swcCwd = projectRootParts.join('/') || '.';
|
|
28
|
+
const swcrcPath = options.swcrc
|
|
29
|
+
? (0, path_1.join)(contextRoot, options.swcrc)
|
|
30
|
+
: (0, path_1.join)(contextRoot, projectRoot, '.lib.swcrc');
|
|
28
31
|
const swcCliOptions = {
|
|
29
32
|
srcPath: projectDir,
|
|
30
33
|
destPath: (0, path_1.relative)((0, path_1.join)(contextRoot, swcCwd), outputPath),
|
|
31
34
|
swcCwd,
|
|
32
|
-
swcrcPath
|
|
35
|
+
swcrcPath,
|
|
33
36
|
};
|
|
34
37
|
return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
|
|
35
38
|
projectRoot,
|
|
@@ -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,6DAA0E;AAC1E,yEAAoE;AACpE,6FAAsF;AAEtF,SAAS,gBAAgB,CACvB,OAA2B,EAC3B,WAAmB,EACnB,UAAmB,EACnB,WAAoB;IAEpB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzD,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,EAAE;QACjC,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;KAC/B;IAED,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,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,oDAAoD;IACpD,yEAAyE;IACzE,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC;IAC1C,0DAA0D;IAC1D,iEAAiE;IACjE,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
|
|
1
|
+
/* eslint-disable */
|
|
2
|
+
<% if(js) {%>const { readFileSync } = require('fs')<% } else { %>import { readFileSync } from 'fs';<% } %>
|
|
2
3
|
|
|
3
4
|
// Reading the SWC compilation config and remove the "exclude"
|
|
4
5
|
// for the test files to be compiled by SWC
|
|
5
6
|
const { exclude: _, ...swcJestConfig } = JSON.parse(
|
|
6
|
-
|
|
7
|
+
readFileSync(`${__dirname}/.lib.swcrc`, 'utf-8')
|
|
7
8
|
);
|
|
8
|
-
|
|
9
|
-
module.exports = {
|
|
9
|
+
<% if(js) {%>module.exports =<% } else { %>export default<% } %> {
|
|
10
10
|
displayName: '<%= project %>',
|
|
11
|
-
preset: '<%= offsetFromRoot %>jest.preset
|
|
11
|
+
preset: '<%= offsetFromRoot %>jest.preset.js',
|
|
12
12
|
transform: {
|
|
13
13
|
'^.+\\.[tj]s$': ['@swc/jest', swcJestConfig],
|
|
14
14
|
},
|
|
@@ -4,7 +4,6 @@ exports.librarySchematic = exports.addLint = exports.projectGenerator = exports.
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const jest_1 = require("@nrwl/jest");
|
|
7
|
-
const find_root_jest_files_1 = require("@nrwl/jest/src/utils/config/find-root-jest-files");
|
|
8
7
|
const linter_1 = require("@nrwl/linter");
|
|
9
8
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
10
9
|
const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
|
|
@@ -181,10 +180,15 @@ function addJest(tree, options) {
|
|
|
181
180
|
});
|
|
182
181
|
}
|
|
183
182
|
function replaceJestConfig(tree, options, filesDir) {
|
|
183
|
+
// the existing config has to be deleted otherwise the new config won't overwrite it
|
|
184
|
+
const existingJestConfig = (0, devkit_1.joinPathFragments)(filesDir, `jest.config.${options.js ? 'js' : 'ts'}`);
|
|
185
|
+
if (tree.exists(existingJestConfig)) {
|
|
186
|
+
tree.delete(existingJestConfig);
|
|
187
|
+
}
|
|
184
188
|
// replace with JS:SWC specific jest config
|
|
185
189
|
(0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
|
|
186
|
-
|
|
187
|
-
|
|
190
|
+
ext: options.js ? 'js' : 'ts',
|
|
191
|
+
js: !!options.js,
|
|
188
192
|
project: options.name,
|
|
189
193
|
offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
|
|
190
194
|
projectRoot: options.projectRoot,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAgBsB;AACtB,qCAAkD;
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateSwcrcPath = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
|
|
6
|
+
function updateSwcrcPath(tree) {
|
|
7
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/js:swc', (_, projectName, targetName, configurationName) => {
|
|
8
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
9
|
+
const executorOptions = configurationName
|
|
10
|
+
? projectConfig.targets[targetName].configurations[configurationName]
|
|
11
|
+
: projectConfig.targets[targetName].options;
|
|
12
|
+
if (!executorOptions.swcrcPath)
|
|
13
|
+
return;
|
|
14
|
+
const newSwcrcPath = (0, devkit_1.joinPathFragments)(projectConfig.root, executorOptions.swcrcPath);
|
|
15
|
+
delete executorOptions.swcrcPath;
|
|
16
|
+
executorOptions.swcrc = newSwcrcPath;
|
|
17
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
exports.updateSwcrcPath = updateSwcrcPath;
|
|
21
|
+
exports.default = updateSwcrcPath;
|
|
22
|
+
//# sourceMappingURL=update-swcrc-path.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-swcrc-path.js","sourceRoot":"","sources":["../../../../../../packages/js/src/migrations/update-14.1.5-beta.0/update-swcrc-path.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,iGAA8F;AAK9F,SAAgB,eAAe,CAAC,IAAU;IACxC,IAAA,+CAAsB,EACpB,IAAI,EACJ,cAAc,EACd,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;QAChD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,eAAe,GAA0B,iBAAiB;YAC9D,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC;YACrE,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;QAE9C,IAAI,CAAC,eAAe,CAAC,SAAS;YAAE,OAAO;QAEvC,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,eAAe,CAAC,SAAS,CAC1B,CAAC;QAEF,OAAO,eAAe,CAAC,SAAS,CAAC;QACjC,eAAe,CAAC,KAAK,GAAG,YAAY,CAAC;QAErC,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IAC/D,CAAC,CACF,CAAC;AACJ,CAAC;AAvBD,0CAuBC;AAED,kBAAe,eAAe,CAAC"}
|
package/src/utils/schema.d.ts
CHANGED
|
@@ -4,9 +4,10 @@ exports.addSwcDependencies = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const versions_1 = require("../versions");
|
|
6
6
|
function addSwcDependencies(tree) {
|
|
7
|
-
(0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
8
|
-
'@swc/core': versions_1.swcCoreVersion,
|
|
7
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, {
|
|
9
8
|
'@swc/helpers': versions_1.swcHelpersVersion,
|
|
9
|
+
}, {
|
|
10
|
+
'@swc/core': versions_1.swcCoreVersion,
|
|
10
11
|
'@swc/cli': versions_1.swcCliVersion,
|
|
11
12
|
});
|
|
12
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-swc-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/add-swc-dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,0CAA+E;AAE/E,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,
|
|
1
|
+
{"version":3,"file":"add-swc-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/swc/add-swc-dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,0CAA+E;AAE/E,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,IAAA,qCAA4B,EAC1B,IAAI,EACJ;QACE,cAAc,EAAE,4BAAiB;KAClC,EACD;QACE,WAAW,EAAE,yBAAc;QAC3B,UAAU,EAAE,wBAAa;KAC1B,CACF,CAAC;AACJ,CAAC;AAXD,gDAWC"}
|
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 = '14.1.6
|
|
4
|
+
exports.nxVersion = '14.1.6';
|
|
5
5
|
exports.swcCoreVersion = '~1.2.143';
|
|
6
6
|
exports.swcCliVersion = '~0.1.55';
|
|
7
7
|
exports.swcHelpersVersion = '~0.3.3';
|