angular
diff --git a/‎packages/angular_devkit/build_angular/src/builders/application/execute-build.ts‎
Lines changed: 25 additions & 6 deletions b/‎packages/angular_devkit/build_angular/src/builders/application/execute-build.ts‎
Lines changed: 25 additions & 6 deletions
diff --git a/‎packages/angular_devkit/build_angular/src/builders/application/tests/behavior/typescript-rebuild-lazy_spec.ts‎
Lines changed: 1 addition & 1 deletion b/‎packages/angular_devkit/build_angular/src/builders/application/tests/behavior/typescript-rebuild-lazy_spec.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/angular_devkit/build_angular/src/builders/dev-server/vite-server.ts‎
Lines changed: 32 additions & 3 deletions b/‎packages/angular_devkit/build_angular/src/builders/dev-server/vite-server.ts‎
Lines changed: 32 additions & 3 deletions
@@ -12,6 +12,7 @@ import {
   createBrowserCodeBundleOptions,
   createBrowserPolyfillBundleOptions,
   createServerCodeBundleOptions,
+  createServerPolyfillBundleOptions,
 } from '../../tools/esbuild/application-code-bundle';
 import { generateBudgetStats } from '../../tools/esbuild/budget-stats';
 import { BuildOutputFileType, BundlerContext } from '../../tools/esbuild/bundler-context';
@@ -82,14 +83,14 @@ export async function executeBuild(
     );
 
     // Browser polyfills code
-    const polyfillBundleOptions = createBrowserPolyfillBundleOptions(
+    const browserPolyfillBundleOptions = createBrowserPolyfillBundleOptions(
       options,
       target,
       codeBundleCache,
     );
-    if (polyfillBundleOptions) {
+    if (browserPolyfillBundleOptions) {
       bundlerContexts.push(
-        new BundlerContext(workspaceRoot, !!options.watch, polyfillBundleOptions),
+        new BundlerContext(workspaceRoot, !!options.watch, browserPolyfillBundleOptions),
       );
     }
 
@@ -122,18 +123,36 @@ export async function executeBuild(
       }
     }
 
-    // Server application code
     // Skip server build when none of the features are enabled.
     if (serverEntryPoint && (prerenderOptions || appShellOptions || ssrOptions)) {
-      const nodeTargets = getSupportedNodeTargets();
+      const nodeTargets = [...target, ...getSupportedNodeTargets()];
+      // Server application code
       bundlerContexts.push(
         new BundlerContext(
           workspaceRoot,
           !!options.watch,
-          createServerCodeBundleOptions(options, [...target, ...nodeTargets], codeBundleCache),
+          createServerCodeBundleOptions(options, nodeTargets, codeBundleCache),
           () => false,
         ),
       );
+
+      // Server polyfills code
+      const serverPolyfillBundleOptions = createServerPolyfillBundleOptions(
+        options,
+        nodeTargets,
+        codeBundleCache,
+      );
+
+      if (serverPolyfillBundleOptions) {
+        bundlerContexts.push(
+          new BundlerContext(
+            workspaceRoot,
+            !!options.watch,
+            serverPolyfillBundleOptions,
+            () => false,
+          ),
+        );
+      }
     }
   }
 
 
@@ -45,7 +45,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
       const builderAbort = new AbortController();
       const buildCount = await firstValueFrom(
         harness.execute({ outputLogsOnFailure: false, signal: builderAbort.signal }).pipe(
-          timeout(20_000),
+          timeout(30_000),
           concatMap(async ({ result, logs }, index) => {
             switch (index) {
               case 0:
 
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import remapping, { SourceMapInput } from '@ampproject/remapping';
 import type { BuilderContext } from '@angular-devkit/architect';
 import type { json, logging } from '@angular-devkit/core';
 import type { Plugin } from 'esbuild';
@@ -70,6 +71,10 @@ export async function* serveWithVite(
     // This is so instead of prerendering all the routes for every change, the page is "prerendered" when it is requested.
     browserOptions.ssr = true;
     browserOptions.prerender = false;
+
+    // https://nodejs.org/api/process.html#processsetsourcemapsenabledval
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (process as any).setSourceMapsEnabled(true);
   }
 
   // Set all packages as external to support Vite's prebundle caching
@@ -426,6 +431,31 @@ export async function setupServer(
           };
         },
         configureServer(server) {
+          const originalssrTransform = server.ssrTransform;
+          server.ssrTransform = async (code, map, url, originalCode) => {
+            const result = await originalssrTransform(code, null, url, originalCode);
+            if (!result) {
+              return null;
+            }
+
+            let transformedCode = result.code;
+            if (result.map && map) {
+              transformedCode +=
+                `\n//# sourceMappingURL=` +
+                `data:application/json;base64,${Buffer.from(
+                  JSON.stringify(
+                    remapping([result.map as SourceMapInput, map as SourceMapInput], () => null),
+                  ),
+                ).toString('base64')}`;
+            }
+
+            return {
+              ...result,
+              map: null,
+              code: transformedCode,
+            };
+          };
+
           // Assets and resources get handled first
           server.middlewares.use(function angularAssetsMiddleware(req, res, next) {
             if (req.url === undefined || res.writableEnded) {
@@ -501,9 +531,8 @@ export async function setupServer(
                   route: pathnameWithoutServePath(url, serverOptions),
                   serverContext: 'ssr',
                   loadBundle: (path: string) =>
-                    server.ssrLoadModule(path.slice(1)) as ReturnType<
-                      NonNullable<RenderOptions['loadBundle']>
-                    >,
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    server.ssrLoadModule(path.slice(1)) as any,
                   // Files here are only needed for critical CSS inlining.
                   outputFiles: {},
                   // TODO: add support for critical css inlining.