Skip to content

Commit d379396

Browse files
JiaLiPassionAndrewKushnir
JiaLiPassion
authored and
AndrewKushnir
committed
test(zone.js): test zone.js package with tgz (angular#38649)
Zone.js 0.11.0 release an empty bundle, and now the npm_package tests all target bazel rule `npm_package`, but not `npm_package.pack`, and these two rules may generate different results, for example, Zone.js 0.11.0's issue is `package.json` define files array which make the bundle only include the files in the files array. So this PR install the zone.js package from the archive generated from `npm_package.pack` rule. PR Close angular#38649
1 parent ad372f2 commit d379396

File tree

23 files changed

+38
-24
lines changed

23 files changed

+38
-24
lines changed

‎.circleci/config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,8 @@ jobs:
553553
# Publish `zone.js` package.
554554
- run:
555555
name: Create artifacts for zone.js package
556-
command: ./scripts/ci/create-package-archives.sh $CI_BRANCH $CI_COMMIT $ZONEJS_PACKAGES_DIR $ZONEJS_PACKAGES_ARCHIVES_DIR
556+
# Need to remove the zone.js.tgz before archive
557+
command: rm -rf $ZONEJS_PACKAGES_DIR/archive && ./scripts/ci/create-package-archives.sh $CI_BRANCH $CI_COMMIT $ZONEJS_PACKAGES_DIR $ZONEJS_PACKAGES_ARCHIVES_DIR
557558
- store_artifacts:
558559
path: *zonejs_packages_archives_dir
559560
destination: zone.js

‎integration/bazel/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"reflect-metadata": "0.1.12",
1717
"rxjs": "file:../../node_modules/rxjs",
1818
"tslib": "file:../../node_modules/tslib",
19-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
19+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2020
},
2121
"devDependencies": {
2222
"@angular/bazel": "file:../../dist/packages-dist/bazel",

‎integration/cli-hello-world-ivy-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@angular/router": "file:../../dist/packages-dist/router",
2525
"rxjs": "file:../../node_modules/rxjs",
2626
"tslib": "file:../../node_modules/tslib",
27-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
27+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2828
},
2929
"devDependencies": {
3030
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",

‎integration/cli-hello-world-ivy-i18n/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"core-js": "file:../../node_modules/core-js",
2929
"rxjs": "file:../../node_modules/rxjs",
3030
"tslib": "file:../../node_modules/tslib",
31-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
31+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
3232
},
3333
"devDependencies": {
3434
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",

‎integration/cli-hello-world-ivy-minimal/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@angular/router": "file:../../dist/packages-dist/router",
2525
"rxjs": "file:../../node_modules/rxjs",
2626
"tslib": "file:../../node_modules/tslib",
27-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
27+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2828
},
2929
"devDependencies": {
3030
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",

‎integration/cli-hello-world-lazy-rollup/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@angular/router": "file:../../dist/packages-dist/router",
2020
"rxjs": "file:../../node_modules/rxjs",
2121
"tslib": "file:../../node_modules/tslib",
22-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
22+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2323
},
2424
"devDependencies": {
2525
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",

‎integration/cli-hello-world-lazy/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@angular/router": "file:../../dist/packages-dist/router",
2020
"rxjs": "file:../../node_modules/rxjs",
2121
"tslib": "file:../../node_modules/tslib",
22-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
22+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2323
},
2424
"devDependencies": {
2525
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",

‎integration/cli-hello-world/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@angular/router": "file:../../dist/packages-dist/router",
2424
"rxjs": "file:../../node_modules/rxjs",
2525
"tslib": "file:../../node_modules/tslib",
26-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
26+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2727
},
2828
"devDependencies": {
2929
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",

‎integration/dynamic-compiler/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"core-js": "file:../../node_modules/core-js",
4242
"rxjs": "file:../../node_modules/rxjs",
4343
"systemjs": "file:../../node_modules/systemjs",
44-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
44+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
4545
},
4646
"//resolutions-comment": "Ensure a single version of webdriver-manager which comes from root node_modules that has already run webdriver-manager update",
4747
"resolutions": {

‎integration/hello_world__closure/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"rxjs": "file:../../node_modules/rxjs",
1313
"typescript": "file:../../node_modules/typescript",
1414
"tslib": "file:../../node_modules/tslib",
15-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
15+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
1616
},
1717
"devDependencies": {
1818
"@types/jasmine": "file:../../node_modules/@types/jasmine",

‎integration/hello_world__systemjs_umd/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"rxjs": "file:../../node_modules/rxjs",
2121
"systemjs": "0.20.2",
2222
"typescript": "file:../../node_modules/typescript",
23-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
23+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2424
},
2525
"devDependencies": {
2626
"@types/jasmine": "file:../../node_modules/@types/jasmine",

‎integration/i18n/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"rxjs": "file:../../node_modules/rxjs",
1212
"typescript": "file:../../node_modules/typescript",
1313
"tslib": "file:../../node_modules/tslib",
14-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
14+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
1515
},
1616
"devDependencies": {
1717
"@types/jasmine": "file:../../node_modules/@types/jasmine",

‎integration/injectable-def/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@types/node": "file:../../node_modules/@types/node",
1515
"rxjs": "file:../../node_modules/rxjs",
1616
"typescript": "file:../../node_modules/typescript",
17-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
17+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
1818
},
1919
"devDependencies": {
2020
"@types/jasmine": "file:../../node_modules/@types/jasmine",

‎integration/ng_elements/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"rxjs": "file:../../node_modules/rxjs",
1313
"typescript": "file:../../node_modules/typescript",
1414
"tslib": "file:../../node_modules/tslib",
15-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
15+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
1616
},
1717
"devDependencies": {
1818
"@types/jasmine": "file:../../node_modules/@types/jasmine",

‎integration/ng_update/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
"@angular/upgrade": "file:../../dist/packages-dist/upgrade",
2323
"rxjs": "file:../../node_modules/rxjs",
2424
"typescript": "file:../../node_modules/typescript",
25-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
25+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2626
}
2727
}

