Angular v17 support

src/frameworks/angular/index.ts

@@ -36,18 +36,24 @@
 
 const DEFAULT_BUILD_SCRIPT = ["ng build"];
 
+/**
+ *
+ */
 export async function discover(dir: string): Promise<Discovery | undefined> {
   if (!(await pathExists(join(dir, "package.json")))) return;
   if (!(await pathExists(join(dir, "angular.json")))) return;
   return { mayWantBackend: true, publicDirectory: join(dir, "src", "assets") };
 }
 
+/**
+ *
+ */
 export async function init(setup: any, config: any) {
   execSync(
     `npx --yes -p @angular/cli@latest ng new ${setup.projectId} --directory ${setup.hosting.source} --skip-git`,
     {
       stdio: "inherit",
       cwd: config.projectDir,
     }
   );
   const useAngularUniversal = await promptOnce({
@@ -59,18 +65,21 @@
   if (useAngularUniversal) {
     execSync("ng add @nguniversal/express-engine --skip-confirmation", {
       stdio: "inherit",
       cwd: join(config.projectDir, setup.hosting.source),
     });
   }
 }
 
+/**
+ *
+ */
 export async function build(dir: string, configuration: string): Promise<BuildResult> {
   const {
     targets,
-    serverTarget,
     serveOptimizedImages,
     locales,
     baseHref: baseUrl,
+    ssr,
   } = await getBuildConfig(dir, configuration);
   await warnIfCustomBuildScript(dir, name, DEFAULT_BUILD_SCRIPT);
   for (const target of targets) {
@@ -84,8 +93,8 @@
     if (result.status !== 0) throw new FirebaseError(`Unable to build ${target}`);
   }
 
-  const wantsBackend = !!serverTarget || serveOptimizedImages;
-  const rewrites = serverTarget
+  const wantsBackend = ssr || serveOptimizedImages;
+  const rewrites = ssr
     ? []
     : [
         {
@@ -97,6 +106,9 @@
   return { wantsBackend, i18n, rewrites, baseUrl };
 }
 
+/**
+ *
+ */
 export async function getDevModeHandle(dir: string, configuration: string) {
   const { targetStringFromTarget } = relativeRequire(dir, "@angular-devkit/architect");
   const { serveTarget } = await getContext(dir, configuration);
@@ -121,6 +133,9 @@
   return simpleProxy(await host);
 }
 
+/**
+ *
+ */
 export async function ɵcodegenPublicDirectory(
   sourceDir: string,
   destDir: string,
@@ -146,11 +161,18 @@
   }
 }
 
+/**
+ *
+ */
 export async function getValidBuildTargets(purpose: BUILD_TARGET_PURPOSE, dir: string) {
   const validTargetNames = new Set(["development", "production"]);
   try {
-    const { workspaceProject, browserTarget, serverTarget, serveTarget } = await getContext(dir);
-    const { target } = ((purpose === "emulate" && serveTarget) || serverTarget || browserTarget)!;
+    const { workspaceProject, buildTarget, browserTarget, serverTarget, serveTarget } =
+      await getContext(dir);
+    const { target } = ((purpose === "emulate" && serveTarget) ||
+      buildTarget ||
+      serverTarget ||
+      browserTarget)!;
     const workspaceTarget = workspaceProject.targets.get(target)!;
     Object.keys(workspaceTarget.configurations || {}).forEach((it) => validTargetNames.add(it));
   } catch (e) {
@@ -160,12 +182,18 @@
   return [...validTargetNames, ...allTargets];
 }
 
+/**
+ *
+ */
 export async function shouldUseDevModeHandle(targetOrConfiguration: string, dir: string) {
   const { serveTarget } = await getContext(dir, targetOrConfiguration);
   if (!serveTarget) return false;
   return serveTarget.configuration !== "production";
 }
 
+/**
+ *
+ */
 export async function ɵcodegenFunctionsDirectory(
   sourceDir: string,
   destDir: string,
@@ -182,6 +210,7 @@
     externalDependencies,
     baseHref,
     serveOptimizedImages,
+    serverEntry,
   } = await getServerConfig(sourceDir, configuration);
 
   const dotEnv = { __NG_BROWSER_OUTPUT_PATH__: browserOutputPath };
@@ -232,14 +261,25 @@
     if (localizedApps.has(locale)) {
       localizedApps.get(locale)(req,res);
     } else {
-      const app = require(\`./${serverOutputPath}/\${locale}/main.js\`).app(locale);
-      localizedApps.set(locale, app);
-      app(req,res);
+      ${
+        serverEntry?.endsWith(".mjs")
+          ? `import(\`./${serverOutputPath}/\${locale}/${serverEntry}\`)`
+          : `Promise.resolve(require(\`./${serverOutputPath}/\${locale}/${serverEntry}\`))`
+      }.then(server => {
+        const app = server.app(locale);
+        localizedApps.set(locale, app);
+        app(req,res);
+      });
     }
   });
 };\n`;
   } else if (serverOutputPath) {
-    bootstrapScript = `exports.handle = require('./${serverOutputPath}/main.js').app();\n`;
+    bootstrapScript = `const app = ${
+      serverEntry?.endsWith(".mjs")
+        ? `import(\`./${serverOutputPath}/${serverEntry}\`)`
+        : `Promise.resolve(require('./${serverOutputPath}/${serverEntry}'))`
+    }.then(server => server.app());
+exports.handle = (req,res) => app.then(it => it(req,res));\n`;
   } else {
     bootstrapScript = `exports.handle = (res, req) => req.sendStatus(404);\n`;
     rewriteSource = posix.join(baseHref, "__image__");