93f7a2a Revert "test: update e2e update test to include content in css file"

Author: Angular Builds

package.json

@@ -1,26 +1,26 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.0.0-next.0+sha-d05f78b",
+  "version": "18.0.0-next.0+sha-93f7a2a",
   "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#d05f78b",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#d05f78b",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d05f78b",
-    "@babel/core": "7.24.0",
-    "@babel/generator": "7.23.6",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#93f7a2a",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#93f7a2a",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#93f7a2a",
+    "@babel/core": "7.24.3",
+    "@babel/generator": "7.24.1",
     "@babel/helper-annotate-as-pure": "7.22.5",
     "@babel/helper-split-export-declaration": "7.22.6",
-    "@babel/plugin-transform-async-generator-functions": "7.23.9",
-    "@babel/plugin-transform-async-to-generator": "7.23.3",
-    "@babel/plugin-transform-runtime": "7.24.0",
-    "@babel/preset-env": "7.24.0",
-    "@babel/runtime": "7.24.0",
+    "@babel/plugin-transform-async-generator-functions": "7.24.3",
+    "@babel/plugin-transform-async-to-generator": "7.24.1",
+    "@babel/plugin-transform-runtime": "7.24.3",
+    "@babel/preset-env": "7.24.3",
+    "@babel/runtime": "7.24.1",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#d05f78b",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#93f7a2a",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.18",
@@ -49,7 +49,7 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.1",
     "piscina": "4.4.0",
-    "postcss": "8.4.35",
+    "postcss": "8.4.37",
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
@@ -62,11 +62,11 @@
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
     "undici": "6.9.0",
-    "vite": "5.1.6",
+    "vite": "5.2.2",
     "watchpack": "2.4.1",
-    "webpack": "5.90.3",
-    "webpack-dev-middleware": "7.0.0",
-    "webpack-dev-server": "5.0.3",
+    "webpack": "5.91.0",
+    "webpack-dev-middleware": "7.1.1",
+    "webpack-dev-server": "5.0.4",
     "webpack-merge": "5.10.0",
     "webpack-subresource-integrity": "5.1.0"
   },

src/tools/vite/angular-memory-plugin.js

@@ -230,13 +230,11 @@ exports.createAngularMemoryPlugin = createAngularMemoryPlugin;
  */
 async function loadViteClientCode(file) {
     const originalContents = await (0, promises_1.readFile)(file, 'utf-8');
-    const firstUpdate = originalContents.replace('You can also disable this overlay by setting', '');
-    (0, node_assert_1.default)(originalContents !== firstUpdate, 'Failed to update Vite client error overlay text. (1)');
-    const secondUpdate = firstUpdate.replace(
-    // eslint-disable-next-line max-len
-    '<code part="config-option-name">server.hmr.overlay</code> to <code part="config-option-value">false</code> in <code part="config-file-name">${hmrConfigName}.</code>', '');
-    (0, node_assert_1.default)(firstUpdate !== secondUpdate, 'Failed to update Vite client error overlay text. (2)');
-    return secondUpdate;
+    const updatedContents = originalContents.replace(`h('br'), 'You can also disable this overlay by setting ', ` +
+        `h('code', { part: 'config-option-name' }, 'server.hmr.overlay'), '` +
+        ` to ', h('code', { part: 'config-option-value' }, 'false'), ' in ', h('code', { part: 'config-file-name' }, hmrConfigName), '.'`, '');
+    (0, node_assert_1.default)(originalContents !== updatedContents, 'Failed to update Vite client error overlay text.');
+    return updatedContents;
 }
 function pathnameWithoutBasePath(url, basePath) {
     const parsedUrl = new URL(url, 'http://localhost');

src/tools/webpack/plugins/builder-watch-plugin.js

@@ -51,7 +51,7 @@ class BuilderWatchFileSystem {
                 const directoryChanges = new Set();
                 const missingChanges = new Set();
                 for (const event of events) {
-                    this.inputFileSystem.purge?.(event.path);
+                    this.inputFileSystem?.purge?.(event.path);
                     if (event.type === 'deleted') {
                         timeInfo.delete(event.path);
                         removals.add(event.path);
@@ -70,7 +70,7 @@ class BuilderWatchFileSystem {
                     }
                 }
                 const timeInfoMap = new Map(timeInfo);
-                callback(undefined, timeInfoMap, timeInfoMap, new Set([...fileChanges, ...directoryChanges, ...missingChanges]), removals);
+                callback(null, timeInfoMap, timeInfoMap, new Set([...fileChanges, ...directoryChanges, ...missingChanges]), removals);
             });
         });
         return {

src/tools/webpack/plugins/styles-webpack-plugin.js

@@ -34,7 +34,7 @@ class StylesWebpackPlugin {
             preferRelative: true,
             useSyncFileSystemCalls: true,
             symlinks: !preserveSymlinks,
-            fileSystem: compiler.inputFileSystem,
+            fileSystem: compiler.inputFileSystem ?? undefined,
         });
         const webpackOptions = compiler.options;
         compiler.hooks.environment.tap(PLUGIN_NAME, () => {

uniqueId

@@ -1 +1 @@
-Thu Mar 21 2024 01:50:45 GMT+0000 (Coordinated Universal Time)
+Thu Mar 21 2024 13:34:33 GMT+0000 (Coordinated Universal Time)