fix(@nguniversal/builders): correctly handle path normalizations on W…

…indows Closes #2706 (cherry picked from commit c1383d1)
angular · Jun 23, 2022 · ddffd97 · ddffd97
1 parent fa24bc6
commit ddffd97
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/modules/builders/src/prerender/index.ts b/modules/builders/src/prerender/index.ts
@@ -15,7 +15,6 @@ import {
 import { BrowserBuilderOptions } from '@angular-devkit/build-angular';
 import { normalizeOptimization } from '@angular-devkit/build-angular/src/utils/normalize-optimization';
 import { augmentAppWithServiceWorker } from '@angular-devkit/build-angular/src/utils/service-worker';
-import { normalize, resolve as resolvePath } from '@angular-devkit/core';
 import * as fs from 'fs';
 import ora from 'ora';
 import * as path from 'path';
@@ -92,9 +91,11 @@ async function _renderUniversal(
     throw new Error('The builder requires a target.');
   }
 
-  const root = normalize(context.workspaceRoot);
   const projectMetadata = await context.getProjectMetadata(projectName);
-  const projectRoot = resolvePath(root, normalize((projectMetadata.root as string) || ''));
+  const projectRoot = path.join(
+    context.workspaceRoot,
+    (projectMetadata.root as string | undefined) ?? '',
+  );
 
   // Users can specify a different base html file e.g. "src/home.html"
   const indexFile = getIndexOutputFile(browserOptions);
@@ -160,7 +161,7 @@ async function _renderUniversal(
           await augmentAppWithServiceWorker(
             projectRoot,
             context.workspaceRoot,
-            normalize(outputPath),
+            outputPath,
             browserOptions.baseHref || '/',
             browserOptions.ngswConfigPath,
           );

diff --git a/modules/builders/src/static-generator/index.ts b/modules/builders/src/static-generator/index.ts
@@ -15,7 +15,6 @@ import {
 import { BrowserBuilderOptions, BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { normalizeOptimization } from '@angular-devkit/build-angular/src/utils/normalize-optimization';
 import { augmentAppWithServiceWorker } from '@angular-devkit/build-angular/src/utils/service-worker';
-import { normalize, resolve } from '@angular-devkit/core';
 import express from 'express';
 import * as http from 'http';
 import ora from 'ora';
@@ -145,14 +144,16 @@ async function generateServiceWorker(
       throw new Error('The builder requires a target.');
     }
 
-    const root = normalize(context.workspaceRoot);
     const projectMetadata = await context.getProjectMetadata(projectName);
-    const projectRoot = resolve(root, normalize((projectMetadata.root as string) ?? ''));
+    const projectRoot = path.join(
+      context.workspaceRoot,
+      (projectMetadata.root as string | undefined) ?? '',
+    );
 
     await augmentAppWithServiceWorker(
       projectRoot,
       context.workspaceRoot,
-      normalize(outputPath),
+      outputPath,
       browserOptions.baseHref || '/',
       browserOptions.ngswConfigPath,
     );