mirror of
https://github.com/angular/angular.git
synced 2026-09-14 13:54:52 +08:00
build: remove local zone.js build from usage in integration tests (#62775)
Remove the local zone.js build from dependencies in the integration tests PR Close #62775
This commit is contained in:
committed by
Kristiyan Kostadinov
parent
7c06aca4f0
commit
b49c1f2394
@@ -2,12 +2,12 @@
|
||||
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
|
||||
# This file should be checked into version control along with the pnpm-lock.yaml file.
|
||||
.npmrc=-1406867100
|
||||
.pnpmfile.cjs=-1995198127
|
||||
.pnpmfile.cjs=-620026605
|
||||
adev/package.json=-1655040975
|
||||
adev/shared-docs/package.json=-1522726993
|
||||
adev/shared-docs/pipeline/api-gen/package.json=939673974
|
||||
integration/package.json=-239561259
|
||||
modules/package.json=598306279
|
||||
modules/package.json=1009074951
|
||||
package.json=-1574532337
|
||||
packages/animations/package.json=-678724831
|
||||
packages/benchpress/package.json=-2137616181
|
||||
@@ -25,8 +25,7 @@ packages/platform-browser/package.json=-1163479450
|
||||
packages/platform-server/package.json=-737662753
|
||||
packages/router/package.json=860819913
|
||||
packages/upgrade/package.json=16347051
|
||||
packages/zone.js/package.json=-1005735564
|
||||
pnpm-lock.yaml=502929596
|
||||
pnpm-workspace.yaml=1738525657
|
||||
pnpm-lock.yaml=-1127666539
|
||||
pnpm-workspace.yaml=1065599792
|
||||
tools/bazel/rules_angular_store/package.json=-239561259
|
||||
yarn.lock=-44463177
|
||||
|
||||
+4
-3
@@ -32,14 +32,15 @@ function readPackage(pkg, context) {
|
||||
}
|
||||
|
||||
Object.entries(pkg.peerDependencies).forEach(([key, version]) => {
|
||||
// Any package that has a peerDependency on rxjs, should instead treat the peerDependency as a
|
||||
// Any package that has a peerDependency on rxjs or zone.js, should instead treat the peerDependency as a
|
||||
// regular dependency.
|
||||
if (key === 'rxjs') {
|
||||
if (['rxjs', 'zone.js'].includes(key)) {
|
||||
pkg.dependencies = {
|
||||
...pkg.dependencies,
|
||||
'rxjs': version,
|
||||
[key]: version,
|
||||
};
|
||||
}
|
||||
|
||||
// Change all locally generated packages to directly depend on the other local packages, instead
|
||||
// of expecting them as peerDependencies automatically as we do not auto install peer deps.
|
||||
if (version === '0.0.0-PLACEHOLDER') {
|
||||
|
||||
@@ -128,7 +128,6 @@ npm_translate_lock(
|
||||
"//packages/platform-server:package.json",
|
||||
"//packages/router:package.json",
|
||||
"//packages/upgrade:package.json",
|
||||
"//packages/zone.js:package.json",
|
||||
"//tools/bazel/rules_angular_store:package.json",
|
||||
],
|
||||
npmrc = "//:.npmrc",
|
||||
|
||||
@@ -25,6 +25,7 @@ NPM_PACKAGE_ARCHIVES = [
|
||||
"@types/jasmine",
|
||||
"@types/jasminewd2",
|
||||
"@types/node",
|
||||
"zone.js",
|
||||
]
|
||||
|
||||
def npm_package_archive_label(package_name):
|
||||
|
||||
@@ -24,6 +24,6 @@
|
||||
"source-map": "0.7.6",
|
||||
"tslib": "2.8.1",
|
||||
"yargs": "18.0.0",
|
||||
"zone.js": "workspace:*"
|
||||
"zone.js": "0.15.1"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ UNPUBLISHED_PACKAGES = [
|
||||
ALL_PACKAGES = PUBLISHED_PACKAGES + UNPUBLISHED_PACKAGES
|
||||
|
||||
# Packages used by integration tests
|
||||
INTEGRATION_PACKAGES = _exclude_pkgs(PUBLISHED_PACKAGES, "angular-in-memory-web-api")
|
||||
INTEGRATION_PACKAGES = _exclude_pkgs(PUBLISHED_PACKAGES, "zone.js", "angular-in-memory-web-api")
|
||||
|
||||
# Package names under //packages that have `files_for_docgen` targets
|
||||
DOCS_ENTRYPOINTS = [
|
||||
|
||||
Generated
+249
-1963
File diff suppressed because it is too large
Load Diff
@@ -21,5 +21,4 @@ packages:
|
||||
- packages/elements/
|
||||
- packages/benchpress/
|
||||
- packages/upgrade/
|
||||
- packages/zone.js/
|
||||
- tools/bazel/rules_angular_store/
|
||||
|
||||
Reference in New Issue
Block a user