@nx/js 22.1.0 → 22.2.0-beta.0

package/package.json

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

package/src/executors/copy-workspace-modules/copy-workspace-modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copy-workspace-modules.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/copy-workspace-modules/copy-workspace-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAO5D,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,eAAe;;GASzB"}
+{"version":3,"file":"copy-workspace-modules.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/copy-workspace-modules/copy-workspace-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAa5D,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,eAAe;;GASzB"}

package/src/executors/copy-workspace-modules/copy-workspace-modules.js

@@ -22,19 +22,65 @@ function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
         return;
     }
     const workspaceModules = (0, get_workspace_packages_from_graph_1.getWorkspacePackagesFromGraph)(projectGraph);
-    for (const [pkgName] of Object.entries(packageJson.dependencies)) {
-        if (workspaceModules.has(pkgName)) {
-            devkit_1.logger.verbose(`Copying ${pkgName}.`);
-            const workspaceModuleProject = workspaceModules.get(pkgName);
-            const workspaceModuleRoot = workspaceModuleProject.data.root;
-            const newWorkspaceModulePath = (0, path_1.join)(outputDirectory, 'workspace_modules', pkgName);
-            (0, node_fs_1.mkdirSync)(newWorkspaceModulePath, { recursive: true });
-            (0, node_fs_1.cpSync)(workspaceModuleRoot, newWorkspaceModulePath, {
-                filter: (src) => !src.includes('node_modules'),
-                recursive: true,
-            });
-            devkit_1.logger.verbose(`Copied ${pkgName} successfully.`);
+    const processedModules = new Set();
+    const workspaceModulesDir = (0, path_1.join)(outputDirectory, 'workspace_modules');
+    function calculateRelativePath(fromPkgName, toPkgName) {
+        const fromPath = (0, path_1.join)(workspaceModulesDir, fromPkgName);
+        const toPath = (0, path_1.join)(workspaceModulesDir, toPkgName);
+        const relativePath = (0, path_1.relative)(fromPath, toPath);
+        // Ensure forward slashes for file: protocol (Windows compatibility)
+        return relativePath.split(path_1.sep).join('/');
+    }
+    function processModule(pkgName) {
+        if (processedModules.has(pkgName)) {
+            devkit_1.logger.verbose(`Skipping ${pkgName} (already processed).`);
+            return;
+        }
+        if (!workspaceModules.has(pkgName)) {
+            return;
+        }
+        processedModules.add(pkgName);
+        devkit_1.logger.verbose(`Copying ${pkgName}.`);
+        const workspaceModuleProject = workspaceModules.get(pkgName);
+        const workspaceModuleRoot = workspaceModuleProject.data.root;
+        const newWorkspaceModulePath = (0, path_1.join)(workspaceModulesDir, pkgName);
+        // Copy the module
+        (0, node_fs_1.mkdirSync)(newWorkspaceModulePath, { recursive: true });
+        (0, node_fs_1.cpSync)(workspaceModuleRoot, newWorkspaceModulePath, {
+            filter: (src) => !src.includes('node_modules'),
+            recursive: true,
+        });
+        devkit_1.logger.verbose(`Copied ${pkgName} successfully.`);
+        // Read the copied module's package.json to process its dependencies
+        const copiedPackageJsonPath = (0, path_1.join)(newWorkspaceModulePath, 'package.json');
+        let copiedPackageJson;
+        try {
+            copiedPackageJson = JSON.parse((0, node_fs_1.readFileSync)(copiedPackageJsonPath, 'utf-8'));
         }
+        catch (e) {
+            devkit_1.logger.warn(`Could not read package.json for ${pkgName}: ${e.message}`);
+            return;
+        }
+        // Process and update dependencies
+        if (copiedPackageJson.dependencies) {
+            let packageJsonModified = false;
+            for (const [depName, depVersion] of Object.entries(copiedPackageJson.dependencies)) {
+                if (workspaceModules.has(depName)) {
+                    const relativePath = calculateRelativePath(pkgName, depName);
+                    copiedPackageJson.dependencies[depName] = `file:${relativePath}`;
+                    packageJsonModified = true;
+                    processModule(depName);
+                }
+            }
+            if (packageJsonModified) {
+                (0, node_fs_1.writeFileSync)(copiedPackageJsonPath, JSON.stringify(copiedPackageJson, null, 2));
+                devkit_1.logger.verbose(`Updated package.json for ${pkgName} with relative workspace module paths.`);
+            }
+        }
+    }
+    // Process all top-level dependencies
+    for (const [pkgName] of Object.entries(packageJson.dependencies)) {
+        processModule(pkgName);
     }
 }
 function createWorkspaceModules(outputDirectory) {

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAUjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAyCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BA+K/B;AA2HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,GACX,yBAAyB,CAC5B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CA4G5B;AA6uBD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAUjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAyCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAgL/B;AA2HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,GACX,yBAAyB,CAC5B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CA4G5B;AA6uBD,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -81,6 +81,7 @@ async function libraryGeneratorInternal(tree, schema) {
             includeLib: true,
             includeVitest: options.unitTestRunner === 'vitest',
             testEnvironment: options.testEnvironment,
+            useEsmExtension: true,
         }, false);
     }
     if (options.linter !== 'none') {