Merge pull request #55 from angular/master

Update upstream

Author: GulajavaMinistudio

.circleci/config.yml

@@ -0,0 +1,16 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/angular-cli
+    docker:
+      - image: angular/ngcontainer
+    steps:
+      - checkout
+      - restore_cache:
+          key: angular-cli-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - run: yarn --frozen-lockfile
+      - save_cache:
+          key: angular-cli-{{ .Branch }}-{{ checksum "yarn.lock" }}
+          paths:
+            - "node_modules"
+      - run: xvfb-run -a node tests/run_e2e.js --glob=tests/build/**

.travis.yml

@@ -8,11 +8,6 @@ cache:
   directories:
      - ./node_modules
 
-env:
-  global:
-    - DBUS_SESSION_BUS_ADDRESS=/dev/null
-
-
 matrix:
   fast_finish: true
   allow_failures:
@@ -32,19 +27,19 @@ matrix:
       env: test
     - node_js: "6"
       os: linux
-      script: node tests/run_e2e.js "--ignore=**/tests/build/**" --nb-shards=4 --shard=0 --nosilent
+      script: node tests/run_e2e.js --nb-shards=4 --shard=0 --nosilent
       env: e2e-0
     - node_js: "6"
       os: linux
-      script: node tests/run_e2e.js "--ignore=**/tests/build/**" --nb-shards=4 --shard=1 --nosilent
+      script: node tests/run_e2e.js --nb-shards=4 --shard=1 --nosilent
       env: e2e-1
     - node_js: "6"
       os: linux
-      script: node tests/run_e2e.js "--ignore=**/tests/build/**" --nb-shards=4 --shard=2 --nosilent
+      script: node tests/run_e2e.js --nb-shards=4 --shard=2 --nosilent
       env: e2e-2
     - node_js: "6"
       os: linux
-      script: node tests/run_e2e.js "--ignore=**/tests/build/**" --nb-shards=4 --shard=3 --nosilent
+      script: node tests/run_e2e.js --nb-shards=4 --shard=3 --nosilent
       env: e2e-3
     - node_js: "6"
       os: linux
@@ -109,6 +104,7 @@ install:
 
 env:
   global:
+    - DBUS_SESSION_BUS_ADDRESS=/dev/null
     # GITHUB_ACCESS_TOKEN=<github token, a personal access token of the angular-builds account, account access in valentine>
     # This is needed to publish packages to github for continuous packages delivery.
     - secure: "XUM1RCN/ZH34ju2PI9eHPRMnSlbj45XcBx/ZnZ13wfau60iJCveU7Ded8SC8uwGDp58rGGePXyJfh5l5dAnIWbSAGNKlrEgGTr41RSCbyzrV6m4lAcwNzUo/PkKum1vAApk21PqscrSSWOBAOC3nMCln25GLzgUMm6G8FBOc599NuszcoQvru+H+4JthSHn4l/nmeTZDs2oCBvwnmng/78rEW5CXvJEpAwuaaZLvzzIFdoZu+SuceYvGnL5xHo0ppPF/0NYzZlb7KBKREp44Lq1lOKlDtH5wqjEi7b2aA7/GnesOgLUBmbbSVUzmCxs6PtzGhD56aiL2Qtu8c4LZyvNfzPXSLbx8ljYmdytHkio9w3377wWFRXJDfIsgv9JKHxxyA0T34yzQkqWbgWKPMgJ3om+lb875iXAtXfNyS0trnN+rwLZZtFxygjHyx8IWY+NZD5i5fyjMdFyetNxbHe3ktI73nY+Tl6hDqJXvN8WwQlMovLNUMcY4wGUoPooLka9L+94uetbf3U4KVgshrLHI59jMZsO0qrDGsCZMubHEy80acrNkCTi/uGIbVR0KF94z81VF+S7edYv80AkQTRijpgNV34045L/IqSHgbueozRgVFj2arkAGGFjLlZJifmsRC/Eq1ZWkKsKY/1NusKssCRtycJQjeLOW0qV1T0w="

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "1.3.0-beta.0",
+  "version": "1.3.0-beta.1",
   "description": "CLI tool for Angular",
   "main": "packages/@angular/cli/lib/cli/index.js",
   "trackingCode": "UA-8594346-19",

packages/@angular/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "1.3.0-beta.0",
+  "version": "1.3.0-beta.1",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -28,7 +28,7 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@ngtools/json-schema": "1.1.0",
-    "@ngtools/webpack": "1.6.0-beta.0",
+    "@ngtools/webpack": "1.6.0-beta.1",
     "autoprefixer": "^6.5.3",
     "chalk": "^1.1.3",
     "circular-dependency-plugin": "^3.0.0",

packages/@ngtools/webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "1.6.0-beta.0",
+  "version": "1.6.0-beta.1",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",

tests/e2e/setup/100-npm-link.ts

@@ -1,5 +1,5 @@
 import {join} from 'path';
-import {npm, exec} from '../utils/process';
+import {silentNpm, exec} from '../utils/process';
 import {updateJsonFile} from '../utils/project';
 import {getGlobalVariable} from '../utils/env';
 
@@ -33,7 +33,8 @@ export default function () {
           }
         });
       }))
-      .then(() => npm('link'))
+      // npm link is very noisy on the older version used in Circle CI.
+      .then(() => silentNpm('link'))
       .then(() => process.chdir(oldCwd));
     })
     .then(() => exec(process.platform.startsWith('win') ? 'where' : 'which', 'ng'));

tests/e2e/setup/500-create-project.ts

@@ -1,6 +1,6 @@
 import {join} from 'path';
 import {git, ng, silentNpm} from '../utils/process';
-import {expectFileToExist} from '../utils/fs';
+import {expectFileToExist, replaceInFile} from '../utils/fs';
 import {updateTsConfig, updateJsonFile, useNg2} from '../utils/project';
 import {gitClean, gitCommit} from '../utils/git';
 import {getGlobalVariable} from '../utils/env';
@@ -36,6 +36,27 @@ export default function() {
         json['dependencies'][pkgName] = packages[pkgName].tar;
       });
     }))
+    // There's a race condition happening in Chrome. Enabling logging in chrome used by
+    // protractor actually fixes it. Logging is piped to a file so it doesn't affect our setup.
+    // --no-sandbox is needed for Circle CI.
+    .then(() => replaceInFile('protractor.conf.js', `'browserName': 'chrome'`,
+      `'browserName': 'chrome',
+        chromeOptions: {
+          args: [
+            "--enable-logging",
+            "--no-sandbox",
+          ]
+        }
+      `))
+    .then(() => replaceInFile('karma.conf.js', `browsers: ['Chrome'],`,
+      `browsers: ['ChromeNoSandbox'],
+      customLaunchers: {
+        ChromeNoSandbox: {
+          base: 'Chrome',
+          flags: ['--no-sandbox']
+        }
+      },
+      `))
     .then(() => argv['ng2'] ? useNg2() : Promise.resolve())
     .then(() => {
       if (argv['nightly'] || argv['ng-sha']) {
@@ -78,6 +99,7 @@ export default function() {
         progress: false
       };
     }))
+    // npm link on Circle CI is very noisy.
     .then(() => silentNpm('install'))
     // Force sourcemaps to be from the root of the filesystem.
     .then(() => updateTsConfig(json => {

tests/e2e/tests/build/poll.ts

@@ -9,6 +9,16 @@ import {expectToFail, wait} from '../../utils/utils';
 const webpackGoodRegEx = /webpack: Compiled successfully./;
 
 export default function() {
+
+  // @filipesilva: This test doesn't work correctly on CircleCI while being ran by the test script.
+  // Polling time seems to be ignored and several builds are fired per second.
+  // Debugging showed that webpack things the `src/` directory changed on each rebuild.
+  // Disabling for now.
+  if (process.env['CIRCLECI']) {
+    return;
+  }
+
+
   return silentExecAndWaitForOutputToMatch('ng', ['serve', '--poll=10000'], webpackGoodRegEx)
     // Wait before editing a file.
     // Editing too soon seems to trigger a rebuild and throw polling out of whack.