fix(core): fix slashes in inputs migrations (#12444)

nrwl · Oct 7, 2022 · 85a5c89 · 85a5c89 · vercel · Oct 7, 2022
1 parent 678bb83
commit 85a5c89
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/packages/linter/src/migrations/update-15-0-0/add-eslint-inputs.ts b/packages/linter/src/migrations/update-15-0-0/add-eslint-inputs.ts
@@ -1,11 +1,11 @@
 import {
   formatFiles,
+  joinPathFragments,
   readWorkspaceConfiguration,
   Tree,
   updateWorkspaceConfiguration,
 } from '@nrwl/devkit';
 import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
-import { join } from 'path';
 
 export default async function (tree: Tree) {
   const workspaceConfiguration = readWorkspaceConfiguration(tree);
@@ -31,7 +31,9 @@ export default async function (tree: Tree) {
 
     lintTargetDefaults.inputs ??= [
       'default',
-      ...(globalEslintFile ? [join('{workspaceRoot}', globalEslintFile)] : []),
+      ...(globalEslintFile
+        ? [joinPathFragments('{workspaceRoot}', globalEslintFile)]
+        : []),
     ];
   }
 

diff --git a/packages/nx/src/migrations/update-15-0-0/migrate-to-inputs.ts b/packages/nx/src/migrations/update-15-0-0/migrate-to-inputs.ts
@@ -6,7 +6,7 @@ import {
   updateProjectConfiguration,
   updateWorkspaceConfiguration,
 } from '../../generators/utils/project-configuration';
-import { join } from 'path';
+import { joinPathFragments } from '../../utils/path';
 
 const skippedFiles = [
   'package.json', // Not to be added to filesets
@@ -73,15 +73,17 @@ export default async function (tree: Tree) {
           const projectSpecificFileset = new Set(
             project.namedInputs.projectSpecificFiles ?? []
           );
-          projectSpecificFileset.add(join('{workspaceRoot}', files));
+          projectSpecificFileset.add(
+            joinPathFragments('{workspaceRoot}', files)
+          );
           project.namedInputs.projectSpecificFiles = Array.from(
             projectSpecificFileset
           );
           updateProjectConfiguration(tree, dependent, project);
         }
       } else {
         workspaceConfiguration.namedInputs.sharedGlobals.push(
-          join('{workspaceRoot}', files)
+          joinPathFragments('{workspaceRoot}', files)
         );
       }
     }

diff --git a/packages/react-native/src/migrations/update-15-0-0/add-babel-inputs.ts b/packages/react-native/src/migrations/update-15-0-0/add-babel-inputs.ts
@@ -1,10 +1,10 @@
 import {
   formatFiles,
+  joinPathFragments,
   readWorkspaceConfiguration,
   Tree,
   updateWorkspaceConfiguration,
 } from '@nrwl/devkit';
-import { join } from 'path';
 
 export default async function (tree: Tree) {
   const workspaceConfiguration = readWorkspaceConfiguration(tree);
@@ -17,7 +17,9 @@ export default async function (tree: Tree) {
     const sharedGlobalFileset = new Set(
       workspaceConfiguration.namedInputs.sharedGlobals
     );
-    sharedGlobalFileset.add(join('{workspaceRoot}', globalBabelFile));
+    sharedGlobalFileset.add(
+      joinPathFragments('{workspaceRoot}', globalBabelFile)
+    );
     workspaceConfiguration.namedInputs.sharedGlobals =
       Array.from(sharedGlobalFileset);
   }

diff --git a/packages/rollup/src/migrations/update-15-0-0/add-babel-inputs.ts b/packages/rollup/src/migrations/update-15-0-0/add-babel-inputs.ts
@@ -1,10 +1,10 @@
 import {
   formatFiles,
+  joinPathFragments,
   readWorkspaceConfiguration,
   Tree,
   updateWorkspaceConfiguration,
 } from '@nrwl/devkit';
-import { join } from 'path';
 
 export default async function (tree: Tree) {
   const workspaceConfiguration = readWorkspaceConfiguration(tree);
@@ -17,7 +17,9 @@ export default async function (tree: Tree) {
     const sharedGlobalFileset = new Set(
       workspaceConfiguration.namedInputs.sharedGlobals
     );
-    sharedGlobalFileset.add(join('{workspaceRoot}', globalBabelFile));
+    sharedGlobalFileset.add(
+      joinPathFragments('{workspaceRoot}', globalBabelFile)
+    );
     workspaceConfiguration.namedInputs.sharedGlobals =
       Array.from(sharedGlobalFileset);
   }

diff --git a/packages/web/src/migrations/update-15-0-0/add-babel-inputs.ts b/packages/web/src/migrations/update-15-0-0/add-babel-inputs.ts
@@ -1,10 +1,10 @@
 import {
   formatFiles,
+  joinPathFragments,
   readWorkspaceConfiguration,
   Tree,
   updateWorkspaceConfiguration,
 } from '@nrwl/devkit';
-import { join } from 'path';
 
 export default async function (tree: Tree) {
   const workspaceConfiguration = readWorkspaceConfiguration(tree);
@@ -17,7 +17,9 @@ export default async function (tree: Tree) {
     const sharedGlobalFileset = new Set(
       workspaceConfiguration.namedInputs.sharedGlobals
     );
-    sharedGlobalFileset.add(join('{workspaceRoot}', globalBabelFile));
+    sharedGlobalFileset.add(
+      joinPathFragments('{workspaceRoot}', globalBabelFile)
+    );
     workspaceConfiguration.namedInputs.sharedGlobals =
       Array.from(sharedGlobalFileset);
   }

diff --git a/packages/webpack/src/migrations/update-15-0-0/add-babel-inputs.ts b/packages/webpack/src/migrations/update-15-0-0/add-babel-inputs.ts
@@ -1,10 +1,10 @@
 import {
   formatFiles,
+  joinPathFragments,
   readWorkspaceConfiguration,
   Tree,
   updateWorkspaceConfiguration,
 } from '@nrwl/devkit';
-import { join } from 'path';
 
 export default async function (tree: Tree) {
   const workspaceConfiguration = readWorkspaceConfiguration(tree);
@@ -17,7 +17,9 @@ export default async function (tree: Tree) {
     const sharedGlobalFileset = new Set(
       workspaceConfiguration.namedInputs.sharedGlobals
     );
-    sharedGlobalFileset.add(join('{workspaceRoot}', globalBabelFile));
+    sharedGlobalFileset.add(
+      joinPathFragments('{workspaceRoot}', globalBabelFile)
+    );
     workspaceConfiguration.namedInputs.sharedGlobals =
       Array.from(sharedGlobalFileset);
   }