json-c parser, getting ng add working

jamesdaniels · jamesdaniels · commit 18ce3ba1663a · 2021-05-17T20:12:49.000-04:00
diff --git a/package.json b/package.json
@@ -65,7 +65,8 @@
     "tslib": "^1.10.0 || ^2.0.0",
     "ws": "^7.2.1",
     "xhr2": "^0.1.4",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.11.4",
+    "jsonc-parser": "^3.0.0"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.1",
diff --git a/sample/.firebaserc b/sample/.firebaserc
@@ -11,4 +11,4 @@
   "projects": {
     "default": "aftest-94085"
   }
-}
+}
diff --git a/sample/angular.json b/sample/angular.json
@@ -134,7 +134,22 @@
             "main": "server.ts",
             "tsConfig": "tsconfig.server.json",
             "bundleDependencies": true,
-            "externalDependencies": [ ],
+            "externalDependencies": [
+              "firebase",
+              "@firebase/app",
+              "@firebase/analytics",
+              "@firebase/auth",
+              "@firebase/component",
+              "@firebase/database",
+              "@firebase/firestore",
+              "@firebase/functions",
+              "@firebase/installations",
+              "@firebase/messaging",
+              "@firebase/storage",
+              "@firebase/performance",
+              "@firebase/remote-config",
+              "@firebase/util"
+            ],
             "sourceMap": true,
             "optimization": false
           },
@@ -181,11 +196,7 @@
         "deploy": {
           "builder": "@angular/fire:deploy",
           "options": {
-            "ssr": true,
-            "functionsNodeVersion": 12,
-            "functionsRuntimeOptions": {
-              "memory": "1GB"
-            }
+            "ssr": true
           }
         }
       }
@@ -195,4 +206,4 @@
   "cli": {
     "analytics": "cf8320c3-bce0-480d-a971-68484635f481"
   }
-}
+}
diff --git a/sample/firebase.json b/sample/firebase.json
@@ -15,14 +15,6 @@
               "value": "public,max-age=31536000,immutable"
             }
           ]
-        }, {
-          "source": "*-sw.js",
-          "headers": [
-            {
-              "key": "Cache-Control",
-              "value": "no-cache"
-            }
-          ]
         }
       ],
       "rewrites": [
@@ -56,4 +48,4 @@
       "enabled": true
     }
   }
-}
+}
diff --git a/sample/package.json b/sample/package.json
@@ -62,13 +62,15 @@
     "inquirer-autocomplete-prompt": "^1.0.1",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
+    "jsonc-parser": "^3.0.0",
     "karma": "~6.3.2",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
+    "open": "^7.0.3",
     "ts-node": "~9.0.0",
     "tslint": "~6.1.3",
     "typescript": "~4.2.4"
   }
-}
+}
diff --git a/sample/yarn.lock b/sample/yarn.lock
@@ -236,7 +236,7 @@
     tslib "^2.1.0"
 
 "@angular/fire@../dist/packages-dist":
-  version "6.1.4"
+  version "6.1.5"
   dependencies:
     tslib "^2.0.0"
 
@@ -7127,7 +7127,7 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
-is-wsl@^2.2.0:
+is-wsl@^2.1.1, is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -7430,7 +7430,7 @@ json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
-jsonc-parser@3.0.0:
+jsonc-parser@3.0.0, jsonc-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
   integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
@@ -8855,6 +8855,14 @@ open@^6.3.0:
   dependencies:
     is-wsl "^1.1.0"
 
+open@^7.0.3:
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
+  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
+  dependencies:
+    is-docker "^2.0.0"
+    is-wsl "^2.1.1"
+
 openapi3-ts@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/openapi3-ts/-/openapi3-ts-1.4.0.tgz#679d5a24be0efc36f5de4fc2c4b8513663e16f65"
diff --git a/src/schematics/deploy/actions.jasmine.ts b/src/schematics/deploy/actions.jasmine.ts
@@ -130,7 +130,6 @@ describe('Deploy Angular apps', () => {
       try {
         await deploy(firebaseMock, context, STATIC_BUILD_TARGET, undefined, undefined, { preview: false  });
       } catch (e) {
-        console.log(e);
         expect(e.message).toMatch(/Cannot find firebase project/);
       }
     });
diff --git a/src/schematics/deploy/schema.json b/src/schematics/deploy/schema.json
@@ -1,6 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "FirebaseDeploySchema",
+  // Include id field to remain compatible with older Angular
   "id": "FirebaseDeploySchema",
   "title": "Firebase Deploy",
   "description": "Ng Deploy target options for Firebase.",
