From 5eeb7327ff1c27756fddce884bc6e98d7d6f573f Mon Sep 17 00:00:00 2001 From: Jason Jean Date: Thu, 6 Oct 2022 10:30:22 -0400 Subject: [PATCH] fix(core): fix slashes in inputs migrations --- .../src/migrations/update-15-0-0/add-eslint-inputs.ts | 6 ++++-- .../nx/src/migrations/update-15-0-0/migrate-to-inputs.ts | 8 +++++--- .../src/migrations/update-15-0-0/add-babel-inputs.ts | 6 ++++-- .../src/migrations/update-15-0-0/add-babel-inputs.ts | 6 ++++-- .../web/src/migrations/update-15-0-0/add-babel-inputs.ts | 6 ++++-- .../src/migrations/update-15-0-0/add-babel-inputs.ts | 6 ++++-- 6 files changed, 25 insertions(+), 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 index 4f1c66482114aa..b075cbad1613f6 100644 --- 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 index d3e018af0247bb..ddd5dae4b33a2a 100644 --- 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,7 +73,9 @@ 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 ); @@ -81,7 +83,7 @@ export default async function (tree: Tree) { } } 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 index 42b4b2da93362e..64ec6ee101f56d 100644 --- 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 index 42b4b2da93362e..64ec6ee101f56d 100644 --- 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 index 42b4b2da93362e..64ec6ee101f56d 100644 --- 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 index 42b4b2da93362e..64ec6ee101f56d 100644 --- 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); }