diff --git a/.circleci/config.yml b/.circleci/config.yml index 4c04a7091d9..402f9b8c729 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -677,6 +677,10 @@ jobs: # variable. It needs to be hardcoded here, because env variables interpolation is # not supported. - '/tmp/angular-components-repo' + - run: + # Copy zone.js package to dist/packages-dist, so `angular/components` can also use the local zone.js build. + name: Setting up zone.js release packages. + command: cp -r dist/zone.js-dist/zone.js dist/packages-dist/ - run: # Updates the `angular/components` `package.json` file to refer to the release output # inside the `packages-dist` directory. diff --git a/scripts/ci/update-framework-deps-to-dist-packages.js b/scripts/ci/update-framework-deps-to-dist-packages.js index 6f96714d8b4..51b8cff5f83 100644 --- a/scripts/ci/update-framework-deps-to-dist-packages.js +++ b/scripts/ci/update-framework-deps-to-dist-packages.js @@ -8,7 +8,7 @@ /* * This script updates a package.json file by replacing all dependencies and devDependencies - * such that all packages from the @angular scope point to the packages-dist directory. + * such that all packages from the @angular scope and zone.js point to the packages-dist directory. * * Please be aware that updating of versions might introduce compatibility issues. For instance, * if a peer dependency of Angular, e.g. "typescript" changes, the package.json that is updated @@ -29,9 +29,11 @@ const updated = []; const skipped = []; function updateDeps(dependencies) { for (const packageName of Object.keys(dependencies)) { - // We're only interested to update packages in the `@angular` scope. The shared dev-infra - // package is not updated as it's not a package that is part of the Angular framework. - if (!packageName.startsWith('@angular/') || packageName === '@angular/dev-infra-private') { + // We're only interested to update packages in the `@angular` scope and `zone.js`. + // The shared dev-infra package is not updated as it's not a package that is part of + // the Angular framework. + if ((!packageName.startsWith('@angular/') && packageName !== 'zone.js') || + packageName === '@angular/dev-infra-private') { continue; } @@ -51,7 +53,6 @@ function updateDeps(dependencies) { } } - // Update dependencies from @angular scope to those in the packages-dist folder updateDeps(packageJson.dependencies); updateDeps(packageJson.devDependencies);