Skip to content

build: update to Angular v18 next #28734

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
crisbeto merged 1 commit into from
Mar 18, 2024
Merged

build: update to Angular v18 next #28734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions integration/harness-e2e-cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
load("@bazel_skylib//lib:dicts.bzl", "dicts")
load("//tools:integration.bzl", "CLI_PROJECT_MAPPINGS")
load("//tools:defaults.bzl", "node_integration_test")

npmPackageMappings = dicts.add(
dicts.omit(
CLI_PROJECT_MAPPINGS,
# Exclude rxjs, because we want to use the version from the package.json.
# Version 6.x that the rest of the project uses has some packaging issues. See:
# https://github.com/angular/components/pull/25241#issuecomment-1178701633
["@npm//:rxjs_archive"],
),
# TODO(crisbeto): temporarily disabled until Tooling makes an 18.x release.
# dicts.omit(
# CLI_PROJECT_MAPPINGS,
# # Exclude rxjs, because we want to use the version from the package.json.
# # Version 6.x that the rest of the project uses has some packaging issues. See:
# # https://github.com/angular/components/pull/25241#issuecomment-1178701633
# ["@npm//:rxjs_archive"],
# ),
{},
{
"//src/cdk:npm_package_archive": "@angular/cdk",
"//src/material:npm_package_archive": "@angular/material",
Expand Down
24 changes: 12 additions & 12 deletions integration/harness-e2e-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
},
"private": true,
"dependencies": {
"@angular/animations": "file:../../node_modules/@angular/animations",
"@angular/animations": "^17.3.0",
"@angular/cdk": "file:../../dist/releases/cdk",
"@angular/common": "file:../../node_modules/@angular/common",
"@angular/compiler": "file:../../node_modules/@angular/compiler",
"@angular/core": "file:../../node_modules/@angular/core",
"@angular/forms": "file:../../node_modules/@angular/forms",
"@angular/common": "^17.3.0",
"@angular/compiler": "^17.3.0",
"@angular/core": "^17.3.0",
"@angular/forms": "^17.3.0",
"@angular/material": "file:../../dist/releases/material",
"@angular/platform-browser": "file:../../node_modules/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:../../node_modules/@angular/platform-browser-dynamic",
"@angular/router": "file:../../node_modules/@angular/router",
"@angular/platform-browser": "^17.3.0",
"@angular/platform-browser-dynamic": "^17.3.0",
"@angular/router": "^17.3.0",
"rxjs": "^7.5.5",
"tslib": "^2.3.0",
"zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",
"@angular/cli": "file:../../node_modules/@angular/cli",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@angular-devkit/build-angular": "^17.3.0",
"@angular/cli": "^17.3.0",
"@angular/compiler-cli": "^17.3.0",
"@types/jasmine": "~3.10.0",
"@types/node": "^12.11.1",
"@types/selenium-webdriver": "3.0.19",
Expand All @@ -44,7 +44,7 @@
"karma-jasmine-html-reporter": "~1.7.0",
"selenium-webdriver": "3.6.0",
"ts-node": "~10.9.1",
"typescript": "file:../../node_modules/typescript",
"typescript": "~5.3.3",
"wait-on": "^6.0.0"
}
}
Loading