Merge branch 'main' into chalosalvador/upgrade-nextjs-15

Author: chalosalvador

.github/workflows/test.yml

@@ -56,7 +56,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        node: [18, 20]
+        node: [18, 20, 22]
       fail-fast: false
     name: Test Node ${{ matrix.node }}
     steps:
@@ -94,6 +94,7 @@ jobs:
         run: rsync -a artifact/ packages
       - name: Test
         run: npm run test
+        continue-on-error: ${{ matrix.node == 22 }}
 
   lint:
     runs-on: ubuntu-latest

CODEOWNERS

@@ -4,7 +4,8 @@
 
 # App Hosting Platform Adapters code
 # TODO add group for App Hosting
-/packages/@apphosting/adapter-*/ @Yuangwang @sjjj986 @jamesdaniels @tonyjhuang @blidd-google 
+/packages/@apphosting/adapter-*/ @Yuangwang @sjjj986 @jamesdaniels @tonyjhuang @blidd-google @taeold
+/packages/@apphosting/common/ @Yuangwang @sjjj986 @jamesdaniels @tonyjhuang @blidd-google @taeold
 
 # Web Frameworks code
 /packages/@apphosting/build/ @FirebaseExtended/firebase-full-time-employees @FirebaseExtended/monogram

package-lock.json

