Merge branch 'master' into push-to-github-with-token

davinkevin · web-flow · commit 235a48edcd72 · 2016-12-22T06:22:55.000+01:00
diff --git a/package.json b/package.json
@@ -75,7 +75,6 @@
     "json-loader": "^0.5.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.8.0",
-    "leek": "0.0.21",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "loader-utils": "^0.2.16",
diff --git a/packages/angular-cli/bin/ng b/packages/angular-cli/bin/ng
@@ -6,7 +6,6 @@ process.title = 'angular-cli';
 
 const resolve = require('resolve');
 const packageJson = require('../package.json');
-const Leek = require('leek');
 const Version = require('../upgrade/version').Version;
 
 
@@ -35,18 +34,9 @@ resolve('angular-cli', { basedir: process.cwd() },
     cli({
       cliArgs: process.argv.slice(2),
       inputStream: process.stdin,
-      outputStream: process.stdout,
-      Leek: CustomLeek
+      outputStream: process.stdout
     }).then(function (result) {
       var exitCode = typeof result === 'object' ? result.exitCode : result;
       process.exit(exitCode);
     });
-
-    function CustomLeek(options) {
-      options.trackingCode = packageJson.trackingCode;
-      options.globalName = packageJson.name;
-      options.name = packageJson.name;
-      options.version = packageJson.version;
-      return new Leek(options);
-    }
   });
