@nx/js 16.6.0-beta.7 → 16.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.6.0-beta.7",
+  "version": "16.6.0",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,9 +39,9 @@
     "@babel/preset-env": "^7.22.9",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nrwl/js": "16.6.0-beta.7",
-    "@nx/devkit": "16.6.0-beta.7",
-    "@nx/workspace": "16.6.0-beta.7",
+    "@nrwl/js": "16.6.0",
+    "@nx/devkit": "16.6.0",
+    "@nx/workspace": "16.6.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -71,5 +71,5 @@
     "access": "public"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "6afe0a7c20059d6cdc8e455758a17886f933a0dc"
+  "gitHead": "d02a8dbf06c85de78c0c76f64a17f10ae8085739"
 }

package/src/executors/node/node-with-require-overrides.js

@@ -1,5 +1,5 @@
 const Module = require('module');
-const url = require('url');
+const url = require('node:url');
 const originalLoader = Module._load;
 const dynamicImport = new Function('specifier', 'return import(specifier)');
 const mappings = JSON.parse(process.env.NX_MAPPINGS);

package/src/executors/swc/swc.impl.d.ts

@@ -1,6 +1,5 @@
 import { ExecutorContext } from '@nx/devkit';
-import { NormalizedSwcExecutorOptions, SwcExecutorOptions } from '../../utils/schema';
-export declare function normalizeOptions(options: SwcExecutorOptions, contextRoot: string, sourceRoot?: string, projectRoot?: string): NormalizedSwcExecutorOptions;
+import { SwcExecutorOptions } from '../../utils/schema';
 export declare function swcExecutor(_options: SwcExecutorOptions, context: ExecutorContext): AsyncGenerator<{
     success: boolean;
     outfile?: undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swcExecutor = exports.normalizeOptions = void 0;
+exports.swcExecutor = void 0;
 const tslib_1 = require("tslib");
 const assets_1 = require("../../utils/assets/assets");
 const fs_extra_1 = require("fs-extra");
@@ -13,8 +13,8 @@ const package_json_1 = require("../../utils/package-json");
 const compile_swc_1 = require("../../utils/swc/compile-swc");
 const get_swcrc_path_1 = require("../../utils/swc/get-swcrc-path");
 const inline_2 = require("../../utils/swc/inline");
-function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
-    const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
+function normalizeOptions(options, root, sourceRoot, projectRoot) {
+    const outputPath = (0, path_1.join)(root, options.outputPath);
     if (options.skipTypeCheck == null) {
         options.skipTypeCheck = false;
     }
@@ -33,25 +33,20 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
             options.external = firstItem;
         }
     }
-    const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, 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('/') || '.';
-    const swcrcPath = (0, get_swcrc_path_1.getSwcrcPath)(options, contextRoot, projectRoot);
+    const files = (0, assets_1.assetGlobsToFiles)(options.assets, root, outputPath);
+    const swcrcPath = (0, get_swcrc_path_1.getSwcrcPath)(options, root, projectRoot);
+    // TODO(meeroslav): Check why this is needed in order for swc to properly nest folders
+    const distParent = outputPath.split('/').slice(0, -1).join('/');
     const swcCliOptions = {
-        srcPath: projectDir,
-        destPath: (0, path_1.relative)((0, path_1.join)(contextRoot, swcCwd), outputPath),
-        swcCwd,
+        srcPath: projectRoot,
+        destPath: (0, path_1.relative)(root, distParent),
         swcrcPath,
     };
-    return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
-        projectRoot, originalProjectRoot: projectRoot, outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), swcCliOptions });
+    return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files,
+        root,
+        sourceRoot,
+        projectRoot, originalProjectRoot: projectRoot, outputPath, tsConfig: (0, path_1.join)(root, options.tsConfig), swcCliOptions });
 }
-exports.normalizeOptions = normalizeOptions;
 function swcExecutor(_options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* swcExecutor_1() {
         const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
@@ -67,13 +62,8 @@ function swcExecutor(_options, context) {
         const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, options.tsConfig);
         if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
             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.swcCliOptions.swcCwd = '.';
-            options.swcCliOptions.destPath = options.swcCliOptions.destPath
-                .split('../')
-                .at(-1)
-                .concat('/', options.swcCliOptions.srcPath);
+            options.swcCliOptions.srcPath = root.split('/').slice(0, -1).join('/'); // set to root of libraries to include other libs
+            options.swcCliOptions.destPath = (0, path_1.join)(_options.outputPath, options.swcCliOptions.srcPath); // new destPath is dist/{libs}/{parentLib}/{libs}
             // tmp swcrc with dependencies to exclude
             // - buildable libraries
             // - other libraries that are not dependent on the current project

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

@@ -9,7 +9,8 @@ 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) {
-    let swcCmd = `npx swc ${
+    const packageManager = (0, devkit_1.getPackageManagerCommand)();
+    let swcCmd = `${packageManager.exec} swc ${
     // TODO(jack): clean this up when we remove inline module support
     // Handle root project
     srcPath === '.' ? 'src' : srcPath} -d ${destPath} --config-file=${swcrcPath}`;
@@ -32,14 +33,13 @@ function getTypeCheckOptions(normalizedOptions) {
 }
 function compileSwc(context, normalizedOptions, postCompilationCallback) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const isRootProject = context.projectGraph.nodes[context.projectName].data.root === '.';
         devkit_1.logger.log(`Compiling with SWC for ${context.projectName}...`);
         if (normalizedOptions.clean) {
             (0, fs_extra_1.removeSync)(normalizedOptions.outputPath);
         }
         const swcCmdLog = (0, child_process_1.execSync)(getSwcCmd(normalizedOptions.swcCliOptions), {
-            cwd: normalizedOptions.swcCliOptions.swcCwd,
-        }).toString();
+            encoding: 'utf8',
+        });
         devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
         const isCompileSuccess = swcCmdLog.includes('Successfully compiled');
         if (normalizedOptions.skipTypeCheck) {