angular · alexeagle · Mar 15, 2018 · Apr 13, 2018 · Apr 13, 2018 · Apr 13, 2018
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,8 +15,12 @@
 var_1: &docker_image angular/ngcontainer:0.2.0
 var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.2.0
 
+# Define common ENV vars
+var_3: &define_env_vars
+  run: echo "export PROJECT_ROOT=$(pwd)" >> $BASH_ENV
+
 # See remote cache documentation in /docs/BAZEL.md
-var_3: &setup-bazel-remote-cache
+var_4: &setup-bazel-remote-cache
   run:
     name: Start up bazel remote cache proxy
     command: ~/bazel-remote-proxy -backend circleci://
@@ -63,6 +67,7 @@ jobs:
     <<: *job_defaults
     resource_class: xlarge
     steps:
+      - *define_env_vars
       - checkout:
           <<: *post_checkout
       # See remote cache documentation in /docs/BAZEL.md
@@ -82,6 +87,10 @@ jobs:
       # NOTE: Angular developers should typically just bazel build //packages/... or bazel test //packages/...
       - run: bazel query --output=label //... | xargs bazel test
 
+      # We run the integration tests outside of Bazel for now.
+      # See comments inside this script.
+      - run: xvfb-run --auto-servernum ./integration/run_tests.sh
+
       # CircleCI will allow us to go back and view/download these artifacts from past builds.
       # Also we can use a service like https://buildsize.org/ to automatically track binary size of these artifacts.
       - store_artifacts:

diff --git a/.travis.yml b/.travis.yml
@@ -45,7 +45,6 @@ env:
   matrix:
     # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
     - CI_MODE=e2e
-    - CI_MODE=e2e_2
     - CI_MODE=js
     - CI_MODE=saucelabs_required
     # deactivated, see #19768

diff --git a/integration/README.md b/integration/README.md
@@ -51,18 +51,9 @@ you can install the package directly from `file:../../node_modules`.
 
 ## Running integration tests
 
-First you must run `build.sh` to create the current distribution.
-
-You can iterate on the tests by keeping the dist folder up-to-date.
-See the `package.json` of the test(s) you're debugging, to see which dist/ folders they install from.
-Then run the right `tsc --watch` command to keep those dist folders up-to-date, for example:
-
-```
-$ ./node_modules/.bin/tsc -p packages/core/tsconfig-build.json --watch
-```
-
-Now you can run the integration test, it will re-install from the dist/ folder on each run.
-
 ```
 $ ./integration/run_tests.sh
 ```
+
+The test runner will first re-build any stale npm packages, then `cd` into each
+subdirectory to execute the test.
diff --git a/integration/bazel/angular.tsconfig.json b/integration/bazel/angular.tsconfig.json
@@ -17,6 +17,6 @@
       "node_modules/@angular/bazel/**",
       "node_modules/@angular/compiler-cli/**",
       "node_modules/@angular/common/locales/**",
-      "node_modules/@angular/tsc-wrapped/**"
+      "node_modules/@angular/*/testing/**"
   ]
 }
