@angular-devkit/build-angular 17.1.1 → 17.1.3

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.1.1",
+  "version": "17.1.3",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.1",
-    "@angular-devkit/architect": "0.1701.1",
-    "@angular-devkit/build-webpack": "0.1701.1",
-    "@angular-devkit/core": "17.1.1",
+    "@angular-devkit/architect": "0.1701.3",
+    "@angular-devkit/build-webpack": "0.1701.3",
+    "@angular-devkit/core": "17.1.3",
     "@babel/core": "7.23.7",
     "@babel/generator": "7.23.6",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
     "@babel/preset-env": "7.23.7",
     "@babel/runtime": "7.23.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "17.1.1",
+    "@ngtools/webpack": "17.1.3",
     "@vitejs/plugin-basic-ssl": "1.0.2",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.16",

package/src/builders/application/options.js

@@ -70,7 +70,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
         server: 'server',
         media: 'media',
         ...(typeof outputPath === 'string' ? undefined : outputPath),
-        base: normalizeDirectoryPath(node_path_1.default.join(workspaceRoot, typeof outputPath === 'string' ? outputPath : outputPath.base)),
+        base: normalizeDirectoryPath(node_path_1.default.resolve(workspaceRoot, typeof outputPath === 'string' ? outputPath : outputPath.base)),
     };
     const outputNames = {
         bundles: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Bundles

package/src/builders/dev-server/vite-server.js

@@ -66,7 +66,6 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
         // Avoid bundling and processing the ssr entry-point as this is not used by the dev-server.
         browserOptions.ssr = true;
         // https://nodejs.org/api/process.html#processsetsourcemapsenabledval
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         process.setSourceMapsEnabled(true);
     }
     // Set all packages as external to support Vite's prebundle caching
