build: fix test failure with latest CLI version (#24820)

crisbeto · web-flow · commit 5abde9e810b1 · 2022-04-22T10:54:57.000+02:00
We have a test that verifies that we're able to read workspaces in JSON5 format. The devkit appears to have switched to `jsonc-parse` for the config file parsing which only supports comments in JSON, not trailing commas and unquoted keys. These changes adjust our test to account for the new parsing behavior.
diff --git a/package.json b/package.json
@@ -68,11 +68,11 @@
     "zone.js": "~0.11.5"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "14.0.0-next.9",
-    "@angular-devkit/core": "14.0.0-next.9",
-    "@angular-devkit/schematics": "14.0.0-next.9",
+    "@angular-devkit/build-angular": "14.0.0-next.11",
+    "@angular-devkit/core": "14.0.0-next.11",
+    "@angular-devkit/schematics": "14.0.0-next.11",
     "@angular/bazel": "14.0.0-next.14",
-    "@angular/cli": "14.0.0-next.9",
+    "@angular/cli": "14.0.0-next.11",
     "@angular/compiler-cli": "14.0.0-next.14",
     "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#4b4f4e4269a93c14f511c087bb14cdbc58a5ca70",
     "@angular/localize": "14.0.0-next.14",
@@ -143,7 +143,7 @@
     "@octokit/rest": "18.3.5",
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
-    "@schematics/angular": "14.0.0-next.9",
+    "@schematics/angular": "14.0.0-next.11",
     "@types/babel__core": "^7.1.18",
     "@types/browser-sync": "^2.26.3",
     "@types/fs-extra": "^9.0.13",
diff --git a/src/cdk/schematics/utils/project-tsconfig-paths.spec.ts b/src/cdk/schematics/utils/project-tsconfig-paths.spec.ts
@@ -27,24 +27,24 @@ describe('project tsconfig paths', () => {
     );
   });
 
