@nx/js 18.0.4 → 18.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "18.0.4",
+  "version": "18.0.6",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -57,9 +57,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.0.4",
-    "@nx/workspace": "18.0.4",
-    "@nrwl/js": "18.0.4"
+    "@nx/devkit": "18.0.6",
+    "@nx/workspace": "18.0.6",
+    "@nrwl/js": "18.0.6"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/swc/swc.impl.js

@@ -42,7 +42,7 @@ function normalizeOptions(options, root, sourceRoot, projectRoot) {
     // default to current directory if projectRootParts is [].
     // Eg: when a project is at the root level, outside of layout dir
     const swcCwd = projectRootParts.join('/') || '.';
-    const swcrcPath = (0, get_swcrc_path_1.getSwcrcPath)(options, root, projectRoot);
+    const { swcrcPath, tmpSwcrcPath } = (0, get_swcrc_path_1.getSwcrcPath)(options, root, projectRoot);
     const swcCliOptions = {
         srcPath: projectDir,
         destPath: (0, path_1.relative)((0, path_1.join)(root, swcCwd), outputPath),
@@ -60,6 +60,7 @@ function normalizeOptions(options, root, sourceRoot, projectRoot) {
         outputPath,
         tsConfig: (0, path_1.join)(root, options.tsConfig),
         swcCliOptions,
+        tmpSwcrcPath,
     };
 }
 async function* swcExecutor(_options, context) {
@@ -79,14 +80,11 @@ async function* swcExecutor(_options, context) {
         // remap paths for SWC compilation
         options.swcCliOptions.srcPath = options.swcCliOptions.swcCwd;
         options.swcCliOptions.swcCwd = '.';
-        options.swcCliOptions.destPath = options.swcCliOptions.destPath
-            .split('../')
-            .at(-1)
-            .concat('/', options.swcCliOptions.srcPath);
+        options.swcCliOptions.destPath = (0, path_1.join)(options.swcCliOptions.destPath.split((0, path_1.normalize)('../')).at(-1), options.swcCliOptions.srcPath);
         // tmp swcrc with dependencies to exclude
         // - buildable libraries
         // - other libraries that are not dependent on the current project
-        options.swcCliOptions.swcrcPath = (0, inline_2.generateTmpSwcrc)(inlineProjectGraph, options.swcCliOptions.swcrcPath);
+        options.swcCliOptions.swcrcPath = (0, inline_2.generateTmpSwcrc)(inlineProjectGraph, options.swcCliOptions.swcrcPath, options.tmpSwcrcPath);
     }
     function determineModuleFormatFromSwcrc(absolutePathToSwcrc) {
         const swcrc = (0, devkit_1.readJsonFile)(absolutePathToSwcrc);
@@ -136,7 +134,8 @@ async function* swcExecutor(_options, context) {
 }
 exports.swcExecutor = swcExecutor;
 function removeTmpSwcrc(swcrcPath) {
-    if (swcrcPath.includes('tmp/') && swcrcPath.includes('.generated.swcrc')) {
+    if (swcrcPath.includes((0, path_1.normalize)('tmp/')) &&
+        swcrcPath.includes('.generated.swcrc')) {
         (0, fs_extra_1.removeSync)((0, path_1.dirname)(swcrcPath));
     }
 }

package/src/generators/library/library.js

@@ -25,7 +25,6 @@ async function libraryGenerator(tree, schema) {
 }
 exports.libraryGenerator = libraryGenerator;
 async function libraryGeneratorInternal(tree, schema) {
-    const filesDir = (0, path_1.join)(__dirname, './files');
     const tasks = [];
     tasks.push(await (0, init_1.default)(tree, {
         ...schema,
@@ -33,7 +32,7 @@ async function libraryGeneratorInternal(tree, schema) {
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
     }));
     const options = await normalizeOptions(tree, schema);
-    createFiles(tree, options, `${filesDir}/lib`);
+    createFiles(tree, options);
     addProject(tree, options);
     if (!options.skipPackageJson) {
         tasks.push(addProjectDependencies(tree, options));
@@ -69,7 +68,7 @@ async function libraryGeneratorInternal(tree, schema) {
         const jestCallback = await addJest(tree, options);
         tasks.push(jestCallback);
         if (options.bundler === 'swc' || options.bundler === 'rollup') {
-            replaceJestConfig(tree, options, `${filesDir}/jest-config`);
+            replaceJestConfig(tree, options);
         }
     }
     else if (options.unitTestRunner === 'vitest' &&
@@ -284,10 +283,10 @@ function addBabelRc(tree, options) {
     };
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(options.projectRoot, filename), babelrc);
 }
-function createFiles(tree, options, filesDir) {
+function createFiles(tree, options) {
     const { className, name, propertyName } = (0, devkit_1.names)(options.projectNames.projectFileName);
     createProjectTsConfigJson(tree, options);
-    (0, devkit_1.generateFiles)(tree, filesDir, options.projectRoot, {
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/lib'), options.projectRoot, {
         ...options,
         dot: '.',
         className,
@@ -301,6 +300,22 @@ function createFiles(tree, options, filesDir) {
         buildable: options.bundler && options.bundler !== 'none',
         hasUnitTestRunner: options.unitTestRunner !== 'none',
     });
+    if (!options.rootProject) {
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/readme'), options.projectRoot, {
+            ...options,
+            dot: '.',
+            className,
+            name,
+            propertyName,
+            js: !!options.js,
+            cliCommand: 'nx',
+            strict: undefined,
+            tmpl: '',
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
+            buildable: options.bundler && options.bundler !== 'none',
+            hasUnitTestRunner: options.unitTestRunner !== 'none',
+        });
+    }
     if (options.bundler === 'swc' || options.bundler === 'rollup') {
         (0, add_swc_dependencies_1.addSwcDependencies)(tree);
         (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot, options.bundler === 'swc' ? 'commonjs' : 'es6');
@@ -377,7 +392,8 @@ async function addJest(tree, options) {
                 : undefined,
     });
 }
-function replaceJestConfig(tree, options, filesDir) {
+function replaceJestConfig(tree, options) {
+    const filesDir = (0, path_1.join)(__dirname, './files/jest-config');
     // the existing config has to be deleted otherwise the new config won't overwrite it
     const existingJestConfig = (0, devkit_1.joinPathFragments)(filesDir, `jest.config.${options.js ? 'js' : 'ts'}`);
     if (tree.exists(existingJestConfig)) {

package/src/generators/release-version/utils/resolve-version-spec.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveVersionSpec = void 0;
 const npa = require("npm-package-arg");
+const devkit_1 = require("@nx/devkit");
 function resolveVersionSpec(name, version, spec, location) {
     // yarn classic uses link instead of file, normalize to match what npm expects
     spec = spec.replace(/^link:/, 'file:');
@@ -21,6 +22,8 @@ function resolveVersionSpec(name, version, spec, location) {
         }
     }
     const npaResult = npa.resolve(name, spec, location);
-    return npaResult.fetchSpec;
+    return npaResult.fetchSpec.includes('\\')
+        ? (0, devkit_1.normalizePath)(npaResult.fetchSpec)
+        : npaResult.fetchSpec;
 }
 exports.resolveVersionSpec = resolveVersionSpec;

package/src/utils/buildable-libs-utils.js

@@ -127,7 +127,7 @@ function calculateDependenciesFromTaskGraph(taskGraph, projectGraph, root, proje
         const depTask = taskGraph.tasks[taskName];
         const depProjectNode = projectGraph.nodes?.[depTask.target.project];
         if (depProjectNode?.type !== 'lib') {
-            return null;
+            continue;
         }
         let outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)(depTask.target, depTask.overrides, depProjectNode);
         if (outputs.length === 0) {

package/src/utils/schema.d.ts

@@ -83,4 +83,5 @@ export interface NormalizedSwcExecutorOptions
   swcExclude: string[];
   skipTypeCheck: boolean;
   swcCliOptions: SwcCliOptions;
+  tmpSwcrcPath: string;
 }

package/src/utils/swc/get-swcrc-path.d.ts

@@ -1,2 +1,5 @@
 import { SwcExecutorOptions } from '../schema';
-export declare function getSwcrcPath(options: SwcExecutorOptions, contextRoot: string, projectRoot: string): string;
+export declare function getSwcrcPath(options: SwcExecutorOptions, contextRoot: string, projectRoot: string): {
+    swcrcPath: string;
+    tmpSwcrcPath: string;
+};

package/src/utils/swc/get-swcrc-path.js

@@ -3,8 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSwcrcPath = void 0;
 const path_1 = require("path");
 function getSwcrcPath(options, contextRoot, projectRoot) {
-    return options.swcrc
+    const swcrcPath = options.swcrc
         ? (0, path_1.join)(contextRoot, options.swcrc)
         : (0, path_1.join)(contextRoot, projectRoot, '.swcrc');
+    const tmpSwcrcPath = (0, path_1.join)(contextRoot, projectRoot, 'tmp', '.generated.swcrc');
+    return {
+        swcrcPath,
+        tmpSwcrcPath,
+    };
 }
 exports.getSwcrcPath = getSwcrcPath;

package/src/utils/swc/inline.d.ts

@@ -1,2 +1,2 @@
 import type { InlineProjectGraph } from '../inline';
-export declare function generateTmpSwcrc(inlineProjectGraph: InlineProjectGraph, swcrcPath: string): string;
+export declare function generateTmpSwcrc(inlineProjectGraph: InlineProjectGraph, swcrcPath: string, tmpSwcrcPath: string): string;

package/src/utils/swc/inline.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTmpSwcrc = void 0;
 const devkit_1 = require("@nx/devkit");
-function generateTmpSwcrc(inlineProjectGraph, swcrcPath) {
+function generateTmpSwcrc(inlineProjectGraph, swcrcPath, tmpSwcrcPath) {
     const swcrc = (0, devkit_1.readJsonFile)(swcrcPath);
     swcrc['exclude'] = swcrc['exclude'].concat(Object.values(inlineProjectGraph.externals).map((external) => `${external.root}/**/.*.ts$`), 'node_modules/**/*.ts$');
-    const tmpSwcrcPath = `tmp${swcrcPath}`;
     (0, devkit_1.writeJsonFile)(tmpSwcrcPath, swcrc);
     return tmpSwcrcPath;
 }