Skip to content

build: no longer install snapshot build of @angular/bazel #23429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 23, 2021
Merged

build: no longer install snapshot build of @angular/bazel #23429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
198553a
build: no longer install snapshot build of `@angular/bazel`
devversion Aug 23, 2021
36a5ae4
build: add missing dependency for jsonc-parser
devversion Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
},
"version": "13.0.0-next.1",
"dependencies": {
"@angular/animations": "13.0.0-next.0",
"@angular/common": "13.0.0-next.0",
"@angular/compiler": "13.0.0-next.0",
"@angular/core": "13.0.0-next.0",
"@angular/forms": "13.0.0-next.0",
"@angular/platform-browser": "13.0.0-next.0",
"@angular/animations": "13.0.0-next.2",
"@angular/common": "13.0.0-next.2",
"@angular/compiler": "13.0.0-next.2",
"@angular/core": "13.0.0-next.2",
"@angular/forms": "13.0.0-next.2",
"@angular/platform-browser": "13.0.0-next.2",
"@types/googlemaps": "^3.43.1",
"@types/youtube": "^0.0.42",
"core-js-bundle": "^3.8.2",
Expand All @@ -72,16 +72,16 @@
"zone.js": "~0.11.3"
},
"devDependencies": {
"@angular-devkit/build-optimizer": "0.1300.0-next.0",
"@angular-devkit/core": "13.0.0-next.0",
"@angular-devkit/schematics": "13.0.0-next.0",
"@angular/bazel": "https://github.com/angular/bazel-builds.git#2566cc859235399edc72749a957f1cdcba2dc121",
"@angular/compiler-cli": "13.0.0-next.0",
"@angular-devkit/build-optimizer": "0.1300.0-next.1",
"@angular-devkit/core": "13.0.0-next.1",
"@angular-devkit/schematics": "13.0.0-next.1",
"@angular/bazel": "13.0.0-next.2",
"@angular/compiler-cli": "13.0.0-next.2",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#6254699cc7ccff62be948dc5edcdea87a936ff24",
"@angular/localize": "13.0.0-next.0",
"@angular/platform-browser-dynamic": "13.0.0-next.0",
"@angular/platform-server": "13.0.0-next.0",
"@angular/router": "13.0.0-next.0",
"@angular/localize": "13.0.0-next.2",
"@angular/platform-browser-dynamic": "13.0.0-next.2",
"@angular/platform-server": "13.0.0-next.2",
"@angular/router": "13.0.0-next.2",
"@axe-core/webdriverjs": "^4.1.0",
"@babel/core": "^7.13.10",
"@babel/traverse": "^7.13.0",
Expand Down Expand Up @@ -147,7 +147,7 @@
"@octokit/rest": "18.3.5",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
"@schematics/angular": "13.0.0-next.0",
"@schematics/angular": "13.0.0-next.1",
"@types/browser-sync": "^2.26.1",
"@types/fs-extra": "^9.0.5",
"@types/glob": "^7.1.3",
Expand Down Expand Up @@ -187,6 +187,7 @@
"inquirer": "^8.0.0",
"jasmine": "^3.6.0",
"jasmine-core": "^3.6.0",
"jsonc-parser": "^3.0.0",
"kagekiri": "^1.4.1",
"karma": "^4.4.1",
"karma-browserstack-launcher": "^1.6.0",
Expand Down
1 change: 1 addition & 0 deletions src/cdk/schematics/testing/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ts_library(
"@npm//@types/jasmine",
"@npm//@types/node",
"@npm//fs-extra",
"@npm//jsonc-parser",
"@npm//rxjs",
],
)
12 changes: 7 additions & 5 deletions src/cdk/schematics/testing/test-case-setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import {getSystemPath, JsonParseMode, parseJson, Path} from '@angular-devkit/core';

import {parse} from 'jsonc-parser';
import {getSystemPath, Path} from '@angular-devkit/core';
import {HostTree, Tree} from '@angular-devkit/schematics';
import {SchematicTestRunner, UnitTestTree} from '@angular-devkit/schematics/testing';
import {readFileSync} from 'fs-extra';
Expand Down Expand Up @@ -82,10 +84,10 @@ export async function createTestCaseSetup(migrationName: string, collectionPath:
});

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

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