@nx/js 18.3.0-beta.0 → 18.3.0-beta.2

package/migrations.json

@@ -167,6 +167,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "18.2.5": {
+      "version": "18.2.5-beta.0",
+      "packages": {
+        "@swc/cli": {
+          "version": "~0.3.12",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "18.3.0-beta.0",
+  "version": "18.3.0-beta.2",
   "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.3.0-beta.0",
-    "@nx/workspace": "18.3.0-beta.0",
-    "@nrwl/js": "18.3.0-beta.0"
+    "@nx/devkit": "18.3.0-beta.2",
+    "@nx/workspace": "18.3.0-beta.2",
+    "@nrwl/js": "18.3.0-beta.2"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/node/node.impl.js

@@ -13,6 +13,7 @@ const buildable_libs_utils_1 = require("../../utils/buildable-libs-utils");
 const kill_tree_1 = require("./lib/kill-tree");
 const fileutils_1 = require("nx/src/utils/fileutils");
 const get_main_file_dir_1 = require("../../utils/get-main-file-dir");
+const utils_1 = require("nx/src/tasks-runner/utils");
 function debounce(fn, wait) {
     let timeoutId;
     return () => {
@@ -36,6 +37,7 @@ async function* nodeExecutor(options, context) {
     const buildOptions = {
         ...(0, devkit_1.readTargetOptions)(buildTarget, context),
         ...options.buildTargetOptions,
+        target: buildTarget.target,
     };
     if (options.waitUntilTargets && options.waitUntilTargets.length > 0) {
         const results = await runWaitUntilTargets(options, context);
@@ -112,8 +114,14 @@ async function* nodeExecutor(options, context) {
                             if (options.watch && !task.killed) {
                                 devkit_1.logger.info(`NX Process exited with code ${code}, waiting for changes to restart...`);
                             }
-                            if (!options.watch)
-                                done();
+                            if (!options.watch) {
+                                if (code !== 0) {
+                                    error(new Error(`Process exited with code ${code}`));
+                                }
+                                else {
+                                    done();
+                                }
+                            }
                             resolve();
                         });
                         next({ success: true, options: buildOptions });
@@ -257,6 +265,18 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
     // If using run-commands or another custom executor, then user should set
     // outputFileName, but we can try the default value that we use.
     if (!buildOptions?.outputPath && !buildOptions?.outputFileName) {
+        // If we are using crystal for infering the target, we can use the output path from the target.
+        // Since the output path has a token for the project name, we need to interpolate it.
+        // {workspaceRoot}/dist/{projectRoot} -> dist/my-app
+        const outputPath = project.data.targets[buildOptions.target]?.outputs?.[0];
+        if (outputPath) {
+            const outputFilePath = (0, utils_1.interpolate)(outputPath, {
+                projectName: project.name,
+                projectRoot: project.data.root,
+                workspaceRoot: '',
+            });
+            return path.join(outputFilePath, 'main.js');
+        }
         const fallbackFile = path.join('dist', project.data.root, 'main.js');
         devkit_1.logger.warn(`Build option ${chalk.bold('outputFileName')} not set for ${chalk.bold(project.name)}. Using fallback value of ${chalk.bold(fallbackFile)}.`);
         return (0, path_1.join)(context.root, fallbackFile);

package/src/executors/swc/schema.json

@@ -97,7 +97,8 @@
             "type": "string"
           }
         }
-      ]
+      ],
+      "x-deprecated": "Make sure all dependencies are buildable by running `nx g @nx/js:setup-build`. This option will be removed in Nx 20."
     },
     "externalBuildTargets": {
       "type": "array",
@@ -114,6 +115,11 @@
       "x-priority": "internal"
     }
   },
+  "stripLeadingPaths": {
+    "type": "boolean",
+    "description": "Remove leading directory from output (e.g. src). See: https://swc.rs/docs/usage/cli#--strip-leading-paths",
+    "default": false
+  },
   "required": ["main", "outputPath", "tsConfig"],
   "definitions": {
     "assetPattern": {

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

@@ -35,19 +35,15 @@ function normalizeOptions(options, root, sourceRoot, projectRoot) {
         }
     }
     const files = (0, assets_1.assetGlobsToFiles)(options.assets, root, outputPath);
-    const projectRootParts = projectRoot.split('/');
-    // We pop the last part of the `projectRoot` to pass
-    // the last part (projectDir) and the remainder (projectRootParts) to swc
-    const projectDir = projectRootParts.pop();
-    // default to current directory if projectRootParts is [].
-    // Eg: when a project is at the root level, outside of layout dir
-    const swcCwd = projectRootParts.join('/') || '.';
+    // Always execute from root of project, same as with SWC CLI.
+    const swcCwd = (0, path_1.join)(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),
+        srcPath: projectRoot,
+        destPath: (0, path_1.relative)(swcCwd, outputPath),
         swcCwd,
         swcrcPath,
+        stripLeadingPaths: Boolean(options.stripLeadingPaths),
     };
     return {
         ...options,
@@ -76,10 +72,14 @@ async function* swcExecutor(_options, context) {
     }
     const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, options.tsConfig);
     if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
+        if (options.stripLeadingPaths) {
+            throw new Error(`Cannot use --strip-leading-paths with inlining.`);
+        }
         options.projectRoot = '.'; // set to root of workspace to include other libs for type check
         // remap paths for SWC compilation
-        options.swcCliOptions.srcPath = options.swcCliOptions.swcCwd;
+        options.inline = true;
         options.swcCliOptions.swcCwd = '.';
+        options.swcCliOptions.srcPath = options.swcCliOptions.swcCwd;
         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

package/src/executors/tsc/schema.json

@@ -85,7 +85,8 @@
             "type": "string"
           }
         }
