Skip to content

Commit e9091fe

Browse files
authored
build: no longer install snapshot build of @angular/bazel (#23429)
* build: no longer install snapshot build of `@angular/bazel` No longer uses a snapshot build for `@angular/bazel`. We previously used a snapshot build in order to update to v4 of `rules_nodejs`. * build: add missing dependency for jsonc-parser Sets up the jsonc-parser dependency in the BUILD bazel file.
1 parent b761dbc commit e9091fe

File tree

4 files changed

+137
-144
lines changed

4 files changed

+137
-144
lines changed

package.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
},
5656
"version": "13.0.0-next.1",
5757
"dependencies": {
58-
"@angular/animations": "13.0.0-next.0",
59-
"@angular/common": "13.0.0-next.0",
60-
"@angular/compiler": "13.0.0-next.0",
61-
"@angular/core": "13.0.0-next.0",
62-
"@angular/forms": "13.0.0-next.0",
63-
"@angular/platform-browser": "13.0.0-next.0",
58+
"@angular/animations": "13.0.0-next.2",
59+
"@angular/common": "13.0.0-next.2",
60+
"@angular/compiler": "13.0.0-next.2",
61+
"@angular/core": "13.0.0-next.2",
62+
"@angular/forms": "13.0.0-next.2",
63+
"@angular/platform-browser": "13.0.0-next.2",
6464
"@types/googlemaps": "^3.43.1",
6565
"@types/youtube": "^0.0.42",
6666
"core-js-bundle": "^3.8.2",
@@ -72,16 +72,16 @@
7272
"zone.js": "~0.11.3"
7373
},
7474
"devDependencies": {
75-
"@angular-devkit/build-optimizer": "0.1300.0-next.0",
76-
"@angular-devkit/core": "13.0.0-next.0",
77-
"@angular-devkit/schematics": "13.0.0-next.0",
78-
"@angular/bazel": "https://github.com/angular/bazel-builds.git#2566cc859235399edc72749a957f1cdcba2dc121",
79-
"@angular/compiler-cli": "13.0.0-next.0",
75+
"@angular-devkit/build-optimizer": "0.1300.0-next.1",
76+
"@angular-devkit/core": "13.0.0-next.1",
77+
"@angular-devkit/schematics": "13.0.0-next.1",
78+
"@angular/bazel": "13.0.0-next.2",
79+
"@angular/compiler-cli": "13.0.0-next.2",
8080
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#6254699cc7ccff62be948dc5edcdea87a936ff24",
81-
"@angular/localize": "13.0.0-next.0",
82-
"@angular/platform-browser-dynamic": "13.0.0-next.0",
83-
"@angular/platform-server": "13.0.0-next.0",
84-
"@angular/router": "13.0.0-next.0",
81+
"@angular/localize": "13.0.0-next.2",
82+
"@angular/platform-browser-dynamic": "13.0.0-next.2",
83+
"@angular/platform-server": "13.0.0-next.2",
84+
"@angular/router": "13.0.0-next.2",
8585
"@axe-core/webdriverjs": "^4.1.0",
8686
"@babel/core": "^7.13.10",
8787
"@babel/traverse": "^7.13.0",
@@ -147,7 +147,7 @@
147147
"@octokit/rest": "18.3.5",
148148
"@rollup/plugin-babel": "^5.3.0",
149149
"@rollup/plugin-commonjs": "^18.0.0",
150-
"@schematics/angular": "13.0.0-next.0",
150+
"@schematics/angular": "13.0.0-next.1",
151151
"@types/browser-sync": "^2.26.1",
152152
"@types/fs-extra": "^9.0.5",
153153
"@types/glob": "^7.1.3",
@@ -187,6 +187,7 @@
187187
"inquirer": "^8.0.0",
188188
"jasmine": "^3.6.0",
189189
"jasmine-core": "^3.6.0",
190+
"jsonc-parser": "^3.0.0",
190191
"kagekiri": "^1.4.1",
191192
"karma": "^4.4.1",
192193
"karma-browserstack-launcher": "^1.6.0",

src/cdk/schematics/testing/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ts_library(
2121
"@npm//@types/jasmine",
2222
"@npm//@types/node",
2323
"@npm//fs-extra",
24+
"@npm//jsonc-parser",
2425
"@npm//rxjs",
2526
],
2627
)

src/cdk/schematics/testing/test-case-setup.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {getSystemPath, JsonParseMode, parseJson, Path} from '@angular-devkit/core';
8+
9+
import {parse} from 'jsonc-parser';
10+
import {getSystemPath, Path} from '@angular-devkit/core';
911
import {HostTree, Tree} from '@angular-devkit/schematics';
1012
import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
1113
import {readFileSync} from 'fs-extra';
@@ -82,10 +84,10 @@ export async function createTestCaseSetup(migrationName: string, collectionPath:
8284
});
8385

8486
const testAppTsconfigPath = 'projects/cdk-testing/tsconfig.app.json';
85-
// Parse TypeScript configuration files with JSON5 as they could contain comments or
86-
// unquoted properties.
87-
const testAppTsconfig =
88-
parseJson(appTree.readContent(testAppTsconfigPath), JsonParseMode.Json5) as any;
87+
// Parse TypeScript configuration files with JSONC (like the CLI does) as the
88+
// config files could contain comments or trailing commas
89+
const testAppTsconfig = parse(appTree.readContent(testAppTsconfigPath), [],
90+
{allowTrailingComma: true});
8991

9092
// include all TypeScript files in the project. Otherwise all test input
9193
// files won't be part of the program and cannot be migrated.

0 commit comments

Comments
 (0)