@nx/js 22.7.0-rc.0 → 22.7.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.7.0-rc.0",
+  "version": "22.7.0-rc.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": {
@@ -40,8 +40,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.7.0-rc.0",
-    "@nx/workspace": "22.7.0-rc.0",
+    "@nx/devkit": "22.7.0-rc.2",
+    "@nx/workspace": "22.7.0-rc.2",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -61,7 +61,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-rc.0"
+    "nx": "22.7.0-rc.2"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/node/lib/output-file.d.ts

@@ -0,0 +1,9 @@
+interface OutputFileNameOptions {
+    buildTargetExecutor: string;
+    main: string;
+    outputPath: string;
+    rootDir: string;
+}
+export declare function getOutputFileName({ buildTargetExecutor, main, outputPath, rootDir, }: OutputFileNameOptions): string;
+export {};
+//# sourceMappingURL=output-file.d.ts.map

package/src/executors/node/lib/output-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"output-file.d.ts","sourceRoot":"","sources":["../../../../../../../packages/js/src/executors/node/lib/output-file.ts"],"names":[],"mappings":"AAIA,UAAU,qBAAqB;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,iBAAiB,CAAC,EAChC,mBAAmB,EACnB,IAAI,EACJ,UAAU,EACV,OAAO,GACR,EAAE,qBAAqB,GAAG,MAAM,CAqBhC"}

package/src/executors/node/lib/output-file.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOutputFileName = getOutputFileName;
+const path_1 = require("path");
+const path_2 = require("nx/src/utils/path");
+const get_main_file_dir_1 = require("../../../utils/get-main-file-dir");
+function getOutputFileName({ buildTargetExecutor, main, outputPath, rootDir, }) {
+    const fileName = `${(0, path_1.parse)(main).name}.js`;
+    if (buildTargetExecutor !== '@nx/js:tsc' &&
+        buildTargetExecutor !== '@nx/js:swc') {
+        return fileName;
+    }
+    const mainDirectory = (0, path_2.normalizePath)((0, path_1.dirname)(main));
+    const normalizedOutputPath = (0, path_2.normalizePath)(outputPath);
+    const isMainInsideOutputPath = mainDirectory === normalizedOutputPath ||
+        mainDirectory.startsWith(`${normalizedOutputPath}/`);
+    const base = isMainInsideOutputPath ? normalizedOutputPath : rootDir;
+    return (0, path_2.joinPathFragments)((0, get_main_file_dir_1.getRelativeDirectoryToProjectRoot)(main, base), fileName);
+}

package/src/executors/node/node.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AAmJD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AA6ID,eAAe,YAAY,CAAC"}

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

@@ -15,9 +15,9 @@ const kill_tree_1 = require("./lib/kill-tree");
 const line_aware_writer_1 = require("./lib/line-aware-writer");
 const coalescing_debounce_1 = require("./lib/coalescing-debounce");
 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");
 const detect_module_format_1 = require("./lib/detect-module-format");
+const output_file_1 = require("./lib/output-file");
 const globalLineAwareWriter = new line_aware_writer_1.LineAwareWriter();
 async function* nodeExecutor(options, context) {
     process.env.NODE_ENV ??= context?.configurationName ?? 'development';
@@ -347,14 +347,12 @@ 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.getRelativeDirectoryToProjectRoot)(buildOptions.main, project.data.root), fileName);
-        }
-        else {
-            outputFileName = fileName;
-        }
+        outputFileName = (0, output_file_1.getOutputFileName)({
+            buildTargetExecutor,
+            main: buildOptions.main,
+            outputPath: buildOptions.outputPath,
+            rootDir: buildOptions.rootDir ?? project.data.root,
+        });
     }
     return (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
 }

package/src/executors/prune-lockfile/prune-lockfile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prune-lockfile.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/prune-lockfile/prune-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAErD,wBAA8B,qBAAqB,CACjD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,eAAe;;GAgCzB"}
+{"version":3,"file":"prune-lockfile.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/prune-lockfile/prune-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAErD,wBAA8B,qBAAqB,CACjD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,eAAe;;GAgCzB"}

package/src/executors/prune-lockfile/prune-lockfile.js

@@ -7,6 +7,8 @@ const path_1 = require("path");
 const utils_1 = require("nx/src/tasks-runner/utils");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+const get_workspace_packages_from_graph_1 = require("nx/src/plugins/js/utils/get-workspace-packages-from-graph");
 async function pruneLockfileExecutor(schema, context) {
     devkit_1.logger.log('Pruning lockfile...');
     const outputDirectory = getOutputDir(schema, context);
@@ -31,10 +33,12 @@ function createPrunedLockfile(packageJson, graph) {
     const packageManager = (0, devkit_1.detectPackageManager)(devkit_1.workspaceRoot);
     const lockfileName = (0, lock_file_1.getLockFileName)(packageManager);
     const lockFile = (0, lock_file_1.createLockFile)(packageJson, graph, packageManager);
+    const workspacePackages = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(graph);
     for (const [pkgName, pkgVersion] of Object.entries(packageJson.dependencies ?? {})) {
         if (pkgVersion.startsWith('workspace:') ||
             pkgVersion.startsWith('file:') ||
-            pkgVersion.startsWith('link:')) {
+            pkgVersion.startsWith('link:') ||
+            workspacePackages.has(pkgName)) {
             packageJson.dependencies[pkgName] = `file:./workspace_modules/${pkgName}`;
         }
     }

package/src/generators/typescript-sync/typescript-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript-sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/typescript-sync/typescript-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,8BAA8B,CAAC;AA2CtC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAyQ5E;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"typescript-sync.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/typescript-sync/typescript-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,8BAA8B,CAAC;AA4CtC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAyQ5E;AAED,eAAe,aAAa,CAAC"}

package/src/generators/typescript-sync/typescript-sync.js

@@ -199,6 +199,7 @@ function updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, tsCon
     const stringifiedJsonContents = readRawTsconfigContents(tree, tsconfigInfoCaches, tsConfigPath);
     const tsConfig = (0, devkit_1.parseJson)(stringifiedJsonContents);
     const ignoredReferences = new Set(tsConfig.nx?.sync?.ignoredReferences ?? []);
+    const ignoredDependencies = new Set(tsConfig.nx?.sync?.ignoredDependencies ?? []);
     // We have at least one dependency so we can safely set it to an empty array if not already set
     const references = [];
     const originalReferencesSet = new Set();
@@ -236,6 +237,12 @@ function updateTsConfigReferences(tree, tsSysFromTree, tsconfigInfoCaches, tsCon
         }
     }
     for (const dep of dependencies) {
+        if (ignoredDependencies.has(dep.name)) {
+            // The user has explicitly opted out of this dependency edge, typically
+            // to break a circular project reference graph that the project graph
+            // intentionally allows.
+            continue;
+        }
         // Ensure the project reference for the target is set if we can find the
         // relevant tsconfig file
         let referencePath;