e22d677 fix(@angular-devkit/build-angular): ensure proper resolution of linked SCSS files

Author: Angular Builds

package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.0.0-next.0+sha-31e8ad3",
+  "version": "18.0.0-next.0+sha-e22d677",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#31e8ad3",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#31e8ad3",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#31e8ad3",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#e22d677",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#e22d677",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#e22d677",
     "@babel/core": "7.24.3",
     "@babel/generator": "7.24.1",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
     "@babel/preset-env": "7.24.3",
     "@babel/runtime": "7.24.1",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#31e8ad3",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#e22d677",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.19",

src/builders/application/execute-post-bundle.js

@@ -75,7 +75,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
     // If localization is enabled, service worker is handled in the inlining process.
     if (serviceWorker) {
         try {
-            const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, options.baseHref || '/', 
+            const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, options.baseHref || '/', options.indexHtmlOptions?.output, 
             // Ensure additional files recently added are used
             [...outputFiles, ...additionalOutputFiles], assetFiles);
             additionalOutputFiles.push((0, utils_1.createOutputFileFromText)('ngsw.json', serviceWorkerResult.manifest, bundler_context_1.BuildOutputFileType.Browser));

src/builders/application/options.js

@@ -211,7 +211,9 @@ async function normalizeOptions(context, projectName, options, extensions) {
         fileReplacements,
         globalStyles,
         globalScripts,
-        serviceWorker: typeof serviceWorker === 'string' ? node_path_1.default.join(workspaceRoot, serviceWorker) : undefined,
+        serviceWorker: serviceWorker
+            ? node_path_1.default.join(workspaceRoot, typeof serviceWorker === 'string' ? serviceWorker : 'src/ngsw-config.json')
+            : undefined,
         indexHtmlOptions,
         tailwindConfiguration,
         postcssConfiguration,

src/tools/sass/rebasing-importer.js

@@ -205,15 +205,25 @@ class RelativeUrlRebasingImporter extends UrlRebasingImporter {
             foundImports = [];
             cachedEntries = { files: new Set(), directories: new Set() };
             for (const entry of entries) {
-                const isDirectory = entry.isDirectory();
+                let isDirectory;
+                let isFile;
+                if (entry.isSymbolicLink()) {
+                    const stats = (0, node_fs_1.statSync)((0, node_path_1.join)(entry.path, entry.name));
+                    isDirectory = stats.isDirectory();
+                    isFile = stats.isFile();
+                }
+                else {
+                    isDirectory = entry.isDirectory();
+                    isFile = entry.isFile();
+                }
                 if (isDirectory) {
                     cachedEntries.directories.add(entry.name);
+                    // Record if the name should be checked as a directory with an index file
+                    if (checkDirectory && !hasStyleExtension && entry.name === filename) {
+                        hasPotentialIndex = true;
+                    }
                 }
-                // Record if the name should be checked as a directory with an index file
-                if (checkDirectory && !hasStyleExtension && entry.name === filename && isDirectory) {
-                    hasPotentialIndex = true;
-                }
-                if (!entry.isFile()) {
+                if (!isFile) {
                     continue;
                 }
                 cachedEntries.files.add(entry.name);

src/utils/service-worker.d.ts

@@ -12,7 +12,7 @@ import { promises as fsPromises } from 'node:fs';
 import { BuildOutputFile } from '../tools/esbuild/bundler-context';
 import { BuildOutputAsset } from '../tools/esbuild/bundler-execution-result';
 export declare function augmentAppWithServiceWorker(appRoot: string, workspaceRoot: string, outputPath: string, baseHref: string, ngswConfigPath?: string, inputputFileSystem?: typeof fsPromises, outputFileSystem?: typeof fsPromises): Promise<void>;
-export declare function augmentAppWithServiceWorkerEsbuild(workspaceRoot: string, configPath: string, baseHref: string, outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[]): Promise<{
+export declare function augmentAppWithServiceWorkerEsbuild(workspaceRoot: string, configPath: string, baseHref: string, indexHtml: string | undefined, outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[]): Promise<{
     manifest: string;
     assetFiles: BuildOutputAsset[];
 }>;

src/utils/service-worker.js

@@ -159,12 +159,15 @@ async function augmentAppWithServiceWorker(appRoot, workspaceRoot, outputPath, b
 }
 exports.augmentAppWithServiceWorker = augmentAppWithServiceWorker;
 // This is currently used by the esbuild-based builder
-async function augmentAppWithServiceWorkerEsbuild(workspaceRoot, configPath, baseHref, outputFiles, assetFiles) {
+async function augmentAppWithServiceWorkerEsbuild(workspaceRoot, configPath, baseHref, indexHtml, outputFiles, assetFiles) {
     // Read the configuration file
     let config;
     try {
         const configurationData = await node_fs_1.promises.readFile(configPath, 'utf-8');
         config = JSON.parse(configurationData);
+        if (indexHtml) {
+            config.index = indexHtml;
+        }
     }
     catch (error) {
         (0, error_1.assertIsError)(error);

uniqueId

@@ -1 +1 @@
-Mon Mar 25 2024 10:21:14 GMT+0000 (Coordinated Universal Time)
+Mon Mar 25 2024 12:40:37 GMT+0000 (Coordinated Universal Time)