Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ node_repositories(
package_json = ["//:package.json"],
)

load("@build_bazel_rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")

# This call sets up another repository for Node 12.x used in integration tests. This
# allows us to ensure our schematic code works with NodeJS v12 LTS. The Node v12.x
# version is not fetched unless explicitly requested by the tests.
nodejs_register_toolchains(
name = "node12",
node_version = "12.22.0",
)

load("//tools:integration.bzl", "create_npm_package_archive_build_file")

yarn_install(
Expand Down
21 changes: 0 additions & 21 deletions integration/ng-add/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,3 @@ node_integration_test(
"requires-network",
],
)

node_integration_test(
name = "test_node12",
srcs = glob(["**/*"]),
commands = [
# Note: We use a cache folder within the integration test as otherwise
# the NPM package mapped archive would be cached in the system.
# See: https://github.com/yarnpkg/yarn/issues/2165.
# TODO(devversion): determine if a solution/workaround could live in the test runner.
"yarn install --cache-folder .yarn_cache_folder/",
"yarn ng add @angular/material",
"yarn test",
],
node_repository = "node12_host",
npm_packages = npmPackageMappings,
setup_chromium = True,
tags = [
# This test relies on `yarn` so there needs to be internet access.
"requires-network",
],
)
19 changes: 0 additions & 19 deletions integration/ng-update-v13/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,3 @@ node_integration_test(
"requires-network",
],
)

node_integration_test(
name = "test_node12",
srcs = glob(["**/*"]),
commands = [
# Note: We use a cache folder within the integration test as otherwise
# the NPM package mapped archive would be cached in the system.
# See: https://github.com/yarnpkg/yarn/issues/2165.
# TODO(devversion): determine if a solution/workaround could live in the test runner.
"yarn install --cache-folder .yarn_cache_folder/",
"yarn test",
],
node_repository = "node12_host",
npm_packages = npmPackageMappings,
tags = [
# This test relies on `yarn` so there needs to be internet access.
"requires-network",
],
)
1 change: 1 addition & 0 deletions integration/ts-compat/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ write_file(
# The list contains NPM module names that resolve to the desired TypeScript version.
typescript_version_packages = [
"typescript-4.4",
"typescript-4.5",
"typescript",
]

Expand Down
41 changes: 21 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@
},
"version": "14.0.0-next.6",
"dependencies": {
"@angular/animations": "14.0.0-next.5",
"@angular/common": "14.0.0-next.5",
"@angular/compiler": "14.0.0-next.5",
"@angular/core": "14.0.0-next.5",
"@angular/forms": "14.0.0-next.5",
"@angular/platform-browser": "14.0.0-next.5",
"@angular/animations": "14.0.0-next.6",
"@angular/common": "14.0.0-next.6",
"@angular/compiler": "14.0.0-next.6",
"@angular/core": "14.0.0-next.6",
"@angular/forms": "14.0.0-next.6",
"@angular/platform-browser": "14.0.0-next.6",
"@types/google.maps": "^3.47.3",
"@types/youtube": "^0.0.46",
"material-components-web": "14.0.0-canary.9736ddce9.0",
Expand All @@ -67,17 +67,17 @@
"zone.js": "~0.11.5"
},
"devDependencies": {
"@angular-devkit/build-angular": "14.0.0-next.4",
"@angular-devkit/core": "14.0.0-next.4",
"@angular-devkit/schematics": "14.0.0-next.4",
"@angular/bazel": "14.0.0-next.5",
"@angular/cli": "14.0.0-next.4",
"@angular/compiler-cli": "14.0.0-next.5",
"@angular-devkit/build-angular": "14.0.0-next.5",
"@angular-devkit/core": "14.0.0-next.5",
"@angular-devkit/schematics": "14.0.0-next.5",
"@angular/bazel": "14.0.0-next.6",
"@angular/cli": "14.0.0-next.5",
"@angular/compiler-cli": "14.0.0-next.6",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#b6656cffbd46bb3637b09b08561e5f1a147603c9",
"@angular/localize": "14.0.0-next.5",
"@angular/platform-browser-dynamic": "14.0.0-next.5",
"@angular/platform-server": "14.0.0-next.5",
"@angular/router": "14.0.0-next.5",
"@angular/localize": "14.0.0-next.6",
"@angular/platform-browser-dynamic": "14.0.0-next.6",
"@angular/platform-server": "14.0.0-next.6",
"@angular/router": "14.0.0-next.6",
"@axe-core/webdriverjs": "^4.3.2",
"@babel/core": "^7.16.12",
"@bazel/bazelisk": "1.11.0",
Expand Down Expand Up @@ -142,7 +142,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.4",
"@schematics/angular": "14.0.0-next.5",
"@types/babel__core": "^7.1.18",
"@types/browser-sync": "^2.26.3",
"@types/fs-extra": "^9.0.13",
Expand Down Expand Up @@ -213,16 +213,17 @@
"tsickle": "0.39.1",
"tslint": "^6.1.3",
"tsutils": "^3.21.0",
"typescript": "~4.5.5",
"typescript": "~4.6.2",
"typescript-4.4": "npm:[email protected]",
"typescript-4.5": "npm:[email protected]",
"vrsource-tslint-rules": "6.0.0",
"yaml": "^1.10.2",
"yargs": "^17.3.1"
},
"resolutions": {
"@angular/dev-infra-private/typescript": "~4.5.2",
"@angular/dev-infra-private/typescript": "~4.6.2",
"browser-sync-client": "2.26.13",
"dgeni-packages/typescript": "4.5.2",
"dgeni-packages/typescript": "4.6.2",
"**/https-proxy-agent": "5.0.0"
}
}
2 changes: 1 addition & 1 deletion scripts/caretaking/firebase-functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"firebase-functions": "^3.11.0"
},
"devDependencies": {
"typescript": "^4.5.2",
"typescript": "^4.6.2",
"firebase-tools": "^8.6.0"
},
"private": true
Expand Down
2 changes: 1 addition & 1 deletion scripts/caretaking/firebase-functions/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4546,7 +4546,7 @@ typedarray-to-buffer@^3.1.5:
dependencies:
is-typedarray "^1.0.0"

typescript@^4.5.2:
typescript@^4.6.2:
version "4.6.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
Expand Down
Loading