build: update build scripts to no longer build View Engine output (#43431)

devversion · dylhunn · commit fcd958dd9fb6 · 2021-10-01T18:28:42.000Z
Removes View Engine compilation from the package builder script. For v13, we can no longer ship View Engine packages. PR Close #43431
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,8 +39,7 @@ var_4_win: &cache_key_win_fallback v1-angular-win-node-14-{{ checksum "month.txt
 var_5: &components_repo_unit_tests_cache_key v1-angular-components-{{ checksum "month.txt" }}-d090617912da8e70aa336aa5b4d804b1b535402e
 var_6: &components_repo_unit_tests_cache_key_fallback v1-angular-components-{{ checksum "month.txt" }}
 
-# Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
-# `build-ivy-npm-packages`.
+# Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages`.
 # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
 # https://circleci.com/blog/deep-diving-into-circleci-workspaces/
 var_7: &workspace_location ~/
@@ -543,24 +542,6 @@ jobs:
             - ~/bazel_repository_cache
             - ~/.cache/bazelisk
 
-  # Build the ivy npm packages.
-  build-ivy-npm-packages:
-    executor:
-      name: default-executor
-      resource_class: xlarge
-    steps:
-      - custom_attach_workspace
-      - init_environment
-      - run: node scripts/build/build-ivy-npm-packages.js
-
-      # Save the npm packages from //packages/... for other workflow jobs to read
-      - persist_to_workspace:
-          root: *workspace_location
-          paths:
-            - ng/dist/packages-dist-ivy-aot
-            - ng/dist/angular-in-memory-web-api-dist-ivy-aot
-            - ng/dist/zone.js-dist-ivy-aot
-
   # This job creates compressed tarballs (`.tgz` files) for all Angular packages and stores them as
   # build artifacts. This makes it easy to try out changes from a PR build for testing purposes.
   # More info CircleCI build artifacts: https://circleci.com/docs/2.0/artifacts
@@ -848,9 +829,6 @@ workflows:
       - build-npm-packages:
           requires:
             - setup
-      - build-ivy-npm-packages:
-          requires:
-            - setup
       - legacy-unit-tests-saucelabs:
           requires:
             - setup
@@ -892,7 +870,6 @@ workflows:
             # Get the artifacts to publish from the build-packages-dist job
             # since the publishing script expects the legacy outputs layout.
             - build-npm-packages
-            - build-ivy-npm-packages
             - legacy-unit-tests-saucelabs
       - components-repo-unit-tests:
           requires:
diff --git a/scripts/build/angular-in-memory-web-api.js b/scripts/build/angular-in-memory-web-api.js
@@ -34,7 +34,7 @@ function buildAngularInMemoryWebApiPackage(destDir) {
   console.info(`${scriptPath}:`);
   console.info('  Building angular-in-memory-web-api npm package');
   console.info('##############################');
-  exec(`${bazelCmd} build //packages/misc/angular-in-memory-web-api:npm_package`);
+  exec(`${bazelCmd} build //packages/misc/angular-in-memory-web-api:npm_package --config=ivy`);
 
   // Create the output directory.
   const absDestDir = resolve(baseDir, destDir);
diff --git a/scripts/build/build-ivy-npm-packages.js b/scripts/build/build-ivy-npm-packages.js
diff --git a/scripts/build/build-packages-dist.js b/scripts/build/build-packages-dist.js
@@ -15,7 +15,7 @@ const {buildZoneJsPackage} = require('./zone-js-builder');
 
 
 // Build the legacy (view engine) npm packages into `dist/packages-dist/`.
-buildTargetPackages('dist/packages-dist', false, 'Production');
+buildTargetPackages('dist/packages-dist', 'Production');
 
 // Build the `angular-in-memory-web-api` npm package into `dist/angular-in-memory-web-api-dist/`,
 // because it might be needed by other scripts/targets.
diff --git a/scripts/build/package-builder.js b/scripts/build/package-builder.js
@@ -60,12 +60,11 @@ module.exports = {
  *
  * @param {string} destDir Path to the output directory into which we copy the npm packages.
  * This path should either be absolute or relative to the project root.
- * @param {boolean} enableIvy True, if Ivy should be used.
  * @param {string} description Human-readable description of the build.
  * @param {boolean?} isRelease True, if the build should be stamped for a release.
  * @returns {Array<{name: string, outputPath: string}} A list of packages built.
  */
-function buildTargetPackages(destDir, enableIvy, description, isRelease = false) {
+function buildTargetPackages(destDir, description, isRelease = false) {
   console.info('##################################');
   console.info(`${scriptPath}:`);
   console.info('  Building @angular/* npm packages');
@@ -93,8 +92,8 @@ function buildTargetPackages(destDir, enableIvy, description, isRelease = false)
 
   // Use either `--config=snapshot` or `--config=release` so that builds are created with the
   // correct embedded version info.
-  exec(`${bazelCmd} build --config=${isRelease ? 'release' : 'snapshot'} --config=${
-      enableIvy ? 'ivy' : 'view-engine'} ${targets.join(' ')}`);
+  exec(`${bazelCmd} build --config=${isRelease ? 'release' : 'snapshot'} --config=ivy ${
+      targets.join(' ')}`);
 
   // Create the output directory.
   const absDestDir = resolve(baseDir, destDir);
diff --git a/scripts/ci/publish-build-artifacts.sh b/scripts/ci/publish-build-artifacts.sh
@@ -130,11 +130,6 @@ function publishAllBuilds() {
   local latestTag=`getLatestTag`
 
   publishPackages $GIT_SCHEME dist/packages-dist $CUR_BRANCH "${latestTag}+${shortSha}"
-
-  # don't publish ivy builds on non-master branch
-  if [[ "${CI_BRANCH-}" == "master" ]]; then
-    publishPackages $GIT_SCHEME dist/packages-dist-ivy-aot "${CUR_BRANCH}-ivy-aot" "${latestTag}-ivy-aot+${shortSha}"
-  fi
 }
 
 # See docs/DEVELOPER.md for help