diff --git a/...platform-server/integrationtest/README.md → integration/platform-server/README.md b/...platform-server/integrationtest/README.md → integration/platform-server/README.md
diff --git a/.../platform-server/integrationtest/build.sh → integration/platform-server/build.sh b/.../platform-server/integrationtest/build.sh → integration/platform-server/build.sh
diff --git a/...er/integrationtest/e2e/helloworld-spec.ts → ...on/platform-server/e2e/helloworld-spec.ts b/...er/integrationtest/e2e/helloworld-spec.ts → ...on/platform-server/e2e/helloworld-spec.ts
diff --git a/.../integrationtest/e2e/protractor.config.js → .../platform-server/e2e/protractor.config.js b/.../integrationtest/e2e/protractor.config.js → .../platform-server/e2e/protractor.config.js
diff --git a/...integrationtest/e2e/transferstate-spec.ts → ...platform-server/e2e/transferstate-spec.ts b/...integrationtest/e2e/transferstate-spec.ts → ...platform-server/e2e/transferstate-spec.ts
diff --git a/...-server/integrationtest/e2e/tsconfig.json → ...gration/platform-server/e2e/tsconfig.json b/...-server/integrationtest/e2e/tsconfig.json → ...gration/platform-server/e2e/tsconfig.json
diff --git a/...atform-server/integrationtest/e2e/util.ts → integration/platform-server/e2e/util.ts b/...atform-server/integrationtest/e2e/util.ts → integration/platform-server/e2e/util.ts
diff --git a/...tform-server/integrationtest/package.json → integration/platform-server/package.json b/...tform-server/integrationtest/package.json → integration/platform-server/package.json
@@ -8,27 +8,27 @@
     "url": "https://github.com/angular/angular.git"
   },
   "dependencies": {
-    "@angular/animations": "file:../../../dist/packages-dist/animations",
-    "@angular/common": "file:../../../dist/packages-dist/common",
-    "@angular/compiler": "file:../../../dist/packages-dist/compiler",
-    "@angular/compiler-cli": "file:../../../dist/packages-dist/compiler-cli",
-    "@angular/core": "file:../../../dist/packages-dist/core",
-    "@angular/http": "file:../../../dist/packages-dist/http",
-    "@angular/platform-browser": "file:../../../dist/packages-dist/platform-browser",
-    "@angular/platform-browser-dynamic": "file:../../../dist/packages-dist/platform-browser-dynamic",
-    "@angular/platform-server": "file:../../../dist/packages-dist/platform-server",
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/compiler": "file:../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/http": "file:../../dist/packages-dist/http",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "express": "^4.14.1",
-    "rxjs": "file:../../../node_modules/rxjs",
-    "typescript": "file:../../../node_modules/typescript",
-    "zone.js": "file:../../../node_modules/zone.js"
+    "rxjs": "file:../../node_modules/rxjs",
+    "typescript": "file:../../node_modules/typescript",
+    "zone.js": "file:../../node_modules/zone.js"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.41",
     "babel-core": "^6.23.1",
     "babel-loader": "^6.4.0",
     "babel-preset-es2015": "^6.22.0",
     "concurrently": "3.1.0",
-    "protractor": "file:../../../node_modules/protractor",
+    "protractor": "file:../../node_modules/protractor",
     "raw-loader": "^0.5.1",
     "webpack": "^2.2.1"
   },

diff --git a/...egrationtest/src/helloworld/app.server.ts → ...tform-server/src/helloworld/app.server.ts b/...egrationtest/src/helloworld/app.server.ts → ...tform-server/src/helloworld/app.server.ts
diff --git a/...ver/integrationtest/src/helloworld/app.ts → ...ion/platform-server/src/helloworld/app.ts b/...ver/integrationtest/src/helloworld/app.ts → ...ion/platform-server/src/helloworld/app.ts
diff --git a/.../integrationtest/src/helloworld/client.ts → .../platform-server/src/helloworld/client.ts b/.../integrationtest/src/helloworld/client.ts → .../platform-server/src/helloworld/client.ts
diff --git a/...t/src/helloworld/hello-world.component.ts → ...r/src/helloworld/hello-world.component.ts b/...t/src/helloworld/hello-world.component.ts → ...r/src/helloworld/hello-world.component.ts
diff --git a/...integrationtest/src/helloworld/index.html → ...platform-server/src/helloworld/index.html b/...integrationtest/src/helloworld/index.html → ...platform-server/src/helloworld/index.html
diff --git a/...form-server/integrationtest/src/server.ts → integration/platform-server/src/server.ts b/...form-server/integrationtest/src/server.ts → integration/platform-server/src/server.ts
diff --git a/...ationtest/src/transferstate/app.server.ts → ...rm-server/src/transferstate/app.server.ts b/...ationtest/src/transferstate/app.server.ts → ...rm-server/src/transferstate/app.server.ts
diff --git a/.../integrationtest/src/transferstate/app.ts → .../platform-server/src/transferstate/app.ts b/.../integrationtest/src/transferstate/app.ts → .../platform-server/src/transferstate/app.ts
diff --git a/...tegrationtest/src/transferstate/client.ts → ...atform-server/src/transferstate/client.ts b/...tegrationtest/src/transferstate/client.ts → ...atform-server/src/transferstate/client.ts
diff --git a/...egrationtest/src/transferstate/index.html → ...tform-server/src/transferstate/index.html b/...egrationtest/src/transferstate/index.html → ...tform-server/src/transferstate/index.html
diff --git a/...transferstate/transfer-state.component.ts → ...transferstate/transfer-state.component.ts b/...transferstate/transfer-state.component.ts → ...transferstate/transfer-state.component.ts
diff --git a/...form-server/integrationtest/tsconfig.json → integration/platform-server/tsconfig.json b/...form-server/integrationtest/tsconfig.json → integration/platform-server/tsconfig.json
diff --git a/.../integrationtest/webpack.client.config.js → .../platform-server/webpack.client.config.js b/.../integrationtest/webpack.client.config.js → .../platform-server/webpack.client.config.js
diff --git a/.../integrationtest/webpack.server.config.js → .../platform-server/webpack.server.config.js b/.../integrationtest/webpack.server.config.js → .../platform-server/webpack.server.config.js
diff --git a/integration/run_tests.sh b/integration/run_tests.sh
@@ -2,19 +2,47 @@
 
 set -e -o pipefail
 
