@nx/workspace 22.7.0-beta.12 → 22.7.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "22.7.0-beta.12",
+  "version": "22.7.0-beta.13",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -39,7 +39,7 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.12",
+    "@nx/devkit": "22.7.0-beta.13",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
@@ -47,10 +47,10 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "22.7.0-beta.12"
+    "nx": "22.7.0-beta.13"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.12"
+    "nx": "22.7.0-beta.13"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__

@@ -48,7 +48,7 @@ jobs:
       - run: <%= packageManagerInstall %><% if(hasCypress){ %>
       - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
       - run: <%= packageManagerPrefix %> playwright install --with-deps<% } %><% if(!useRunMany){ %>
-      - uses: nrwl/nx-set-shas@v4<% } %>
+      - uses: nrwl/nx-set-shas@v5<% } %>
 
 <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
       # <%- comment %><% } %><% } %><% if (command.command) { %>

package/src/generators/move/lib/update-imports.js

@@ -35,12 +35,12 @@ function updateImports(tree, schema, project) {
     if (tree.exists(tsConfigPath)) {
         tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath);
         const sourceRoot = (0, project_config_1.getProjectSourceRoot)(project, tree);
-        mainEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot))));
-        secondaryEntryPointImportPaths = Object.keys(tsConfig.compilerOptions?.paths ?? {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(project.root)) &&
-            !x.startsWith(ensureTrailingSlash(sourceRoot))));
+        mainEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => stripDotSlash(x).startsWith(ensureTrailingSlash(sourceRoot))));
+        secondaryEntryPointImportPaths = Object.keys(tsConfig.compilerOptions?.paths ?? {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => stripDotSlash(x).startsWith(ensureTrailingSlash(project.root)) &&
+            !stripDotSlash(x).startsWith(ensureTrailingSlash(sourceRoot))));
         // Next.js libs have a custom path for the server we need to update that as well
         // example "paths": { @acme/lib/server : ['libs/lib/src/server.ts'] }
-        serverEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot)) &&
+        serverEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => stripDotSlash(x).startsWith(ensureTrailingSlash(sourceRoot)) &&
             x.includes('server') &&
             path.endsWith('server')));
     }
@@ -130,7 +130,11 @@ function updateTsConfigPaths(tsConfig, projectRef, tsConfigPath, projectRoot, sc
             `${tsConfigPath} compilerOptions.paths`,
         ].join(' '));
     }
-    const updatedPath = path.map((x) => (0, devkit_1.joinPathFragments)(projectRoot.to, (0, path_1.relative)(projectRoot.from, x)));
+    const updatedPath = path.map((x) => {
+        const hadDotSlash = x.startsWith('./');
+        const result = (0, devkit_1.joinPathFragments)(projectRoot.to, (0, path_1.relative)(projectRoot.from, stripDotSlash(x)));
+        return hadDotSlash && !result.startsWith('./') ? `./${result}` : result;
+    });
     if (schema.updateImportPath && projectRef.to) {
         tsConfig.compilerOptions.paths[projectRef.to] = updatedPath;
         if (projectRef.from !== projectRef.to) {
@@ -144,6 +148,9 @@ function updateTsConfigPaths(tsConfig, projectRef, tsConfigPath, projectRoot, sc
 function ensureTrailingSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }
+function stripDotSlash(path) {
+    return path.startsWith('./') ? path.slice(2) : path;
+}
 /**
  * Changes imports in a file from one import to another
  */

package/src/generators/remove/lib/update-tsconfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAQnC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAsC9D"}
+{"version":3,"file":"update-tsconfig.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAQnC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAoC9D"}

package/src/generators/remove/lib/update-tsconfig.js

@@ -31,7 +31,8 @@ async function updateTsconfig(tree, schema) {
             else {
                 for (const importPath in json.compilerOptions.paths) {
                     for (const path of json.compilerOptions.paths[importPath]) {
-                        const project = (0, find_project_for_path_1.findProjectForPath)((0, devkit_1.normalizePath)(path), projectMapping);
+                        const normalized = (0, devkit_1.normalizePath)(path).replace(/^\.\//, '');
+                        const project = (0, find_project_for_path_1.findProjectForPath)(normalized, projectMapping);
                         if (project === schema.projectName) {
                             delete json.compilerOptions.paths[importPath];
                             break;