@nx/js 16.7.0-beta.4 → 16.7.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.7.0-beta.4",
+  "version": "16.7.0-beta.5",
   "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.7.0-beta.4",
-    "@nx/devkit": "16.7.0-beta.4",
-    "@nx/workspace": "16.7.0-beta.4",
+    "@nrwl/js": "16.7.0-beta.5",
+    "@nx/devkit": "16.7.0-beta.5",
+    "@nx/workspace": "16.7.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -71,5 +71,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "dcbba686b182737b66ebbfb9db372769e77ba005"
+  "gitHead": "fa513731d4e6a960f112a5af6b0d725b2e624b36"
 }

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

@@ -36,12 +36,18 @@ 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('/') || '.';
     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: projectRoot,
-        destPath: (0, path_1.relative)(root, distParent),
+        srcPath: projectDir,
+        destPath: (0, path_1.relative)((0, path_1.join)(root, swcCwd), outputPath),
+        swcCwd,
         swcrcPath,
     };
     return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files,
@@ -64,8 +70,13 @@ 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
-            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}
+            // 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);
             // tmp swcrc with dependencies to exclude
             // - buildable libraries
             // - other libraries that are not dependent on the current project

package/src/generators/library/library.js

@@ -349,7 +349,7 @@ function normalizeOptions(tree, options) {
         if (!options.linter && options.config !== 'npm-scripts') {
             options.linter = Linter.EsLint;
         }
-        const { projectName, names: projectNames, projectDirectory, importPath, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+        const { projectName, names: projectNames, projectRoot, importPath, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
             name: options.name,
             projectType: 'library',
             directory: options.directory,
@@ -357,7 +357,7 @@ function normalizeOptions(tree, options) {
             projectNameAndRootFormat: options.projectNameAndRootFormat,
             rootProject: options.rootProject,
         });
-        options.rootProject = projectDirectory === '.';
+        options.rootProject = projectRoot === '.';
         const fileName = getCaseAwareFileName({
             fileName: options.simpleName
                 ? projectNames.projectSimpleName
@@ -368,7 +368,9 @@ function normalizeOptions(tree, options) {
             ? options.tags.split(',').map((s) => s.trim())
             : [];
         (_c = options.minimal) !== null && _c !== void 0 ? _c : (options.minimal = false);
-        return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectNames, projectRoot: projectDirectory, parsedTags,
+        return Object.assign(Object.assign({}, options), { fileName, name: projectName, projectNames,
+            projectRoot,
+            parsedTags,
             importPath });
     });
 }

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

@@ -9,8 +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) {
-    const packageManager = (0, devkit_1.getPackageManagerCommand)();
-    let swcCmd = `${packageManager.exec} swc ${
+    const swcCLI = require.resolve('@swc/cli/bin/swc.js');
+    let swcCmd = `${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}`;
@@ -39,6 +39,7 @@ function compileSwc(context, normalizedOptions, postCompilationCallback) {
         }
         const swcCmdLog = (0, child_process_1.execSync)(getSwcCmd(normalizedOptions.swcCliOptions), {
             encoding: 'utf8',
+            cwd: normalizedOptions.swcCliOptions.swcCwd,
         });
         devkit_1.logger.log(swcCmdLog.replace(/\n/, ''));
         const isCompileSuccess = swcCmdLog.includes('Successfully compiled');