‎integration/ng_update_migrations/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@angular/router": "file:../../dist/packages-dist/router",
2222
"rxjs": "file:../../node_modules/rxjs",
2323
"tslib": "file:../../node_modules/tslib",
24-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
24+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2525
},
2626
"devDependencies": {
2727
"@angular-devkit/build-angular": "file:../../node_modules/@angular-devkit/build-angular",

‎integration/ngcc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@types/node": "file:../../node_modules/@types/node",
1919
"rxjs": "file:../../node_modules/rxjs",
2020
"typescript": "file:../../node_modules/typescript",
21-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
21+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2222
},
2323
"devDependencies": {
2424
"@types/jasmine": "file:../../node_modules/@types/jasmine",

‎integration/platform-server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"express": "4.16.4",
2020
"rxjs": "file:../../node_modules/rxjs",
2121
"typescript": "file:../../node_modules/typescript",
22-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
22+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2323
},
2424
"devDependencies": {
2525
"@types/jasmine": "file:../../node_modules/@types/jasmine",

‎integration/service-worker-schema/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"@angular/core": "file:../../dist/packages-dist/core",
1212
"@angular/service-worker": "file:../../dist/packages-dist/service-worker",
1313
"rxjs": "file:../../node_modules/rxjs",
14-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
14+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
1515
}
1616
}

‎integration/terser/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
"rxjs": "file:../../node_modules/rxjs",
1313
"terser": "3.17.0",
1414
"typescript": "file:../../node_modules/typescript",
15-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
15+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
1616
}
1717
}

‎integration/typings_test_ts39/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@types/jasmine": "file:../../node_modules/@types/jasmine",
2121
"rxjs": "file:../../node_modules/rxjs",
2222
"typescript": "~3.9.5",
23-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
23+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2424
},
2525
"scripts": {
2626
"test": "tsc"

‎integration/typings_test_ts40/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@types/jasmine": "file:../../node_modules/@types/jasmine",
2121
"rxjs": "file:../../node_modules/rxjs",
2222
"typescript": "4.0.2",
23-
"zone.js": "file:../../dist/zone.js-dist/zone.js"
23+
"zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
2424
},
2525
"scripts": {
2626
"test": "tsc"

‎scripts/build/zone-js-builder.js

+15-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
'use strict';
1010

1111
const {resolve} = require('path');
12-
const {chmod, cp, mkdir, rm, test} = require('shelljs');
12+
const {chmod, cp, mkdir, mv, rm, test} = require('shelljs');
13+
const zonePackageJson = require('../../packages/zone.js/package.json');
1314
const {baseDir, bazelBin, bazelCmd, exec, scriptPath} = require('./package-builder');
1415

1516

@@ -45,10 +46,22 @@ function buildZoneJsPackage(destPath) {
4546
const buildOutputDir = `${bazelBin}/packages/zone.js/npm_package`;
4647
const distTargetDir = `${absDestPath}/zone.js`;
4748

48-
console.info(`# Copy artifacts to ${distTargetDir}`);
49+
// Also create an archive so we can test the package itself.
50+
// Currently, the `npm_package.pack` rule does not work on Windows, so run `npm pack` directly.
51+
exec(`npm pack ${buildOutputDir}`);
52+
53+
console.info(`# Copy npm_package artifacts to ${distTargetDir}`);
4954
rm('-rf', distTargetDir);
5055
cp('-R', buildOutputDir, distTargetDir);
5156
chmod('-R', 'u+w', distTargetDir);
5257

58+
// Copy `zone.js.tgz` to `destPath`, so we can test
59+
// the archive generated by the `npm_package.pack` rule.
60+
const distArchiveTargetDir = `${absDestPath}/archive`;
61+
console.info(`# Copy npm_package archive file to ${distArchiveTargetDir}`);
62+
rm('-rf', distArchiveTargetDir);
63+
mkdir('-p', distArchiveTargetDir);
64+
mv(`${baseDir}/zone.js-${zonePackageJson.version}.tgz`, `${distArchiveTargetDir}/zone.js.tgz`);
65+
5366
console.info('');
5467
}

0 commit comments

Comments
 (0)