Rename serverconfig to runconfig (#265)

FirebaseExtended · Oct 7, 2024 · f938deb · f938deb
1 parent 9719c22
commit f938deb
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/@apphosting/adapter-angular/e2e/run-local.ts b/packages/@apphosting/adapter-angular/e2e/run-local.ts
@@ -73,7 +73,7 @@ const tests = await Promise.all(
 
     const bundleYaml = parseYaml(readFileSync(join(cwd, ".apphosting/bundle.yaml")).toString());
 
-    const runCommand = bundleYaml.serverConfig.runCommand;
+    const runCommand = bundleYaml.runConfig.runCommand;
 
     if (typeof runCommand !== "string") {
       throw new Error("runCommand must be a string");

diff --git a/packages/@apphosting/adapter-angular/package.json b/packages/@apphosting/adapter-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apphosting/adapter-angular",
-  "version": "17.2.9",
+  "version": "17.2.10",
   "main": "dist/index.js",
   "description": "Experimental addon to the Firebase CLI to add web framework support",
   "repository": {

diff --git a/packages/@apphosting/adapter-angular/src/bin/build.spec.ts b/packages/@apphosting/adapter-angular/src/bin/build.spec.ts
@@ -36,7 +36,7 @@ describe("build commands", () => {
       "dist/test/browser/browserfile": "",
       "dist/test/server/server.mjs": "",
       ".apphosting/bundle.yaml": `version: v1
-serverConfig:
+runConfig:
   runCommand: node dist/test/server/server.mjs
   environmentVariables: []
 metadata:

diff --git a/packages/@apphosting/adapter-angular/src/utils.ts b/packages/@apphosting/adapter-angular/src/utils.ts
@@ -193,7 +193,7 @@ async function generateBundleYaml(
   await mkdir(dirname(opts.bundleYamlPath));
   const outputBundle: OutputBundleConfig = {
     version: "v1",
-    serverConfig: {
+    runConfig: {
       runCommand: `node ${normalize(relative(cwd, opts.serverFilePath))}`,
       environmentVariables: generateEnvVars(angularVersion),
     },

diff --git a/packages/@apphosting/adapter-nextjs/e2e/run-local.ts b/packages/@apphosting/adapter-nextjs/e2e/run-local.ts
@@ -49,7 +49,7 @@ await promiseSpawn("node", [buildScript], {
 
 const bundleYaml = parseYaml(readFileSync(join(cwd, ".apphosting/bundle.yaml")).toString());
 
-const runCommand = bundleYaml.serverConfig.runCommand;
+const runCommand = bundleYaml.runConfig.runCommand;
 
 if (typeof runCommand !== "string") {
   throw new Error("runCommand must be a string");

diff --git a/packages/@apphosting/adapter-nextjs/package.json b/packages/@apphosting/adapter-nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apphosting/adapter-nextjs",
-  "version": "14.0.8",
+  "version": "14.0.9",
   "main": "dist/index.js",
   "description": "Experimental addon to the Firebase CLI to add web framework support",
   "repository": {

diff --git a/packages/@apphosting/adapter-nextjs/src/bin/build.spec.ts b/packages/@apphosting/adapter-nextjs/src/bin/build.spec.ts
@@ -49,7 +49,7 @@ describe("build commands", () => {
       ".next/standalone/.next/static/staticfile": "",
       ".next/standalone/server.js": "",
       ".apphosting/bundle.yaml": `version: v1
-serverConfig:
+runConfig:
   runCommand: node .next/standalone/server.js
 metadata:
   adapterPackageName: "@apphosting/adapter-nextjs"
@@ -105,7 +105,7 @@ metadata:
     };
     const expectedPartialYaml = {
       version: "v1",
-      serverConfig: { runCommand: "node .next/standalone/apps/next-app/server.js" },
+      runConfig: { runCommand: "node .next/standalone/apps/next-app/server.js" },
     };
     validateTestFiles(tmpDir, expectedFiles);
     validatePartialYamlContents(tmpDir, ".apphosting/bundle.yaml", expectedPartialYaml);

diff --git a/packages/@apphosting/adapter-nextjs/src/utils.ts b/packages/@apphosting/adapter-nextjs/src/utils.ts
@@ -137,7 +137,7 @@ async function generateBundleYaml(
   await mkdir(opts.outputDirectoryBasePath);
   const outputBundle: OutputBundleConfig = {
     version: "v1",
-    serverConfig: {
+    runConfig: {
       runCommand: `node ${normalize(relative(cwd, opts.serverFilePath))}`,
     },
     metadata: createMetadata(nextVersion),

diff --git a/packages/@apphosting/common/package.json b/packages/@apphosting/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apphosting/common",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Shared library code for App Hosting framework adapters",
   "author": {
     "name": "Firebase",

diff --git a/packages/@apphosting/common/src/index.ts b/packages/@apphosting/common/src/index.ts
@@ -3,12 +3,12 @@ import { spawn } from "child_process";
 // Output bundle metadata specifications to be written to bundle.yaml
 export interface OutputBundleConfig {
   version: "v1";
-  serverConfig: ServerConfig;
+  runConfig: RunConfig;
   metadata: Metadata;
 }
 
 // Fields needed to configure the App Hosting server
-export interface ServerConfig {
+export interface RunConfig {
   // Command to start the server (e.g. "node dist/index.js"). Assume this command is run from the root dir of the workspace
   runCommand: string;
   // Environment variables set when the app is run