@nx/js 16.5.0-beta.2 → 16.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "16.5.0-beta.2",
+  "version": "16.5.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.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7.14.8",
-    "@nrwl/js": "16.5.0-beta.2",
-    "@nx/devkit": "16.5.0-beta.2",
-    "@nx/workspace": "16.5.0-beta.2",
+    "@nrwl/js": "16.5.0",
+    "@nx/devkit": "16.5.0",
+    "@nx/workspace": "16.5.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",
@@ -69,5 +69,5 @@
     "access": "public"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "efdf140459e453c50f06cf287906c4bb3ac49d3d"
+  "gitHead": "eaebcc34f92db2200dab0bde2e2e1dde107a47bf"
 }

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

@@ -5,14 +5,15 @@ const tslib_1 = require("tslib");
 const chalk = require("chalk");
 const child_process_1 = require("child_process");
 const devkit_1 = require("@nx/devkit");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const client_1 = require("nx/src/daemon/client/client");
 const crypto_1 = require("crypto");
 const path = require("path");
 const path_1 = require("path");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 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");
 function debounce(fn, wait) {
     let timeoutId;
     return () => {
@@ -27,13 +28,11 @@ function nodeExecutor(options, context) {
         (_a = (_d = process.env).NODE_ENV) !== null && _a !== void 0 ? _a : (_d.NODE_ENV = (_b = context === null || context === void 0 ? void 0 : context.configurationName) !== null && _b !== void 0 ? _b : 'development');
         const project = context.projectGraph.nodes[context.projectName];
         const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph);
-        let buildOptions;
-        if (project.data.targets[buildTarget.target]) {
-            buildOptions = Object.assign(Object.assign({}, (_c = project.data.targets[buildTarget.target]) === null || _c === void 0 ? void 0 : _c.options), options.buildTargetOptions);
-        }
-        else {
+        if (!project.data.targets[buildTarget.target]) {
             throw new Error(`Cannot find build target ${chalk.bold(options.buildTarget)} for project ${chalk.bold(context.projectName)}`);
         }
+        const buildTargetExecutor = (_c = project.data.targets[buildTarget.target]) === null || _c === void 0 ? void 0 : _c.executor;
+        const buildOptions = Object.assign(Object.assign({}, (0, devkit_1.readTargetOptions)(buildTarget, context)), options.buildTargetOptions);
         if (options.waitUntilTargets && options.waitUntilTargets.length > 0) {
             const results = yield tslib_1.__await(runWaitUntilTargets(options, context));
             for (const [i, result] of results.entries()) {
@@ -44,15 +43,7 @@ function nodeExecutor(options, context) {
         }
         // Re-map buildable workspace projects to their output directory.
         const mappings = calculateResolveMappings(context, options);
-        let outputFileName = buildOptions.outputFileName || `${path.parse(buildOptions.main).name}.js`;
-        if (!buildOptions.outputFileName) {
-            const matches = buildOptions.main.match(/^(?!.*src)(.*)\/([^/]*)$/); //ignore strings that contain src and split paths into [folders before main, main.ts]
-            if (matches) {
-                const [mainFolder, mainFileName] = matches.slice(1);
-                outputFileName = path.join(mainFolder, `${path.parse(mainFileName).name}.js`);
-            }
-        }
-        const fileToRun = (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
+        const fileToRun = getFileToRun(context, project, buildOptions, buildTargetExecutor);
         const tasks = [];
         let currentTask = null;
         yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.createAsyncIterable)(({ done, next, error }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -229,6 +220,20 @@ function runWaitUntilTargets(options, context) {
         }));
     })));
 }
+function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
+    let outputFileName = buildOptions.outputFileName;
+    if (!outputFileName) {
+        const fileName = `${path.parse(buildOptions.main).name}.js`;
+        if (buildTargetExecutor === '@nx/js:tsc' ||
+            buildTargetExecutor === '@nx/js:swc') {
+            outputFileName = path.join((0, get_main_file_dir_1.getMainFileDirRelativeToProjectRoot)(buildOptions.main, project.data.root), fileName);
+        }
+        else {
+            outputFileName = fileName;
+        }
+    }
+    return (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
+}
 function fileToRunCorrectPath(fileToRun) {
     if (!(0, fileutils_1.fileExists)(fileToRun)) {
         const cjsFile = fileToRun.replace(/\.js$/, '.cjs');

package/src/utils/get-main-file-dir.d.ts

@@ -0,0 +1 @@
+export declare function getMainFileDirRelativeToProjectRoot(main: string, projectRoot: string): string;

package/src/utils/get-main-file-dir.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMainFileDirRelativeToProjectRoot = void 0;
+const path_1 = require("path");
+const path_2 = require("nx/src/utils/path");
+function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
+    const mainFileDir = (0, path_1.dirname)(main);
+    const relativeDir = (0, path_2.normalizePath)((0, path_1.relative)(projectRoot, mainFileDir));
+    return relativeDir === '' ? `./` : `./${relativeDir}/`;
+}
+exports.getMainFileDirRelativeToProjectRoot = getMainFileDirRelativeToProjectRoot;

package/src/utils/package-json/update-package-json.js

@@ -12,11 +12,7 @@ const operators_1 = require("nx/src/project-graph/operators");
 const fileutils_1 = require("nx/src/utils/fileutils");
 const fs_1 = require("fs");
 const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
-function getMainFileDirRelativeToProjectRoot(main, projectRoot) {
-    const mainFileDir = (0, path_1.dirname)(main);
-    const relativeDir = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, mainFileDir));
-    return relativeDir === '' ? `./` : `./${relativeDir}/`;
-}
+const get_main_file_dir_1 = require("../get-main-file-dir");
 function updatePackageJson(options, context, target, dependencies, fileMap = null) {
     var _a;
     let packageJson;
@@ -99,7 +95,7 @@ function getUpdatedPackageJsonContent(packageJson, options) {
     const hasCjsFormat = !options.format || ((_a = options.format) === null || _a === void 0 ? void 0 : _a.includes('cjs'));
     const hasEsmFormat = (_b = options.format) === null || _b === void 0 ? void 0 : _b.includes('esm');
     const mainFile = (0, path_1.basename)(options.main).replace(/\.[tj]s$/, '');
-    const relativeMainFileDir = getMainFileDirRelativeToProjectRoot(options.main, options.projectRoot);
+    const relativeMainFileDir = (0, get_main_file_dir_1.getMainFileDirRelativeToProjectRoot)(options.main, options.projectRoot);
     const typingsFile = `${relativeMainFileDir}${mainFile}.d.ts`;
     const exports = typeof packageJson.exports === 'string'
         ? packageJson.exports