mirror of
https://github.com/angular/angular
synced 2026-05-24 09:28:37 +00:00
build: no longer rely on archive packages for integration tests (#62996)
Now that the packages are avaiable at the base node_modules we can treat local packages as normal packages and not leverage the archive package versions PR Close #62996
This commit is contained in:
parent
648bbb097e
commit
5802f8009e
7 changed files with 37 additions and 6 deletions
|
|
@ -55,6 +55,7 @@ packages/core/node_modules
|
|||
packages/core/test/bundling/node_modules
|
||||
packages/elements/node_modules
|
||||
packages/forms/node_modules
|
||||
packages/language-service/node_modules
|
||||
packages/platform-browser/node_modules
|
||||
packages/platform-server/node_modules
|
||||
packages/platform-browser-dynamic/node_modules
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ npm_translate_lock(
|
|||
"//packages/core/test/bundling:package.json",
|
||||
"//packages/elements:package.json",
|
||||
"//packages/forms:package.json",
|
||||
"//packages/language-service:package.json",
|
||||
"//packages/localize:package.json",
|
||||
"//packages/platform-browser:package.json",
|
||||
"//packages/platform-browser-dynamic:package.json",
|
||||
|
|
@ -218,7 +219,7 @@ http_archive(
|
|||
|
||||
git_repository(
|
||||
name = "devinfra",
|
||||
commit = "4d2f875ec29ee71e0fe1a349a99c5ab2ccb71e30",
|
||||
commit = "73442df90c353b4b777574ffac1ede88ee89ac4d",
|
||||
remote = "https://github.com/angular/dev-infra.git",
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
load("@devinfra//bazel/integration:index.bzl", "integration_test")
|
||||
load("//:packages.bzl", "INTEGRATION_PACKAGES")
|
||||
|
||||
NPM_PACKAGE_ARCHIVES = [
|
||||
NPM_PACKAGE_ARCHIVES = INTEGRATION_PACKAGES + [
|
||||
"@babel/core",
|
||||
"@rollup/plugin-babel",
|
||||
"@rollup/plugin-node-resolve",
|
||||
|
|
@ -65,9 +65,6 @@ def _ng_integration_test(name, setup_chromium = False, **kwargs):
|
|||
for pkg in NPM_PACKAGE_ARCHIVES:
|
||||
if pkg not in pinned_npm_packages:
|
||||
npm_packages["//:node_modules/%s/dir" % pkg] = pkg
|
||||
for pkg in INTEGRATION_PACKAGES:
|
||||
last_segment_name = pkg.split("/")[-1]
|
||||
npm_packages["//packages/%s:npm_package_archive" % last_segment_name] = pkg
|
||||
|
||||
integration_test(
|
||||
name = name,
|
||||
|
|
@ -87,6 +84,7 @@ def _ng_integration_test(name, setup_chromium = False, **kwargs):
|
|||
environment = environment,
|
||||
toolchains = toolchains,
|
||||
tool_mappings = {
|
||||
"@pnpm//:pnpm": "pnpm",
|
||||
"//:yarn_vendored": "yarn",
|
||||
"@nodejs_toolchains//:resolved_toolchain": "node",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@
|
|||
"@angular-devkit/core": "20.2.0-next.2",
|
||||
"@angular-devkit/schematics": "20.2.0-next.2",
|
||||
"@angular/animations": "workspace:*",
|
||||
"@angular/benchpress": "workspace: *",
|
||||
"@angular/build": "20.2.0-next.2",
|
||||
"@angular/cdk": "20.2.0-next.2",
|
||||
"@angular/cli": "20.2.0-next.2",
|
||||
|
|
@ -61,6 +62,8 @@
|
|||
"@angular/core": "workspace:*",
|
||||
"@angular/elements": "workspace:*",
|
||||
"@angular/forms": "workspace:*",
|
||||
"@angular/language-service": "workspace: *",
|
||||
"@angular/localize": "workspace: *",
|
||||
"@angular/material": "20.2.0-next.2",
|
||||
"@angular/platform-browser": "workspace:*",
|
||||
"@angular/platform-browser-dynamic": "workspace:*",
|
||||
|
|
@ -68,6 +71,7 @@
|
|||
"@angular/router": "workspace:*",
|
||||
"@angular/service-worker": "workspace:*",
|
||||
"@angular/ssr": "20.2.0-next.2",
|
||||
"@angular/upgrade": "workspace: *",
|
||||
"@babel/cli": "7.28.0",
|
||||
"@babel/core": "7.28.0",
|
||||
"@babel/generator": "7.28.0",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
|
||||
load("//tools:defaults.bzl", "pkg_npm")
|
||||
load("//tools:defaults2.bzl", "extract_types", "ts_config", "ts_project")
|
||||
load("//tools:defaults2.bzl", "extract_types", "npm_package", "ts_config", "ts_project")
|
||||
|
||||
package(default_visibility = ["//visibility:public"])
|
||||
|
||||
|
|
@ -79,3 +79,11 @@ pkg_npm(
|
|||
"//packages/language-service/bundles:language-service.js",
|
||||
],
|
||||
)
|
||||
|
||||
npm_package(
|
||||
name = "pkg",
|
||||
srcs = [":npm_package"],
|
||||
replace_prefixes = {
|
||||
"npm_package/": "",
|
||||
},
|
||||
)
|
||||
|
|
|
|||
|
|
@ -33,6 +33,9 @@ importers:
|
|||
'@angular/animations':
|
||||
specifier: workspace:*
|
||||
version: link:packages/animations
|
||||
'@angular/benchpress':
|
||||
specifier: 'workspace: *'
|
||||
version: link:packages/benchpress
|
||||
'@angular/build':
|
||||
specifier: 20.2.0-next.2
|
||||
version: 20.2.0-next.2(@angular/ssr@20.2.0-next.2)(@types/node@18.19.121)(chokidar@4.0.3)(jiti@1.21.7)(karma@6.4.4)(less@4.4.0)(postcss@8.5.6)(terser@5.43.1)(tslib@2.8.1)(tsx@4.20.3)(typescript@5.9.2)(yaml@2.8.0)
|
||||
|
|
@ -60,6 +63,12 @@ importers:
|
|||
'@angular/forms':
|
||||
specifier: workspace:*
|
||||
version: link:packages/forms
|
||||
'@angular/language-service':
|
||||
specifier: 'workspace: *'
|
||||
version: link:packages/language-service
|
||||
'@angular/localize':
|
||||
specifier: 'workspace: *'
|
||||
version: link:packages/localize
|
||||
'@angular/material':
|
||||
specifier: 20.2.0-next.2
|
||||
version: 20.2.0-next.2(@angular/cdk@20.2.0-next.2(rxjs@7.8.2))(rxjs@7.8.2)
|
||||
|
|
@ -81,6 +90,9 @@ importers:
|
|||
'@angular/ssr':
|
||||
specifier: 20.2.0-next.2
|
||||
version: 20.2.0-next.2
|
||||
'@angular/upgrade':
|
||||
specifier: 'workspace: *'
|
||||
version: link:packages/upgrade
|
||||
'@babel/cli':
|
||||
specifier: 7.28.0
|
||||
version: 7.28.0(@babel/core@7.28.0)
|
||||
|
|
@ -1034,6 +1046,8 @@ importers:
|
|||
specifier: ^2.3.0
|
||||
version: 2.8.1
|
||||
|
||||
packages/language-service: {}
|
||||
|
||||
packages/localize:
|
||||
dependencies:
|
||||
'@angular/compiler':
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ packages:
|
|||
- packages/core/
|
||||
- packages/core/test/bundling
|
||||
- packages/forms/
|
||||
- packages/language-service/
|
||||
- packages/platform-browser/
|
||||
- packages/platform-server/
|
||||
- packages/platform-browser-dynamic/
|
||||
|
|
@ -43,3 +44,7 @@ overrides:
|
|||
'@angular/forms': 'workspace:*'
|
||||
'@angular/elements': 'workspace:*'
|
||||
'@angular/animations': 'workspace:*'
|
||||
'@angular/benchpress': 'workspace: *'
|
||||
'@angular/language-service': 'workspace: *'
|
||||
'@angular/localize': 'workspace: *'
|
||||
'@angular/upgrade': 'workspace: *'
|
||||
|
|
|
|||
Loading…
Reference in a new issue