@@ -12,7 +12,7 @@
   },
   "workspaces": [
     "packages/@apphosting/*",
-    "packages/create-next-on-firebase/*",
+    "packages/create-next-on-firebase",
     "packages/firebase-frameworks"
   ],
   "devDependencies": {

package.json

@@ -1 +0,0 @@
-/e2e

packages/@apphosting/adapter-angular/.gitignore

@@ -0,0 +1 @@
+runs

packages/@apphosting/adapter-angular/e2e/.gitignore

@@ -0,0 +1,36 @@
+import assert from "assert";
+import { posix } from "path";
+
+export const host = process.env.HOST;
+
+if (!host) {
+  throw new Error("HOST environment variable expected");
+}
+
+const isLocalhost = new URL(host).hostname === "localhost";
+
+describe("common", () => {
+  it("/", async () => {
+    const response = await fetch(host);
+    assert.ok(response.ok);
+    assert.equal(response.headers.get("content-type")?.toLowerCase(), "text/html; charset=utf-8");
+    assert.equal(response.headers.get("cache-control"), null);
+  });
+
+  it("/favicon.ico", async () => {
+    const response = await fetch(posix.join(host, "favicon.ico"));
+    assert.ok(response.ok);
+    assert.equal(response.headers.get("content-type"), "image/x-icon");
+    assert.equal(
+      response.headers.get("cache-control"),
+      isLocalhost ? "public, max-age=31536000" : "public,max-age=60",
+    );
+  });
+
+  it(`404`, async () => {
+    const response = await fetch(posix.join(host, Math.random().toString()));
+    assert.ok(response.ok);
+    assert.equal(response.headers.get("content-type")?.toLowerCase(), "text/html; charset=utf-8");
+    assert.equal(response.headers.get("cache-control"), null);
+  });
+});

packages/@apphosting/adapter-angular/e2e/common.spec.ts

@@ -0,0 +1,153 @@
+import { cp, readFile, writeFile } from "fs/promises";
+import promiseSpawn from "@npmcli/promise-spawn";
+import { dirname, join, relative } from "path";
+import { fileURLToPath } from "url";
+import { parse as parseYaml } from "yaml";
+import { spawn } from "child_process";
+import fsExtra from "fs-extra";
+
+const { readFileSync, mkdirp, readJSON, writeJSON, rmdir } = fsExtra;
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+const starterTemplateDir = "../../../starters/angular/basic";
+
+const errors: any[] = [];
+
+await rmdir(join(__dirname, "runs"), { recursive: true }).catch(() => undefined);
+
+console.log("\nBuilding and starting test projects in parallel...");
+
+const tests = await Promise.all(
+  [
+    [false, false],
+    [false, true],
+    [true, false],
+    [true, true],
+  ].map(async ([enableSSR, enableSSG]) => {
+    const runId = Math.random().toString().split(".")[1];
+    const cwd = join(__dirname, "runs", runId);
+    await mkdirp(cwd);
+
+    console.log(`[${runId}] Copying ${starterTemplateDir} to working directory`);
+    await cp(starterTemplateDir, cwd, { recursive: true });
+
+    const packageJSON = await readJSON(join(cwd, "package.json"));
+    packageJSON.name = `firebase-app-hosting-angular-${runId}`;
+    await writeJSON(join(cwd, "package.json"), packageJSON);
+
+    console.log(`[${runId}] > npm ci --silent --no-progress`);
+    await promiseSpawn("npm", ["ci", "--silent", "--no-progress"], {
+      cwd,
+      stdio: "inherit",
+      shell: true,
+    });
+
+    const angularJSON = JSON.parse((await readFile(join(cwd, "angular.json"))).toString());
+
+    if (!enableSSR) {
+      console.log(`[${runId}] Disabling SSR option in angular.json`);
+      angularJSON.projects["firebase-app-hosting-angular"].architect.build.options.ssr = false;
+    }
+    if (!enableSSG) {
+      console.log(`[${runId}] Disabling prerender option in angular.json`);
+      angularJSON.projects["firebase-app-hosting-angular"].architect.build.options.prerender =
+        false;
+    }
+    await writeFile(join(cwd, "angular.json"), JSON.stringify(angularJSON, null, 2));
+
+    const buildScript = relative(cwd, join(__dirname, "../dist/bin/build.js"));
+    console.log(`[${runId}] > node ${buildScript}`);
+
+    const frameworkVersion = JSON.parse(
+      readFileSync(join(cwd, "node_modules", "@angular", "core", "package.json"), "utf-8"),
+    ).version;
+    await promiseSpawn("node", [buildScript], {
+      cwd,
+      stdio: "inherit",
+      shell: true,
+      env: {
+        ...process.env,
+        FRAMEWORK_VERSION: frameworkVersion,
+      },
+    });
+
+    const bundleYaml = parseYaml(readFileSync(join(cwd, ".apphosting/bundle.yaml")).toString());
+
+    const runCommand = bundleYaml.runConfig.runCommand;
+
+    if (typeof runCommand !== "string") {
+      throw new Error("runCommand must be a string");
+    }
+
+    const [runScript, ...runArgs] = runCommand.split(" ");
+    let resolveHostname: (it: string) => void;
+    let rejectHostname: () => void;
+    const hostnamePromise = new Promise<string>((resolve, reject) => {
+      resolveHostname = resolve;
+      rejectHostname = reject;
+    });
+    const port = 8080 + Math.floor(Math.random() * 1000);
+    console.log(`[${runId}] > PORT=${port} ${runCommand}`);
+    const run = spawn(runScript, runArgs, {
+      cwd,
+      shell: true,
+      env: {
+        ...process.env,
+        NODE_ENV: "production",
+        PORT: port.toString(),
+      },
+    });
+    run.stderr.on("data", (data) => console.error(data.toString()));
+    run.stdout.on("data", (data) => {
+      console.log(data.toString());
+      if (data.toString() === `Node Express server listening on http://localhost:${port}\n`) {
+        resolveHostname(`http://localhost:${port}`);
+      } else {
+        run.stdin.end();
+        run.kill("SIGKILL");
+      }
+    });
+    run.on("close", (code) => {
+      if (code) {
+        rejectHostname();
+      }
+    });
+    const host = await hostnamePromise;
+
+    return [host, run, enableSSR, enableSSG] as const;
+  }),
+);
+
+console.log("\n\n");
+
+for (const [host, run, enableSSR, enableSSG] of tests) {
+  try {
+    console.log(
+      `> HOST=${host}${enableSSR ? " SSR=1" : ""}${
+        enableSSG ? " SSG=1" : ""
+      } ts-mocha -p tsconfig.json e2e/*.spec.ts`,
+    );
+    await promiseSpawn("ts-mocha", ["-p", "tsconfig.json", "e2e/*.spec.ts"], {
+      shell: true,
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        SSR: enableSSR ? "1" : undefined,
+        SSG: enableSSG ? "1" : undefined,
+        HOST: host,
+      },
+    }).finally(() => {
+      run.stdin.end();
+      run.kill("SIGKILL");
+    });
+  } catch (e) {
+    errors.push(e);
+  }
+}
+
+if (errors.length) {
+  console.error(errors);
+  process.exit(1);
+}
+
+process.exit(0);

packages/@apphosting/adapter-angular/e2e/run-local.ts

@@ -0,0 +1,30 @@
+import assert from "assert";
+import { posix } from "path";
+
+const host = process.env.HOST;
+
+if (!host) {
+  throw new Error("HOST environment variable expected");
+}
+
+describe("single-page app", () => {
+  before(function () {
+    if (process.env.SSR || process.env.SSG) {
+      // eslint-disable-next-line @typescript-eslint/no-invalid-this
+      this.skip();
+    }
+  });
+
+  // eslint-disable-next-line prefer-arrow-callback
+  it("/", async () => {
+    const response = await fetch(host);
+    const body = await response.text();
+    assert(body.includes("<app-root></app-root>"));
+  });
+
+  it(`404`, async () => {
+    const response = await fetch(posix.join(host, Math.random().toString()));
+    const body = await response.text();
+    assert(body.includes("<app-root></app-root>"));
+  });
+});