-currentDir=$(cd $(dirname $0); pwd)
-cd ${currentDir}
+# see https://circleci.com/docs/2.0/env-vars/#circleci-built-in-environment-variables
+CI=${CI:-false}
 
+cd "$(dirname "$0")"
 
-readonly thisDir=$(cd $(dirname $0); pwd)
+# basedir is the workspace root
+readonly basedir=$(pwd)/..
+readonly bin=$(bazel info bazel-bin)
+
+echo "#################################"
+echo "Building @angular/* npm packages "
+echo "#################################"
+
+# Ideally these integration tests should run under bazel, and just list the npm
+# packages in their deps[].
+# Until then, we have to manually run bazel first to create the npm packages we
+# want to test.
+bazel query --output=label 'kind(.*_package, //packages/...)' \
+  | xargs bazel build
+
+# Allow this test to run even if dist/ doesn't exist yet.
+# Under Bazel we don't need to create the dist folder to run the integration tests
+[ -d "${basedir}/dist/packages-dist" ] || mkdir -p $basedir/dist/packages-dist
+# Each package is a subdirectory of bazel-bin/packages/
+for pkg in $(ls ${bin}/packages); do
+  # Skip any that don't have an "npm_package" target
+  if [ -d "${bin}/packages/${pkg}/npm_package" ]; then
+    echo "# Copy artifacts to dist/packages-dist/${pkg}"
+    rm -rf ${basedir}/dist/packages-dist/${pkg}
+    cp -R ${bin}/packages/${pkg}/npm_package ${basedir}/dist/packages-dist/${pkg}
+  fi
+done
 
 # Track payload size functions
 # TODO(alexeagle): finish migrating these to buildsize.org
-if [[ -v TRAVIS ]]; then
+if $CI; then
   # We don't install this by default because it contains some broken Bazel setup
-  # and also it's a very big dependency that we never use except on Travis.
+  # and also it's a very big dependency that we never use except when publishing
+  # payload sizes on CI.
   yarn add -D firebase-tools@3.12.0
-  source ../scripts/ci/payload-size.sh
+  source ${basedir}/scripts/ci/payload-size.sh
 fi
 
 # Workaround https://github.com/yarnpkg/yarn/issues/2165
@@ -35,24 +63,23 @@ for testDir in $(ls | grep -v node_modules) ; do
   (
     cd $testDir
     rm -rf dist
+    pwd
     yarn install --cache-folder ../$cache
     yarn test || exit 1
     # Track payload size for cli-hello-world and hello_world__closure and the render3 tests
     if [[ $testDir == cli-hello-world ]] || [[ $testDir == hello_world__closure ]] || [[ $testDir == hello_world__render3__closure ]] || [[ $testDir == hello_world__render3__rollup ]] || [[ $testDir == hello_world__render3__cli ]]; then
       if [[ $testDir == cli-hello-world ]] || [[ $testDir == hello_world__render3__cli ]]; then
         yarn build
       fi
-      if [[ -v TRAVIS ]]; then
-        trackPayloadSize "$testDir" "dist/*.js" true false "${thisDir}/_payload-limits.json"
-      fi
-    fi
-    if [[ -v TRAVIS ]]; then
-      # remove the temporary node modules directory to save space.
-      rm -rf node_modules
+      #if $CI; then
+      #  trackPayloadSize "$testDir" "dist/*.js" true false "${basedir}/integration/_payload-limits.json"
+      #fi
     fi
+    # remove the temporary node modules directory to keep the source folder clean.
+    rm -rf node_modules
   )
 done
 
