Merge branch 'main' into temp-allow-node18fail

Yuangwang · web-flow · commit d142e15f2f4b · 2025-03-13T11:22:42.000-04:00
diff --git a/package-lock.json b/package-lock.json
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.12",
+  "version": "17.2.13",
   "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/utils.ts b/packages/@apphosting/adapter-angular/src/utils.ts
@@ -108,7 +108,8 @@ export function populateOutputBundleOptions(outputPaths: OutputPaths): OutputBun
 
 export function parseOutputBundleOptions(buildOutput: string): OutputBundleOptions {
   const strippedManifest = extractManifestOutput(buildOutput);
-  const parsedManifest = JSON.parse(strippedManifest) as string;
+  // TODO: add functional tests that test this flow
+  const parsedManifest = JSON.parse(strippedManifest.replace(/[\r\n]+/g, "")) as string;
   const manifest = buildManifestSchema.parse(parsedManifest);
   if (manifest["errors"].length > 0) {
     // errors when extracting manifest

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@apphosting/adapter-angular",`
`3`		`- "version": "17.2.12",`
	`3`	`+ "version": "17.2.13",`
`4`	`4`	`"main": "dist/index.js",`
`5`	`5`	`"description": "Experimental addon to the Firebase CLI to add web framework support",`
`6`	`6`	`"repository": {`