From 75c6722b4bede7f4726777de35c102c0261d86cd Mon Sep 17 00:00:00 2001 From: Colum Ferry Date: Tue, 19 Apr 2022 12:47:29 +0100 Subject: [PATCH] fix(angular): path normalize was in correct on windows #9861 (#9881) --- packages/angular/src/utils/mfe/mfe-webpack.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/angular/src/utils/mfe/mfe-webpack.ts b/packages/angular/src/utils/mfe/mfe-webpack.ts index f9be25a621785..cb36a307ba059 100644 --- a/packages/angular/src/utils/mfe/mfe-webpack.ts +++ b/packages/angular/src/utils/mfe/mfe-webpack.ts @@ -1,7 +1,7 @@ import { existsSync, readFileSync } from 'fs'; import { NormalModuleReplacementPlugin } from 'webpack'; -import { normalizePath, joinPathFragments, workspaceRoot } from '@nrwl/devkit'; -import { dirname } from 'path'; +import { joinPathFragments, workspaceRoot } from '@nrwl/devkit'; +import { dirname, join, normalize } from 'path'; import { ParsedCommandLine } from 'typescript'; import { getRootTsConfigPath, @@ -40,9 +40,7 @@ export function shareWorkspaceLibraries( const pathMappings: { name: string; path: string }[] = []; for (const [key, paths] of Object.entries(tsconfigPathAliases)) { if (libraries && libraries.includes(key)) { - const pathToLib = normalizePath( - joinPathFragments(workspaceRoot, paths[0]) - ); + const pathToLib = normalize(join(workspaceRoot, paths[0])); pathMappings.push({ name: key, path: pathToLib, @@ -71,10 +69,10 @@ export function shareWorkspaceLibraries( } const from = req.context; - const to = normalizePath(joinPathFragments(req.context, req.request)); + const to = normalize(join(req.context, req.request)); for (const library of pathMappings) { - const libFolder = normalizePath(dirname(library.path)); + const libFolder = normalize(dirname(library.path)); if (!from.startsWith(libFolder) && to.startsWith(libFolder)) { req.request = library.name; }