@@ -75,7 +74,7 @@ async function* serveWithVite(serverOptions, builderName, context, transformers,
     if (serverOptions.servePath === undefined && baseHref !== undefined) {
         // Remove trailing slash
         serverOptions.servePath =
-            baseHref[baseHref.length - 1] === '/' ? baseHref.slice(0, -1) : baseHref;
+            baseHref !== './' && baseHref[baseHref.length - 1] === '/' ? baseHref.slice(0, -1) : baseHref;
     }
     // The development server currently only supports a single locale when localizing.
     // This matches the behavior of the Webpack-based development server but could be expanded in the future.
@@ -341,7 +340,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
         publicDir: false,
         esbuild: false,
         mode: 'development',
-        appType: 'spa',
+        appType: 'mpa',
         css: {
             devSourcemap: true,
         },

package/src/builders/extract-i18n/application-extraction.js

@@ -20,9 +20,11 @@ async function extractMessages(options, builderName, context, extractorConstruct
     // Setup the build options for the application based on the buildTarget option
     const buildOptions = (await context.validateOptions(await context.getTargetOptions(options.buildTarget), builderName));
     buildOptions.optimization = false;
-    buildOptions.sourceMap = { scripts: true, vendor: true };
+    buildOptions.sourceMap = { scripts: true, vendor: true, styles: false };
     buildOptions.localize = false;
     buildOptions.budgets = undefined;
+    buildOptions.index = false;
+    buildOptions.serviceWorker = false;
     let build;
     if (builderName === '@angular-devkit/build-angular:application') {
         build = application_1.buildApplicationInternal;

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -162,7 +162,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         });
                         referencedFileTracker.add(containingFile, Object.keys(workerResult.metafile.inputs).map((input) => path.join(build.initialOptions.absWorkingDir ?? '', input)));
                         // Return bundled worker file entry name to be used in the built output
-                        const workerCodeFile = workerResult.outputFiles.find((file) => file.path.endsWith('.js'));
+                        const workerCodeFile = workerResult.outputFiles.find((file) => /^worker-[A-Z0-9]{8}.[cm]?js$/.test(path.basename(file.path)));
                         (0, node_assert_1.default)(workerCodeFile, 'Web Worker bundled code file should always be present.');
                         const workerCodePath = path.relative(build.initialOptions.outdir ?? '', workerCodeFile.path);
                         return workerCodePath.replaceAll('\\', '/');

package/src/tools/esbuild/bundler-context.js

@@ -260,7 +260,9 @@ class BundlerContext {
         for (const { imports } of Object.values(result.metafile.outputs)) {
             for (const importData of imports) {
                 if (!importData.external ||
-                    (importData.kind !== 'import-statement' && importData.kind !== 'dynamic-import')) {
+                    (importData.kind !== 'import-statement' &&
+                        importData.kind !== 'dynamic-import' &&
+                        importData.kind !== 'require-call')) {
                     continue;
                 }
                 externalImports.add(importData.path);

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

@@ -61,6 +61,7 @@ function createAngularMemoryPlugin(options) {
                 map: mapContents && Buffer.from(mapContents).toString('utf-8'),
             };
         },
+        // eslint-disable-next-line max-lines-per-function
         configureServer(server) {
             const originalssrTransform = server.ssrTransform;
             server.ssrTransform = async (code, map, url, originalCode) => {
@@ -124,14 +125,15 @@ function createAngularMemoryPlugin(options) {
             // Returning a function, installs middleware after the main transform middleware but
             // before the built-in HTML middleware
             return () => {
+                server.middlewares.use(angularHtmlFallbackMiddleware);
                 function angularSSRMiddleware(req, res, next) {
                     const url = req.originalUrl;
                     if (!req.url ||
                         // Skip if path is not defined.
                         !url ||
                         // Skip if path is like a file.
-                        // NOTE: We use a regexp to mitigate against matching requests like: /browse/pl.0ef59752c0cd457dbf1391f08cbd936f
-                        /^\.[a-z]{2,4}$/i.test((0, node_path_1.extname)(url.split('?')[0]))) {
+                        // NOTE: We use a mime type lookup to mitigate against matching requests like: /browse/pl.0ef59752c0cd457dbf1391f08cbd936f
+                        lookupMimeTypeFromRequest(url)) {
                         next();
                         return;
                     }
@@ -227,3 +229,23 @@ function pathnameWithoutBasePath(url, basePath) {
         ? pathname.slice(basePath.length - 1)
         : pathname;
 }
+function angularHtmlFallbackMiddleware(req, res, next) {
+    // Similar to how it is handled in vite
+    // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L15C19-L15C45
+    if ((req.method === 'GET' || req.method === 'HEAD') &&
+        (!req.url || !lookupMimeTypeFromRequest(req.url)) &&
+        (!req.headers.accept ||
+            req.headers.accept.includes('text/html') ||
+            req.headers.accept.includes('text/*') ||
+            req.headers.accept.includes('*/*'))) {
+        req.url = '/index.html';
+    }
+    next();
+}
+function lookupMimeTypeFromRequest(url) {
+    const extension = (0, node_path_1.extname)(url.split('?')[0]);
+    if (extension === '.ico') {
+        return 'image/x-icon';
+    }
+    return extension && (0, mrmime_1.lookup)(extension);
+}

package/src/utils/load-proxy-config.js

@@ -135,9 +135,9 @@ function normalizeProxyConfiguration(proxy) {
     }
     // TODO: Consider upstreaming glob support
     for (const key of Object.keys(normalizedProxy)) {
-        if ((0, fast_glob_1.isDynamicPattern)(key)) {
-            const { output } = (0, picomatch_1.parse)(key);
-            normalizedProxy[`^${output}$`] = normalizedProxy[key];
+        if (key[0] !== '^' && (0, fast_glob_1.isDynamicPattern)(key)) {
+            const pattern = (0, picomatch_1.makeRe)(key).source;
+            normalizedProxy[pattern] = normalizedProxy[key];
             delete normalizedProxy[key];
         }
     }