-  it('should be able to read workspace configuration which is using JSON5 features', async () => {
+  it('should be able to read workspace configuration which is using JSONC features', async () => {
     testTree.create('/my-build-config.json', '');
     testTree.create(
       '/angular.json',
       `{
-      // Comments, unquoted properties or trailing commas are only supported in JSON5.
-      version: 1,
-      projects: {
-        with_tests: {
-          targets: {
-            build: {
-              options: {
-                tsConfig: './my-build-config.json',
+      // Comments are only supported in JSONC.
+      "version": 1,
+      "projects": {
+        "with_tests": {
+          "targets": {
+            "build": {
+              "options": {
+                "tsConfig": "./my-build-config.json"
               }
             }
           }
         }
-      },
+      }
     }`,
     );
 
diff --git a/yarn.lock b/yarn.lock
@@ -17,14 +17,6 @@
     "@angular-devkit/core" "14.0.0-next.11"
     rxjs "6.6.7"
 
-"@angular-devkit/architect@0.1400.0-next.9":
-  version "0.1400.0-next.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1400.0-next.9.tgz#97b68b08c4babdfd0467366f5fe761c68198bb44"
-  integrity sha512-u5rSvPyIU1XolXoyaMcwVFgj+8SvAYwuA0rWttDUi58KQJa5bfga7yVNPUT9thMVMIigEkds9UG2TEf1FWBANA==
-  dependencies:
-    "@angular-devkit/core" "14.0.0-next.9"
-    rxjs "6.6.7"
-
 "@angular-devkit/build-angular@14.0.0-next.11":
   version "14.0.0-next.11"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-14.0.0-next.11.tgz#e7e6438d72dcd17f0ad6ef11a8827c921c339ea4"
@@ -95,76 +87,6 @@
   optionalDependencies:
     esbuild "0.14.36"
 
-"@angular-devkit/build-angular@14.0.0-next.9":
-  version "14.0.0-next.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-14.0.0-next.9.tgz#d6b274bf635047ec38c863c8af1dfb3c432106ed"
-  integrity sha512-QZtXGv0fq/GfvZaPFOlE+JM4twI50rpYOrm1Z3+pTZN57/ALrdMZc2z0I2i1YmiMH/v8EoiM1uOmLN4HnDxcPw==
-  dependencies:
-    "@ampproject/remapping" "2.1.2"
-    "@angular-devkit/architect" "0.1400.0-next.9"
-    "@angular-devkit/build-webpack" "0.1400.0-next.9"
-    "@angular-devkit/core" "14.0.0-next.9"
-    "@babel/core" "7.17.9"
-    "@babel/generator" "7.17.9"
-    "@babel/helper-annotate-as-pure" "7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "7.16.8"
-    "@babel/plugin-transform-async-to-generator" "7.16.8"
-    "@babel/plugin-transform-runtime" "7.17.0"
-    "@babel/preset-env" "7.16.11"
-    "@babel/runtime" "7.17.9"
-    "@babel/template" "7.16.7"
-    "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "14.0.0-next.9"
-    ansi-colors "4.1.1"
-    babel-loader "8.2.4"
-    babel-plugin-istanbul "6.1.1"
-    browserslist "^4.9.1"
-    cacache "16.0.4"
-    copy-webpack-plugin "10.2.4"
-    critters "0.0.16"
-    css-loader "6.7.1"
-    esbuild-wasm "0.14.36"
-    glob "7.2.0"
-    https-proxy-agent "5.0.0"
-    inquirer "8.2.2"
-    jsonc-parser "3.0.0"
-    karma-source-map-support "1.4.0"
-    less "4.1.2"
-    less-loader "10.2.0"
-    license-webpack-plugin "4.0.2"
-    loader-utils "3.2.0"
-    mini-css-extract-plugin "2.6.0"
-    minimatch "5.0.1"
-    open "8.4.0"
-    ora "5.4.1"
-    parse5-html-rewriting-stream "6.0.1"
-    piscina "3.2.0"
-    postcss "8.4.12"
-    postcss-import "14.1.0"
-    postcss-loader "6.2.1"
-    postcss-preset-env "7.4.3"
-    regenerator-runtime "0.13.9"
-    resolve-url-loader "5.0.0"
-    rxjs "6.6.7"
-    sass "1.50.0"
-    sass-loader "12.6.0"
-    semver "7.3.6"
-    source-map-loader "3.0.1"
-    source-map-support "0.5.21"
-    stylus "0.57.0"
-    stylus-loader "6.2.0"
-    terser "5.12.1"
-    text-table "0.2.0"
-    tree-kill "1.2.2"
-    tslib "2.3.1"
-    webpack "5.72.0"
-    webpack-dev-middleware "5.3.1"
-    webpack-dev-server "4.8.1"
-    webpack-merge "5.8.0"
-    webpack-subresource-integrity "5.1.0"
-  optionalDependencies:
-    esbuild "0.14.36"
-
 "@angular-devkit/build-webpack@0.1400.0-next.11":
   version "0.1400.0-next.11"
   resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1400.0-next.11.tgz#8cbdd0140749e19f4eb28f005ef841e3eb4f5e3d"
@@ -173,14 +95,6 @@
     "@angular-devkit/architect" "0.1400.0-next.11"
     rxjs "6.6.7"
 
-"@angular-devkit/build-webpack@0.1400.0-next.9":
-  version "0.1400.0-next.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1400.0-next.9.tgz#5a65347a00aa9dd4d7b60ac6a3855ef5e0de9f1e"
-  integrity sha512-O4xzexGG5XiMPBBxYqL602k7TDdOlfVx2mgSRsm6M9Yi7VBzUhErrFOmv9roA8lj5c+vvz8iNpdykiTFgA2+wg==
-  dependencies:
-    "@angular-devkit/architect" "0.1400.0-next.9"
-    rxjs "6.6.7"
-
 "@angular-devkit/core@14.0.0-next.11":
   version "14.0.0-next.11"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-14.0.0-next.11.tgz#29a10e3a7dc15affbdc26a246ec6f30ed826486f"
@@ -192,24 +106,12 @@
     rxjs "6.6.7"
     source-map "0.7.3"
 
-"@angular-devkit/core@14.0.0-next.9":
-  version "14.0.0-next.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-14.0.0-next.9.tgz#64e14c132babe43368b50ea0711eba2c950ced5f"
-  integrity sha512-bw1jmhCMGQK1S/XZ8SB2LGGkGn1j3v9TAkHs3EwM6bBYKSgLPKj9rEnRSz7GArZ+uLU7KVXYWJWxmuWfH0e/LQ==
-  dependencies:
-    ajv "8.11.0"
-    ajv-formats "2.1.1"
-    fast-json-stable-stringify "2.1.0"
-    magic-string "0.26.1"
-    rxjs "6.6.7"
-    source-map "0.7.3"
-
-"@angular-devkit/schematics@14.0.0-next.9":
-  version "14.0.0-next.9"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-14.0.0-next.9.tgz#258d82931e0e5ecff2905910eb7701d7992a36ea"
-  integrity sha512-vXr6J0GswTuNXz7RyhkmOlnUsQJ1OfjhiXAXMd3rP6GsmH4erJXuVVeYBwxBqi4dwAdwL0EHMy5tu603BKMaGA==
+"@angular-devkit/schematics@14.0.0-next.11":
+  version "14.0.0-next.11"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-14.0.0-next.11.tgz#8acdb26a51697ab580feba94342286d51c481e17"
+  integrity sha512-x8F+yUYodxNcMsGhutOvwpd7lv0aUHgIiQOdGMzmfSuITm5/ENs/DaXBtg6VetbRDePttVYAoQXykcDgdJV35g==
   dependencies:
-    "@angular-devkit/core" "14.0.0-next.9"
+    "@angular-devkit/core" "14.0.0-next.11"
     jsonc-parser "3.0.0"
     magic-string "0.26.1"
     ora "5.4.1"
@@ -240,15 +142,15 @@
     "@angular/core" "^13.0.0 || ^14.0.0-0"
     reflect-metadata "^0.1.13"
 
-"@angular/cli@14.0.0-next.9":
-  version "14.0.0-next.9"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-14.0.0-next.9.tgz#bca542488948a872a0b5282e591de2ce623e7ec6"
-  integrity sha512-uTScUIcFE5Fp41uLjS5jYVaAZdO0dXzF44QN2U8j11XfYGbTL2a5gLdFHbvprjA3g10lOQh22hTuamVzbaCqfg==
+"@angular/cli@14.0.0-next.11":
+  version "14.0.0-next.11"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-14.0.0-next.11.tgz#93f2205b2fd9f82a43fb646d7ebe7da83377cc9e"
+  integrity sha512-wKbkc56gJ/sAQrgT8keQsotUhr/+CK2zqY8Ab+GHjAdiP07cIuocP3PELoluGlDNxraqilUSgQwjqxsRcdPluw==
   dependencies:
-    "@angular-devkit/architect" "0.1400.0-next.9"
-    "@angular-devkit/core" "14.0.0-next.9"
-    "@angular-devkit/schematics" "14.0.0-next.9"
-    "@schematics/angular" "14.0.0-next.9"
+    "@angular-devkit/architect" "0.1400.0-next.11"
+    "@angular-devkit/core" "14.0.0-next.11"
+    "@angular-devkit/schematics" "14.0.0-next.11"
+    "@schematics/angular" "14.0.0-next.11"
     "@yarnpkg/lockfile" "1.1.0"
     ansi-colors "4.1.1"
     debug "4.3.4"
@@ -261,7 +163,7 @@
     ora "5.4.1"
     pacote "13.1.1"
     resolve "1.22.0"
-    semver "7.3.6"
+    semver "7.3.7"
     symbol-observable "4.0.0"
     uuid "8.3.2"
     yargs "17.4.1"
@@ -322,7 +224,6 @@
 
 "@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#4b4f4e4269a93c14f511c087bb14cdbc58a5ca70":
   version "0.0.0-63547286e1423fe55df2e4b8a93b435f982f52a1"
-  uid "4b4f4e4269a93c14f511c087bb14cdbc58a5ca70"
   resolved "https://github.com/angular/dev-infra-private-builds.git#4b4f4e4269a93c14f511c087bb14cdbc58a5ca70"
   dependencies:
     "@angular-devkit/build-angular" "14.0.0-next.11"
@@ -2373,11 +2274,6 @@
   resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-14.0.0-next.11.tgz#f5be27ab37b6d7097693a59c1f0a6be66f3a37f3"
   integrity sha512-oph82/ud1tFtkTL6iqq6MDxPMxrX1lfnZgyorYlYx7rxw6j3SZpjFRCP19UUUlNisqIMLZXCeor0+IXeOlposA==
 
-"@ngtools/webpack@14.0.0-next.9":
-  version "14.0.0-next.9"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-14.0.0-next.9.tgz#3806bdf6ff0944e289cdcf74995cd592fa3e086b"
-  integrity sha512-T9J2RUZOzdLm1j3sLu/17OkPwTloCN9d2hxCbDyWLkjwvFz4DVdEfHtotLQ5KPqhv91nAoEmoCqf96CwKds2qA==
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2714,13 +2610,13 @@
     colors "~1.2.1"
     string-argv "~0.3.1"
 
-"@schematics/angular@14.0.0-next.9":
-  version "14.0.0-next.9"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-14.0.0-next.9.tgz#b0b981f54f9d0f94ddefb2ce7a12583113fdcd83"
-  integrity sha512-Ktevb4JxU/WoQ6LcmHl28dDD59ZSA0AkOeYHXFuwn88R0vNkgG++TaXvMgHuWEGdNvulK7tSF/gVITZ58ukmaw==
+"@schematics/angular@14.0.0-next.11":
+  version "14.0.0-next.11"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-14.0.0-next.11.tgz#e707c19a389c5621444b7f0fdf9f98699c4d033c"
+  integrity sha512-CsKgUjrAaFj3CFFZjOmFtieupmXRFORbOSkfWMJuLMZlqD7VUdsAd50VUwho6NwnrrsrpruVnEXlbVgKfZ3hcQ==
   dependencies:
-    "@angular-devkit/core" "14.0.0-next.9"
-    "@angular-devkit/schematics" "14.0.0-next.9"
+    "@angular-devkit/core" "14.0.0-next.11"
+    "@angular-devkit/schematics" "14.0.0-next.11"
     jsonc-parser "3.0.0"
 
 "@sindresorhus/is@^0.14.0":
@@ -7128,7 +7024,7 @@ fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -7796,18 +7692,6 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.2.0, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0, glob@~7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.1.tgz#00308f5c035aa0b2a447cd37ead267ddff1577d3"
@@ -7831,6 +7715,18 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0, glob@~7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-agent@^2.1.12:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc"
@@ -9998,7 +9894,7 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.0, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
   version "7.8.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.8.1.tgz#68ee3f4807a57d2ba185b7fd90827d5c21ce82bb"
   integrity sha512-E1v547OCgJvbvevfjgK9sNKIVXO96NnsTsFPBlg4ZxjhsJSODoH9lk8Bm0OxvHNm6Vm5Yqkl/1fErDxhYL8Skg==
@@ -12811,15 +12707,6 @@ sass-lookup@^3.0.0:
   dependencies:
     commander "^2.16.0"
 
-sass@1.50.0:
-  version "1.50.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.50.0.tgz#3e407e2ebc53b12f1e35ce45efb226ea6063c7c8"
-  integrity sha512-cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-    immutable "^4.0.0"
-    source-map-js ">=0.6.2 <2.0.0"
-
 sass@1.50.1, sass@^1.50.1:
   version "1.50.1"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.50.1.tgz#e9b078a1748863013c4712d2466ce8ca4e4ed292"
@@ -12966,13 +12853,6 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.6:
-  version "7.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.6.tgz#5d73886fb9c0c6602e79440b97165c29581cbb2b"
-  integrity sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==
-  dependencies:
-    lru-cache "^7.4.0"
-
 semver@7.3.7, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@~7.3.0:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
