Merge branch 'master' into work-out-of-the-box

Author: chriskrycho

index.js

@@ -26,6 +26,12 @@ module.exports = {
     }
   },
 
+  shouldIncludeChildAddon(addon) {
+    // For testing, we have dummy in-repo addons set up, but e-c-ts doesn't depend on them;
+    // its dummy app does. Otherwise we'd have a circular dependency.
+    return addon.name !== 'in-repo-a' && addon.name !== 'in-repo-b';
+  },
+
   setupPreprocessorRegistry(type, registry) {
     if (type !== 'parent') {
       return;

lib/commands/precompile.js

@@ -2,7 +2,7 @@
 'use strict';
 
 const tmpdir = require('../utilities/tmpdir');
-const fs = require('fs');
+const fs = require('fs-extra');
 const path = require('path');
 const walkSync = require('walk-sync');
 const mkdirp = require('mkdirp');
@@ -23,7 +23,14 @@ module.exports = Command.extend({
     let manifestPath = options.manifestPath;
     let project = this.project;
     let outDir = `${tmpdir()}/e-c-ts-precompile-${process.pid}`;
-    let flags = ['--declaration', '--sourceMap', 'false'];
+
+    // prettier-ignore
+    let flags = [
+      '--declaration',
+      '--sourceMap', 'false',
+      '--inlineSourceMap', 'false',
+      '--inlineSources', 'false',
+    ];
 
     return compile({ project, outDir, flags }).then(() => {
       let output = [];
@@ -42,6 +49,7 @@ module.exports = Command.extend({
 
       mkdirp.sync(path.dirname(manifestPath));
       fs.writeFileSync(manifestPath, JSON.stringify(output.reverse()));
+      fs.remove(outDir);
     });
   },
 
@@ -71,7 +79,7 @@ module.exports = Command.extend({
 
     fs.writeFileSync(dest, fs.readFileSync(source));
     output.push(dest);
-  }
+  },
 });
 
 module.exports.PRECOMPILE_MANIFEST = PRECOMPILE_MANIFEST;

node-tests/commands/clean-test.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const fs = require('fs-extra');
+const walkSync = require('walk-sync');
+
+const ember = require('ember-cli-blueprint-test-helpers/lib/helpers/ember');
+const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+const setupTestHooks = blueprintHelpers.setupTestHooks;
+const emberNew = blueprintHelpers.emberNew;
+
+const chai = require('ember-cli-blueprint-test-helpers/chai');
+const expect = chai.expect;
+
+describe('Acceptance: ts:clean command', function() {
+  setupTestHooks(this);
+
+  beforeEach(function() {
+    return emberNew({ target: 'addon' }).then(() => ember(['generate', 'ember-cli-typescript']));
+  });
+
+  it('removes all generated files', function() {
+    fs.ensureDirSync('tmp');
+    fs.ensureDirSync('app');
+    fs.ensureDirSync('addon');
+    fs.writeFileSync('app/test-file.ts', `export const testString: string = 'app';`);
+    fs.writeFileSync('addon/test-file.ts', `export const testString: string = 'addon';`);
+
+    let before = walkSync(process.cwd());
+    return ember(['ts:precompile'])
+      .then(() => ember(['ts:clean']))
+      .then(() => {
+        let after = walkSync(process.cwd());
+        expect(after).to.deep.equal(before);
+      });
+  });
+});

node-tests/commands/precompile-test.js

@@ -0,0 +1,50 @@
+'use strict';
+
+const fs = require('fs-extra');
+
+const ember = require('ember-cli-blueprint-test-helpers/lib/helpers/ember');
+const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
+const setupTestHooks = blueprintHelpers.setupTestHooks;
+const emberNew = blueprintHelpers.emberNew;
+
+const chai = require('ember-cli-blueprint-test-helpers/chai');
+const expect = chai.expect;
+const file = chai.file;
+
+describe('Acceptance: ts:precompile command', function() {
+  setupTestHooks(this);
+
+  beforeEach(function() {
+    return emberNew({ target: 'addon' }).then(() => ember(['generate', 'ember-cli-typescript']));
+  });
+
+  it('generates .js and .d.ts files from the addon tree', function() {
+    fs.ensureDirSync('addon');
+    fs.writeFileSync('addon/test-file.ts', `export const testString: string = 'hello';`);
+
+    return ember(['ts:precompile'])
+      .then(() => {
+        let declaration = file('test-file.d.ts');
+        expect(declaration).to.exist;
+        expect(declaration.content.trim()).to.equal(`export declare const testString: string;`);
+
+        let transpiled = file('addon/test-file.js');
+        expect(transpiled).to.exist;
+        expect(transpiled.content.trim()).to.equal(`export const testString = 'hello';`);
+      });
+  });
+
+  it('generates .js files only from the app tree', function() {
+    fs.ensureDirSync('app');
+    fs.writeFileSync('app/test-file.ts', `export const testString: string = 'hello';`);
+
+    return ember(['ts:precompile']).then(() => {
+      let declaration = file('test-file.d.ts');
+      expect(declaration).not.to.exist;
+
+      let transpiled = file('app/test-file.js');
+      expect(transpiled).to.exist;
+      expect(transpiled.content.trim()).to.equal(`export const testString = 'hello';`);
+    });
+  });
+});

package.json

@@ -48,6 +48,7 @@
     "ember-router-generator": "^1.2.3",
     "execa": "^0.9.0",
     "exists-sync": "^0.0.4",
+    "fs-extra": "^5.0.0",
     "inflection": "^1.12.0",
     "mkdirp": "^0.5.1",
     "resolve": "^1.5.0",
@@ -58,8 +59,10 @@
     "walk-sync": "^0.3.2"
   },
   "devDependencies": {
-    "@types/ember": "2.8.8",
+    "@types/ember": "2.8.13",
+    "@types/ember-qunit": "^3.0.1",
     "@types/node": "*",
+    "@types/qunit": "^2.0.31",
     "broccoli-asset-rev": "^2.6.0",
     "ember-cli": "~2.18.2",
     "ember-cli-app-version": "^3.1.3",
@@ -84,10 +87,12 @@
     "eslint": "^4.17.0",
     "eslint-plugin-ember": "^5.0.3",
     "eslint-plugin-node": "^6.0.0",
-    "fs-extra": "^5.0.0",
     "loader.js": "^4.2.3",
     "mocha": "^5.0.0",
-    "typescript": "^2.7.1"
+    "typescript": "^2.7.2"
+  },
+  "resolutions": {
+    "@types/ember": "2.8.13"
   },
   "peerDependencies": {
     "typescript": "^2.4.2"
@@ -99,6 +104,10 @@
     "configPath": "tests/dummy/config",
     "before": [
       "ember-cli-babel"
+    ],
+    "paths": [
+      "tests/dummy/lib/in-repo-a",
+      "tests/dummy/lib/in-repo-b"
     ]
   },
   "prettier": {

tests/dummy/app/shadowed-file.ts

@@ -0,0 +1,5 @@
+// This file should win out over `shadowed-file.ts` and `shadowed-file.js`
+// in our two in-repo addons.
+const value: string = 'dummy/shadowed-file';
+
+export default value;

tests/dummy/lib/in-repo-a/addon/test-file.ts

@@ -0,0 +1,4 @@
+// This should wind up in the addon tree
+const value: string = 'in-repo-a/test-file';
+
+export default value;

tests/dummy/lib/in-repo-a/app/a.ts

@@ -0,0 +1,4 @@
+// This should wind up in the app tree
+const value: string = 'dummy/a';
+
+export default value;

tests/dummy/lib/in-repo-a/app/shadowed-file.ts

@@ -0,0 +1,4 @@
+// This should be shadowed by the dummy app's own `shadowed-file.ts`
+const value: string = 'bad';
+
+export default value;

tests/dummy/lib/in-repo-a/index.js

@@ -0,0 +1,10 @@
+/* eslint-env node */
+'use strict';
+
+module.exports = {
+  name: 'in-repo-a',
+
+  isDevelopingAddon() {
+    return true;
+  }
+};