Merge branch 'master' into node-acceptance-tests

Author: dfreeman

.eslintignore

@@ -0,0 +1 @@
+/blueprints/*/files/**/*.js

.eslintrc.js

@@ -14,9 +14,10 @@ module.exports = {
     // node files
     {
       files: [
+        'ember-cli-build.js',
         'index.js',
         'testem.js',
-        'ember-cli-build.js',
+        'blueprints/*/index.js',
         'config/**/*.js',
         'tests/dummy/config/**/*.js',
         'lib/**/*.js',
@@ -34,7 +35,7 @@ module.exports = {
       plugins: ['node'],
       rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
         // add your custom rules and overrides for node files here
-        'ember/avoid-leaking-state-in-ember-objects': 'off'
+        'ember/avoid-leaking-state-in-ember-objects': 'off',
       }),
     },
 
@@ -54,8 +55,8 @@ module.exports = {
         mocha: true,
       },
       rules: {
-        'node/no-unpublished-require': 'off'
-      }
+        'node/no-unpublished-require': 'off',
+      },
     },
   ],
 };

.travis.yml

@@ -20,6 +20,7 @@ env:
     # as well as latest stable release (bonus points to beta/canary)
     - EMBER_TRY_SCENARIO=ember-lts-2.12
     - EMBER_TRY_SCENARIO=ember-lts-2.16
+    - EMBER_TRY_SCENARIO=ember-lts-2.18
     - EMBER_TRY_SCENARIO=ember-release
     - EMBER_TRY_SCENARIO=ember-beta
     - EMBER_TRY_SCENARIO=ember-canary

blueprints/-addon-import.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 'use strict';
 
 var stringUtil  = require('ember-cli-string-utils');

blueprints/test-framework-detector.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 'use strict';
 
 const fs = require('fs');

config/ember-try.js

@@ -1,84 +1,80 @@
-module.exports = {
-  useYarn: true,
-  scenarios: [
-    {
-      name: 'integrated-node-tests',
-      command: 'yarn nodetest',
-      npm: {
-        devDependencies: {
-          'ember-cli-qunit': null,
+'use strict';
+
+const getChannelURL = require('ember-source-channel-url');
+
+module.exports = function() {
+  return Promise.all([
+    getChannelURL('release'),
+    getChannelURL('beta'),
+    getChannelURL('canary'),
+  ]).then(urls => {
+    return {
+      useYarn: true,
+      scenarios: [
+        {
+          name: 'integrated-node-tests',
+          command: 'yarn nodetest',
+          npm: {
+            devDependencies: {
+              'ember-cli-qunit': null,
+            },
+          },
         },
-      },
-    },
-    {
-      name: 'ember-lts-2.12',
-      npm: {
-        devDependencies: {
-          'ember-source': '~2.12.0',
+        {
+          name: 'ember-lts-2.12',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.12.0',
+            },
+          },
         },
-      },
-    },
-    {
-      name: 'ember-lts-2.16',
-      npm: {
-        devDependencies: {
-          'ember-source': '~2.16.0',
+        {
+          name: 'ember-lts-2.16',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.16.0',
+            },
+          },
         },
-      },
-    },
-    {
-      name: 'ember-release',
-      bower: {
-        dependencies: {
-          ember: 'components/ember#release',
+        {
+          name: 'ember-lts-2.18',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.18.0',
+            },
+          },
         },
-        resolutions: {
-          ember: 'release',
+        {
+          name: 'ember-release',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[0],
+            },
+          },
         },
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null,
+        {
+          name: 'ember-beta',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[1],
+            },
+          },
         },
-      },
-    },
-    {
-      name: 'ember-beta',
-      bower: {
-        dependencies: {
-          ember: 'components/ember#beta',
+        {
+          name: 'ember-canary',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[2],
+            },
+          },
         },
-        resolutions: {
-          ember: 'beta',
+        {
+          name: 'ember-default',
+          npm: {
+            devDependencies: {},
+          },
         },
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null,
-        },
-      },
-    },
-    {
-      name: 'ember-canary',
-      bower: {
-        dependencies: {
-          ember: 'components/ember#canary',
-        },
-        resolutions: {
-          ember: 'canary',
-        },
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null,
-        },
-      },
-    },
-    {
-      name: 'ember-default',
-      npm: {
-        devDependencies: {},
-      },
-    },
-  ],
+      ],
+    };
+  });
 };

lib/incremental-typescript-compiler/index.js

@@ -97,14 +97,11 @@ module.exports = class IncrementalTypescriptCompiler {
 
     this._watchProgram = compile(project, { outDir, watch: true }, {
       watchedFileChanged: () => this.state.tscDidStart(),
+      buildComplete: () => this.state.tscDidEnd(),
 
       reportWatchStatus: (diagnostic) => {
         let text = diagnostic.messageText;
         debugTsc(text);
-
-        if (text.indexOf('Compilation complete') !== -1) {
-          this.state.tscDidEnd();
-        }
       },
 
       reportDiagnostic: (diagnostic) => {

lib/utilities/compile.js

@@ -19,23 +19,37 @@ module.exports = function compile(project, tsOptions, callbacks) {
   }, tsOptions);
 
   let ts = project.require('typescript');
+  let host = createWatchCompilerHost(ts, fullOptions, project, callbacks);
+
+  return ts.createWatchProgram(host);
+};
+
+function createWatchCompilerHost(ts, options, project, callbacks) {
   let configPath = ts.findConfigFile('./', ts.sys.fileExists, 'tsconfig.json');
   let createProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram;
   let host = ts.createWatchCompilerHost(
     configPath,
-    fullOptions,
+    options,
     buildWatchHooks(project, ts.sys, callbacks),
     createProgram,
     diagnosticCallback(callbacks.reportDiagnostic),
     diagnosticCallback(callbacks.reportWatchStatus)
   );
 
+  let afterCreate = host.afterProgramCreate;
+  host.afterProgramCreate = function() {
+    afterCreate.apply(this, arguments);
+    if (callbacks.buildComplete) {
+      callbacks.buildComplete();
+    }
+  };
+
   if (debug.enabled) {
     host.trace = str => debug(str.trim());
   }
 
-  return ts.createWatchProgram(host);
-};
+  return host;
+}
 
 function diagnosticCallback(callback) {
   if (callback) {

node-tests/blueprints/component-test-test.js

@@ -38,19 +38,9 @@ describe('Blueprint: component-test', function() {
       });
     });
 
-    describe('with usePods=true', function() {
-      beforeEach(function() {
-        fs.writeFileSync(
-          '.ember-cli',
-          `{
-          "disableAnalytics": false,
-          "usePods": true
-        }`
-        );
-      });
-
+    describe('with --pod', function() {
       it('component-test x-foo', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+        return emberGenerateDestroy(['--pod', 'component-test', 'x-foo'], _file => {
           expect(_file('tests/integration/components/x-foo/component-test.ts')).to.equal(
             fixture('component-test/default.ts')
           );

node-tests/fixtures/acceptance-test/mocha.ts

@@ -1,7 +1,7 @@
 import { describe, it, beforeEach, afterEach } from 'mocha';
 import { expect } from 'chai';
 import startApp from 'my-app/tests/helpers/start-app';
-import destroyApp from 'my-app/tests/helpers/destroy-app';
+import { run } from '@ember/runloop';
 
 describe('Acceptance | foo', function() {
   let application;
@@ -11,7 +11,7 @@ describe('Acceptance | foo', function() {
   });
 
   afterEach(function() {
-    destroyApp(application);
+    run(application, 'destroy');
   });
 
   it('can visit /foo', function() {