-if [[ -v TRAVIS ]]; then
-  trackPayloadSize "umd" "../dist/packages-dist/*/bundles/*.umd.min.js" false false
-fi
+#if $CI; then
+#  trackPayloadSize "umd" "../dist/packages-dist/*/bundles/*.umd.min.js" false false
+#fi
diff --git a/packages/bazel/test/ng_package/example/package.json b/packages/bazel/test/ng_package/example/package.json
@@ -1,3 +1,4 @@
 {
-  "name": "example"
+  "name": "example",
+  "version": "0.0.0-PLACEHOLDER"
 }
diff --git a/packages/platform-server/integrationtest/.gitignore b/packages/platform-server/integrationtest/.gitignore
diff --git a/packages/platform-server/integrationtest/run_tests.sh b/packages/platform-server/integrationtest/run_tests.sh
diff --git a/scripts/ci/env.sh b/scripts/ci/env.sh
@@ -40,7 +40,6 @@ setEnvVar YARN_VERSION 1.3.2
 # Revision 494239 (which was part of Chrome 62.0.3186.0) is the last version that does not cause flakes. (Latest revision checked: 508578)
 setEnvVar CHROMIUM_VERSION 494239 # Chrome 62 linux stable, see https://www.chromium.org/developers/calendar
 setEnvVar CHROMEDRIVER_VERSION_ARG "--versions.chrome 2.33"
-setEnvVar BAZEL_VERSION 0.11.1
 setEnvVar SAUCE_CONNECT_VERSION 4.4.9
 setEnvVar ANGULAR_CLI_VERSION 1.6.3
 setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)

diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh
@@ -64,22 +64,6 @@ if [[ ${TRAVIS} &&
   travisFoldEnd "yarn-install.aio"
 fi
 
-# Install bazel
-if [[ ${TRAVIS} && ${CI_MODE} == "e2e_2" ]]; then
-  travisFoldStart "bazel-install"
-  (
-    mkdir tmp
-    cd tmp
-    curl --location --compressed https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh > bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
-    chmod +x bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
-    ./bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh --user
-    cd ..
-    rm -rf tmp
-  )
-  travisFoldEnd "bazel-install"
-fi
-
-
 # Install Chromium
 if [[ ${TRAVIS} &&
   ${CI_MODE} == "js" ||

diff --git a/scripts/ci/test-e2e-2.sh b/scripts/ci/test-e2e-2.sh
diff --git a/scripts/ci/test-e2e.sh b/scripts/ci/test-e2e.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-# First shard for the e2e tests. Balance it with runtime of test-e2e-2.sh
-
 set -u -e -o pipefail
 
 # Setup environment
@@ -17,7 +15,6 @@ travisFoldStart "test.e2e.check-cycle"
   $(npm bin)/gulp check-cycle
 travisFoldEnd "test.e2e.check-cycle"
 
-
 # Serve files for e2e tests
 (
   $(npm bin)/gulp serve &
@@ -33,3 +30,15 @@ travisFoldEnd "test.e2e.protractor-examples-e2e"
 travisFoldStart "test.e2e.protractor-perf"
   NODE_PATH=$NODE_PATH:./dist/all $(npm bin)/protractor ./protractor-perf.conf.js --bundles=true --dryrun
 travisFoldEnd "test.e2e.protractor-perf"
+
+# TODO(i): temporarily disable this test because we don't have rxjs backwards compatibility package
+#   and cdk+material are not yet compatible with rxjs v6
+#   uncomment when we have cdk and material releases compatible with rxjs v6
+#travisFoldStart "test.e2e.offlineCompiler"
+#  #TODO(alexeagle): move offline_compiler_test to integration/
+#  ${thisDir}/offline_compiler_test.sh
+#travisFoldEnd "test.e2e.offlineCompiler"
+
+travisFoldStart "test.e2e.source-maps"
+  ./node_modules/.bin/gulp source-map-test
+travisFoldEnd "test.e2e.source-maps"
diff --git a/scripts/ci/test.sh b/scripts/ci/test.sh
@@ -22,9 +22,6 @@ case ${CI_MODE} in
   e2e)
     ${thisDir}/test-e2e.sh
     ;;
-  e2e_2)
-    ${thisDir}/test-e2e-2.sh
-    ;;
   saucelabs_required)
     ${thisDir}/test-saucelabs.sh
     ;;

diff --git a/tools/bazel.rc b/tools/bazel.rc
@@ -28,6 +28,7 @@ build --watchfs
 # Release support             #
 ###############################
 
+# Releases should always be stamped with version control info
 build --workspace_status_command=./tools/bazel_stamp_vars.sh
 
 ###############################