-      ]
+      ],
+      "x-deprecated": "Make sure all dependencies are buildable by running `nx g @nx/js:setup-build`. This option will be removed in Nx 20."
     },
     "externalBuildTargets": {
       "type": "array",

package/src/generators/library/library.js

@@ -629,10 +629,10 @@ function determineEntryFields(options) {
             };
         case 'rollup':
             return {
-                type: 'commonjs',
+                // Since we're publishing both formats, skip the type field.
+                // Bundlers or Node will determine the entry point to use.
                 main: './index.cjs',
                 module: './index.js',
-                // typings is missing for rollup currently
             };
         case 'vite':
             return {
@@ -651,9 +651,9 @@ function determineEntryFields(options) {
             };
         default: {
             return {
-                // CJS is the safest optional for now due to lack of support from some packages
-                // also setting `type: module` results in different resolution behavior (e.g. import 'foo' no longer resolves to 'foo/index.js')
-                type: 'commonjs',
+                // Safest option is to not set a type field.
+                // Allow the user to decide which module format their library is using
+                type: undefined,
             };
         }
     }

package/src/generators/release-version/release-version.js

@@ -357,6 +357,10 @@ function createResolvePackageRoot(customPackageRoot) {
         if (!customPackageRoot) {
             return projectNode.data.root;
         }
+        if (projectNode.data.root === '.') {
+            // TODO This is a temporary workaround to fix NXC-574 until NXC-573 is resolved
+            return projectNode.data.root;
+        }
         return (0, utils_1.interpolate)(customPackageRoot, {
             workspaceRoot: '',
             projectRoot: projectNode.data.root,

package/src/generators/release-version/schema.json

@@ -33,7 +33,7 @@
     },
     "preid": {
       "type": "string",
-      "description": "The optional prerelease identifier to apply to the version, in the case that specifier has been set to prerelease."
+      "description": "The optional prerelease identifier to apply to the version, in the case that the specifier argument has been set to prerelease."
     },
     "packageRoot": {
       "type": "string",

package/src/utils/schema.d.ts

@@ -51,6 +51,7 @@ export interface ExecutorOptions {
   external?: 'all' | 'none' | string[];
   externalBuildTargets?: string[];
   generateLockfile?: boolean;
+  stripLeadingPaths?: boolean;
 }
 
 export interface NormalizedExecutorOptions extends ExecutorOptions {
@@ -75,6 +76,7 @@ export interface SwcCliOptions {
   destPath: string;
   swcrcPath: string;
   swcCwd: string;
+  stripLeadingPaths: boolean;
 }
 
 export interface NormalizedSwcExecutorOptions
@@ -84,4 +86,7 @@ export interface NormalizedSwcExecutorOptions
   skipTypeCheck: boolean;
   swcCliOptions: SwcCliOptions;
   tmpSwcrcPath: string;
+  sourceRoot?: string;
+  // TODO(v20): remove inline feature
+  inline?: boolean;
 }

package/src/utils/swc/compile-swc.js

@@ -2,27 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSwcWatch = exports.compileSwc = void 0;
 const devkit_1 = require("@nx/devkit");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
+const node_path_1 = require("node:path");
 const fs_extra_1 = require("fs-extra");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const print_diagnostics_1 = require("../typescript/print-diagnostics");
 const run_type_check_1 = require("../typescript/run-type-check");
-function getSwcCmd({ swcrcPath, srcPath, destPath }, watch = false) {
+const path_1 = require("path");
+function getSwcCmd({ swcCliOptions: { swcrcPath, destPath, stripLeadingPaths }, root, projectRoot, originalProjectRoot, sourceRoot, inline, }, watch = false) {
     const swcCLI = require.resolve('@swc/cli/bin/swc.js');
-    let swcCmd = `node ${swcCLI} ${
-    // TODO(jack): clean this up when we remove inline module support
-    // Handle root project
-    srcPath === '.' ? 'src' : srcPath} -d ${srcPath === '.' ? `${destPath}/src` : destPath} --config-file=${swcrcPath}`;
+    let inputDir;
+    // TODO(v20): remove inline feature
+    if (inline) {
+        inputDir = originalProjectRoot.split('/')[0];
+    }
+    else {
+        if (sourceRoot) {
+            inputDir = (0, path_1.relative)(projectRoot, sourceRoot);
+        }
+        else {
+            // If sourceRoot is not provided, check if `src` exists and use that instead.
+            // This is important for root projects to avoid compiling too many directories.
+            inputDir = (0, fs_extra_1.existsSync)((0, node_path_1.join)(root, projectRoot, 'src')) ? 'src' : '.';
+        }
+    }
+    let swcCmd = `node ${swcCLI} ${inputDir || '.'} -d ${destPath} --config-file=${swcrcPath} ${stripLeadingPaths ? '--strip-leading-paths' : ''}`;
     return watch ? swcCmd.concat(' --watch') : swcCmd;
 }
 function getTypeCheckOptions(normalizedOptions) {
-    const { projectRoot, watch, tsConfig, root, outputPath } = normalizedOptions;
+    const { sourceRoot, projectRoot, watch, tsConfig, root, outputPath } = normalizedOptions;
+    const inputDir = 
+    // If `--strip-leading-paths` SWC option is used, we need to transpile from `src` directory.
+    !normalizedOptions.swcCliOptions.stripLeadingPaths
+        ? projectRoot
+        : sourceRoot
+            ? sourceRoot
+            : (0, fs_extra_1.existsSync)((0, node_path_1.join)(root, projectRoot, 'src'))
+                ? (0, node_path_1.join)(projectRoot, 'src')
+                : projectRoot;
     const typeCheckOptions = {
         mode: 'emitDeclarationOnly',
         tsConfigPath: tsConfig,
         outDir: outputPath,
         workspaceRoot: root,
-        rootDir: projectRoot,
+        rootDir: inputDir,
     };
     if (watch) {
         typeCheckOptions.incremental = true;
@@ -35,7 +58,7 @@ async function compileSwc(context, normalizedOptions, postCompilationCallback) {
     if (normalizedOptions.clean) {
         (0, fs_extra_1.removeSync)(normalizedOptions.outputPath);
     }
-    const swcCmdLog = (0, child_process_1.execSync)(getSwcCmd(normalizedOptions.swcCliOptions), {
+    const swcCmdLog = (0, node_child_process_1.execSync)(getSwcCmd(normalizedOptions), {
         encoding: 'utf8',
         cwd: normalizedOptions.swcCliOptions.swcCwd,
     });
@@ -73,7 +96,9 @@ async function* compileSwcWatch(context, normalizedOptions, postCompilationCallb
         let stdoutOnData;
         let stderrOnData;
         let watcherOnExit;
-        const swcWatcher = (0, child_process_1.exec)(getSwcCmd(normalizedOptions.swcCliOptions, true), { cwd: normalizedOptions.swcCliOptions.swcCwd });
+        const swcWatcher = (0, node_child_process_1.exec)(getSwcCmd(normalizedOptions, true), {
+            cwd: normalizedOptions.swcCliOptions.swcCwd,
+        });
         processOnExit = () => {
             swcWatcher.kill();
             done();

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
 export declare const esbuildVersion = "^0.19.2";
 export declare const prettierVersion = "^2.6.2";
-export declare const swcCliVersion = "~0.1.62";
+export declare const swcCliVersion = "~0.3.12";
 export declare const swcCoreVersion = "~1.3.85";
 export declare const swcHelpersVersion = "~0.5.2";
 export declare const swcNodeVersion = "~1.8.0";

package/src/utils/versions.js

@@ -4,7 +4,7 @@ exports.supportedTypescriptVersions = exports.typescriptVersion = exports.verdac
 exports.nxVersion = require('../../package.json').version;
 exports.esbuildVersion = '^0.19.2';
 exports.prettierVersion = '^2.6.2';
-exports.swcCliVersion = '~0.1.62';
+exports.swcCliVersion = '~0.3.12';
 exports.swcCoreVersion = '~1.3.85';
 exports.swcHelpersVersion = '~0.5.2';
 exports.swcNodeVersion = '~1.8.0';