diff --git a/src/schematics/ng-add-ssr.ts b/src/schematics/ng-add-ssr.ts
@@ -99,7 +99,7 @@ export function generateFirebaseJson(
 export const addFirebaseFunctionsDependencies = (tree: Tree, context: SchematicContext) => {
   addDependencies(
     tree,
-    {...defaultDependencies, ...firebaseFunctionsDependencies},
+    firebaseFunctionsDependencies,
     context
   );
 };
diff --git a/src/schematics/ng-add.ts b/src/schematics/ng-add.ts
@@ -1,6 +1,5 @@
 import { SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
 import { NodePackageInstallTask, RunSchematicTask } from '@angular-devkit/schematics/tasks';
-import { JsonParseMode, parseJson } from '@angular-devkit/core';
 import { listProjects, projectPrompt, projectTypePrompt } from './utils';
 import { Workspace } from './interfaces';
 import { DeployOptions, NgAddNormalizedOptions } from './ng-add-common';
@@ -19,12 +18,13 @@ function getWorkspace(
   }
   const content = configBuffer.toString();
 
+  const { parse } = (require('jsonc-parser') as typeof import('jsonc-parser'));
+
   let workspace: Workspace;
   try {
-    workspace = (parseJson(
+    workspace = parse(
       content,
-      JsonParseMode.Loose
-    ) as {}) as Workspace;
+    ) as Workspace;
   } catch (e) {
     throw new SchematicsException(`Could not parse angular.json: ` + e.message);
   }
@@ -103,14 +103,14 @@ export const ngAdd = (options: DeployOptions) => (
   context: SchematicContext
 ) => {
 
+  addFirebaseHostingDependencies(host, context);
+
   const {project} = getProject(options, host);
 
   return projectTypePrompt(project).then(
     ({ universalProject }: { universalProject: boolean }) => {
       if (universalProject) {
         addFirebaseFunctionsDependencies(host, context);
-      } else {
-        addFirebaseHostingDependencies(host, context);
       }
       const projectOptions: DeployOptions & { isUniversalProject: boolean } = {
         ...options,
diff --git a/src/schematics/versions.json b/src/schematics/versions.json
@@ -6,7 +6,8 @@
         "fuzzy": { "dev": true, "version": "0.0.0"},
         "inquirer": { "dev": true, "version": "0.0.0"},
         "inquirer-autocomplete-prompt": { "dev": true, "version": "0.0.0"},
-        "open": { "dev": true, "version": "0.0.0"}
+        "open": { "dev": true, "version": "0.0.0"},
+        "jsonc-parser": { "dev": true, "version": "0.0.0" }
     },
     "firebaseFunctions": {
         "firebase-admin": { "dev": true, "version": "0.0.0" },

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@`
`11`	`11`	`"projects": {`
`12`	`12`	`"default": "aftest-94085"`
`13`	`13`	`}`
`14`		`-}`
	`14`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,6 @@`
`15`	`15`	`"value": "public,max-age=31536000,immutable"`
`16`	`16`	`}`
`17`	`17`	`]`
`18`		`- }, {`
`19`		`- "source": "*-sw.js",`
`20`		`- "headers": [`
`21`		`- {`
`22`		`- "key": "Cache-Control",`
`23`		`- "value": "no-cache"`
`24`		`- }`
`25`		`- ]`
`26`	`18`	`}`
`27`	`19`	`],`
`28`	`20`	`"rewrites": [`
`@@ -56,4 +48,4 @@`
`56`	`48`	`"enabled": true`
`57`	`49`	`}`
`58`	`50`	`}`
`59`		`-}`
	`51`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ describe('Deploy Angular apps', () => {`
`130`	`130`	`try {`
`131`	`131`	`await deploy(firebaseMock, context, STATIC_BUILD_TARGET, undefined, undefined, { preview: false });`
`132`	`132`	`} catch (e) {`
`133`		`- console.log(e);`
`134`	`133`	`expect(e.message).toMatch(/Cannot find firebase project/);`
`135`	`134`	`}`
`136`	`135`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "http://json-schema.org/draft-07/schema",`
`3`	`3`	`"$id": "FirebaseDeploySchema",`
	`4`	`+ // Include id field to remain compatible with older Angular`
`4`	`5`	`"id": "FirebaseDeploySchema",`
`5`	`6`	`"title": "Firebase Deploy",`
`6`	`7`	`"description": "Ng Deploy target options for Firebase.",`