diff --git a/packages/angular-cli/commands/doc.ts b/packages/angular-cli/commands/doc.ts
@@ -15,7 +15,6 @@ const DocCommand = Command.extend({
 
     const docTask = new DocTask({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project
     });
 
diff --git a/packages/angular-cli/commands/e2e.ts b/packages/angular-cli/commands/e2e.ts
@@ -11,7 +11,6 @@ const E2eCommand = Command.extend({
 
     const e2eTask = new E2eTask({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project
     });
 
diff --git a/packages/angular-cli/commands/github-pages-deploy.ts b/packages/angular-cli/commands/github-pages-deploy.ts
@@ -109,7 +109,6 @@ const githubPagesDeployCommand = Command.extend({
 
     const buildTask = new WebpackBuild({
       ui: this.ui,
-      analytics: this.analytics,
       cliProject: this.project,
       target: options.target,
       environment: options.environment,
@@ -133,7 +132,6 @@ const githubPagesDeployCommand = Command.extend({
 
     const createGithubRepoTask = new CreateGithubRepo({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project
     });
 
diff --git a/packages/angular-cli/commands/init.ts b/packages/angular-cli/commands/init.ts
@@ -39,7 +39,6 @@ const InitCommand: any = Command.extend({
 
     const installBlueprint = new this.tasks.InstallBlueprint({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project
     });
 
@@ -57,7 +56,6 @@ const InitCommand: any = Command.extend({
     if (!commandOptions.skipNpm) {
       npmInstall = new NpmInstall({
         ui: this.ui,
-        analytics: this.analytics,
         project: this.project
       });
     }
@@ -66,7 +64,6 @@ const InitCommand: any = Command.extend({
     if (commandOptions.linkCli) {
       linkCli = new LinkCli({
         ui: this.ui,
-        analytics: this.analytics,
         project: this.project
       });
     }
diff --git a/packages/angular-cli/commands/lint.ts b/packages/angular-cli/commands/lint.ts
@@ -8,7 +8,6 @@ export default Command.extend({
   run: function () {
     const lintTask = new LintTask({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project
     });
 
diff --git a/packages/angular-cli/commands/new.ts b/packages/angular-cli/commands/new.ts
@@ -72,11 +72,10 @@ const NewCommand = Command.extend({
     }
 
     const createAndStepIntoDirectory =
-      new this.tasks.CreateAndStepIntoDirectory({ ui: this.ui, analytics: this.analytics });
+      new this.tasks.CreateAndStepIntoDirectory({ ui: this.ui });
 
     const initCommand = new InitCommand({
       ui: this.ui,
-      analytics: this.analytics,
       tasks: this.tasks,
       project: Project.nullProject(this.ui, this.cli)
     });
diff --git a/packages/angular-cli/commands/serve.ts b/packages/angular-cli/commands/serve.ts
@@ -135,7 +135,6 @@ const ServeCommand = Command.extend({
 
         const serve = new ServeWebpackTask({
           ui: this.ui,
-          analytics: this.analytics,
           project: this.project,
         });
 
diff --git a/packages/angular-cli/commands/test.ts b/packages/angular-cli/commands/test.ts
@@ -39,7 +39,6 @@ const NgCliTestCommand = TestCommand.extend({
 
     const testTask = new TestTask({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project
     });
 
diff --git a/packages/angular-cli/ember-cli/lib/cli/cli.js b/packages/angular-cli/ember-cli/lib/cli/cli.js
@@ -11,7 +11,6 @@ var InstallationChecker = require('../models/installation-checker');
 function CLI(options) {
   this.name = options.name;
   this.ui = options.ui;
-  this.analytics = options.analytics;
   this.testing = options.testing;
   this.disableDependencyChecker = options.disableDependencyChecker;
   this.root = options.root;
@@ -47,7 +46,6 @@ CLI.prototype.run = function(environment) {
 
     var command = new CurrentCommand({
       ui:        this.ui,
-      analytics: this.analytics,
       commands:  environment.commands,
       tasks:     environment.tasks,
       project:   environment.project,
@@ -134,7 +132,6 @@ CLI.prototype.callHelp = function(options) {
 
   var help = new HelpCommand({
     ui:        this.ui,
-    analytics: this.analytics,
     commands:  environment.commands,
     tasks:     environment.tasks,
     project:   environment.project,
diff --git a/packages/angular-cli/ember-cli/lib/cli/index.js b/packages/angular-cli/ember-cli/lib/cli/index.js
@@ -31,7 +31,6 @@ function clientId() {
 // Options: Array cliArgs, Stream inputStream, Stream outputStream
 module.exports = function(options) {
   var UI = options.UI || require('../ui');
-  var Leek = options.Leek || require('leek');
   var Yam = options.Yam || require('yam');
 
   // TODO: one UI (lib/models/project.js also has one for now...)
@@ -48,39 +47,12 @@ module.exports = function(options) {
     primary: Project.getProjectRoot()
   });
 
-  var leekOptions;
-
-  var disableAnalytics = options.cliArgs &&
-    (options.cliArgs.indexOf('--disable-analytics') > -1 ||
-    options.cliArgs.indexOf('-v') > -1 ||
-    options.cliArgs.indexOf('--version') > -1) ||
-    config.get('disableAnalytics');
-
-  var defaultLeekOptions = {
-    trackingCode: trackingCode,
-    globalName:   name,
-    name:         clientId(),
-    version:      version,
-    silent:       disableAnalytics
-  };
-
   var defaultUpdateCheckerOptions = {
     checkForUpdates: false
   };
 
-  if (config.get('leekOptions')) {
-    leekOptions = merge(defaultLeekOptions, config.get('leekOptions'));
-  } else {
-    leekOptions = defaultLeekOptions;
-  }
-
-  debug('leek: %o', leekOptions);
-
-  var leek = new Leek(leekOptions);
-
   var cli = new CLI({
     ui:        ui,
-    analytics: leek,
     testing:   options.testing,
     name: options.cli ? options.cli.name : 'ember',
     disableDependencyChecker: options.disableDependencyChecker,
diff --git a/packages/angular-cli/ember-cli/lib/commands/generate.js b/packages/angular-cli/ember-cli/lib/commands/generate.js
@@ -42,7 +42,6 @@ module.exports = Command.extend({
     var Task = this.tasks.GenerateFromBlueprint;
     var task = new Task({
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
       testing: this.testing,
       settings: this.settings
diff --git a/packages/angular-cli/ember-cli/lib/commands/unknown.js b/packages/angular-cli/ember-cli/lib/commands/unknown.js
@@ -15,6 +15,6 @@ module.exports = Command.extend({
   validateAndRun: function() {
     throw new SilentError('The specified command ' + this.name +
                           ' is invalid. For available options, see' +
-                          ' `ember help`.');
+                          ' `ng help`.');
   }
 });
diff --git a/packages/angular-cli/ember-cli/lib/models/blueprint.js b/packages/angular-cli/ember-cli/lib/models/blueprint.js
@@ -1000,8 +1000,7 @@ Blueprint.prototype.taskFor = function(dasherizedName) {
 
   return new Task({
     ui: this.ui,
-    project: this.project,
-    analytics: this.analytics
+    project: this.project
   });
 };
 
diff --git a/packages/angular-cli/ember-cli/lib/models/command.js b/packages/angular-cli/ember-cli/lib/models/command.js
@@ -116,11 +116,6 @@ Command.prototype.validateAndRun = function(args) {
     return Promise.resolve('callHelp');
   }
 
-  this.analytics.track({
-    name:    'ember ',
-    message: this.name
-  });
-
   if (commandOptions === null) {
     return Promise.resolve();
   }
@@ -430,7 +425,7 @@ Command.prototype.printBasicHelp = function() {
   if (this.isRoot) {
     output = 'Usage: ' + this.name;
   } else {
-    output = 'ember ' + this.name;
+    output = 'ng ' + this.name;
   }
 
   output += this._printCommand();
diff --git a/packages/angular-cli/ember-cli/lib/models/watcher.js b/packages/angular-cli/ember-cli/lib/models/watcher.js
@@ -19,9 +19,6 @@ var Watcher = Task.extend({
   didError: function(error) {
     debug('didError %o', error);
     this.ui.writeError(error);
-    this.analytics.trackError({
-      description: error && error.message
-    });
   },
 
   then: function() {
@@ -34,18 +31,6 @@ var Watcher = Task.extend({
 
     this.ui.writeLine('');
     this.ui.writeLine(chalk.green('Build successful - ' + Math.round(totalTime) + 'ms.'));
-
-    this.analytics.track({
-      name:    'ember rebuild',
-      message: 'broccoli rebuild time: ' + totalTime + 'ms'
-    });
-
-    this.analytics.trackTiming({
-      category: 'rebuild',
-      variable: 'rebuild time',
-      label:    'broccoli rebuild time',
-      value:    parseInt(totalTime, 10)
-    });
   },
 
   on: function() {
diff --git a/packages/angular-cli/ember-cli/lib/tasks/generate-from-blueprint.js b/packages/angular-cli/ember-cli/lib/tasks/generate-from-blueprint.js
@@ -47,7 +47,6 @@ module.exports = Task.extend({
       target: this.project.root,
       entity: entity,
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
       settings: this.settings,
       testing: this.testing,
diff --git a/packages/angular-cli/ember-cli/lib/tasks/install-blueprint.js b/packages/angular-cli/ember-cli/lib/tasks/install-blueprint.js
@@ -26,7 +26,6 @@ module.exports = Task.extend({
       target: target,
       entity: { name: name },
       ui: this.ui,
-      analytics: this.analytics,
       project: this.project,
       dryRun: options.dryRun,
       targetFiles: options.targetFiles,
diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json
@@ -59,7 +59,6 @@
     "json-loader": "^0.5.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.8.0",
-    "leek": "0.0.21",
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "lodash": "^4.11.1",
diff --git a/packages/angular-cli/plugins/karma.js b/packages/angular-cli/plugins/karma.js
@@ -11,6 +11,7 @@ const init = (config) => {
   }
   const angularCliConfig = require(path.join(config.basePath, config.angularCli.config));
   const appConfig = angularCliConfig.apps[0];
+  const appRoot = path.join(config.basePath, appConfig.root);
   const environment = config.angularCli.environment || 'dev';
   const testConfig = {
     codeCoverage: config.angularCli.codeCoverage || false,
@@ -66,6 +67,25 @@ const init = (config) => {
     .filter((file) => config.preprocessors[file].indexOf('angular-cli') !== -1)
     .map((file) => config.preprocessors[file])
     .map((arr) => arr.splice(arr.indexOf('angular-cli'), 1, 'webpack', 'sourcemap'));
+
+  // Add global scripts
+  if (appConfig.scripts && appConfig.scripts.length > 0) {
+    const globalScriptPatterns = appConfig.scripts
+      .map(script => typeof script === 'string' ? { input: script } : script)
+      // Neither renamed nor lazy scripts are currently supported
+      .filter(script => !(script.output || script.lazy))
+      .map(script => ({
+        pattern: path.resolve(appRoot, script.input),
+        included: true,
+        served: true,
+        watched: true
+      }));
+
+    // Unshift elements onto the beginning of the files array.
+    // It's important to not replace the array, because
+    // karma already has a reference to the existing array.
+    Array.prototype.unshift.apply(config.files, globalScriptPatterns);
+  }
 }
 
 init.$inject = ['config'];
diff --git a/tests/e2e/tests/test/test-assets.ts b/tests/e2e/tests/test/test-assets.ts
@@ -0,0 +1,49 @@
+import { writeMultipleFiles } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+import { expectToFail } from '../../utils/utils';
+import { stripIndent } from 'common-tags';
+
+// Make sure asset files are served
+export default function () {
+  return Promise.resolve()
+    .then(() => writeMultipleFiles({
+      'src/assets/file.txt': 'assets-folder-content',
+      'src/file.txt': 'file-content',
+      // Not using `async()` in tests as it seemed to swallow `fetch()` errors
+      'src/app/app.component.spec.ts': stripIndent`
+        describe('Test Runner', () => {
+          const fetch = global['fetch'];
+          it('should serve files in assets folder', (done) => {
+            fetch('/assets/file.txt')
+              .then(response => response.text())
+              .then(fileText => {
+                expect(fileText).toMatch('assets-folder-content');
+                done();
+              });
+          });
+          it('should serve files explicitly added to assets array', (done) => {
+            fetch('/file.txt')
+              .then(response => response.text())
+              .then(fileText => {
+                expect(fileText).toMatch('file-content');
+                done();
+              });
+          });
+        });
+      `
+    }))
+    // Test failure condition (no assets in angular-cli.json)
+    .then(() => updateJsonFile('angular-cli.json', configJson => {
+      const app = configJson['apps'][0];
+      app['assets'] = [];
+    }))
+    .then(() => expectToFail(() => ng('test', '--single-run'),
+      'Should fail because the assets to serve were not in the angular-cli config'))
+    // Test passing condition (assets are included)
+    .then(() => updateJsonFile('angular-cli.json', configJson => {
+      const app = configJson['apps'][0];
+      app['assets'] = ['assets', 'file.txt'];
+    }))
+    .then(() => ng('test', '--single-run'));
+}
diff --git a/tests/e2e/tests/test/test-scripts.ts b/tests/e2e/tests/test/test-scripts.ts
diff --git a/tests/e2e/tests/test/test.ts b/tests/e2e/tests/test/test.ts
diff --git a/tests/helpers/mock-analytics.js b/tests/helpers/mock-analytics.js
diff --git a/tests/helpers/ng.js b/tests/helpers/ng.js
diff --git a/yarn.lock b/yarn.lock
