Merge branch 'master' into v4

Author: dfreeman

CHANGELOG.md

@@ -22,6 +22,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 [#1017]: https://github.com/typed-ember/ember-cli-typescript/pull/1017
 [#1018]: https://github.com/typed-ember/ember-cli-typescript/pull/1018
 
+## [3.1.3] - 2020-01-22
+
+### Fixed 🔧
+
+- Issue a warning if we detect a .js/.ts file collision ([#1046])
+
+[#1046]: https://github.com/typed-ember/ember-cli-typescript/pull/1046
+
+### Under the hood 🚗
+
+- Add prettier eslint deps ([#1045])
+- Use Node 10 for CI (but don't "officially" stop supporting node 8 yet) ([#1047])
+- Bumped [31 dependency versions][3.1.3-deps-bumps]
+
+[#1045]: https://github.com/typed-ember/ember-cli-typescript/pull/1045
+[#1047]: https://github.com/typed-ember/ember-cli-typescript/pull/1047
+[3.1.3-deps-bumps]: https://github.com/typed-ember/ember-cli-typescript/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Amerged+merged%3A2019-12-14T10%3A52%3A00%2B0600..2020-01-22T13%3A00%3A00%2B0600+chore%28deps%29+in%3Atitle+
+
 ## [3.1.2] - 2019-12-14
 
 ### Fixed 🔧
@@ -621,7 +639,8 @@ We now use Babel 7's support for TypeScript to build apps and addons. Most of th
 
 [ember-cli-typify]: https://github.com/winding-lines/ember-cli-typify
 [unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v4.0.0-alpha.1...HEAD
-[4.0.0-alpha.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.2...v4.0.0-alpha.1
+[4.0.0-alpha.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.3...v4.0.0-alpha.1
+[3.1.3]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.2...v3.1.3
 [3.1.2]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.1...v3.1.2
 <!--
   Note that 3.1.1 *intentionally* includes all the changes between 3.0.0 and

package.json

@@ -40,6 +40,7 @@
   },
   "dependencies": {
     "ansi-to-html": "^0.6.6",
+    "broccoli-stew": "^3.0.0",
     "debug": "^4.0.0",
     "execa": "^3.0.0",
     "fs-extra": "^8.0.0",
@@ -50,36 +51,38 @@
     "walk-sync": "^2.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "8.2.0",
-    "@commitlint/config-conventional": "8.2.0",
-    "@ember/optional-features": "1.2.0",
+    "@commitlint/cli": "8.3.5",
+    "@commitlint/config-conventional": "8.3.4",
+    "@ember/optional-features": "1.3.0",
     "@typed-ember/renovate-config": "1.2.1",
     "@types/capture-console": "1.0.0",
-    "@types/chai": "4.2.7",
+    "@types/chai": "4.2.8",
     "@types/chai-as-promised": "7.1.2",
     "@types/console-ui": "2.2.3",
     "@types/core-object": "3.0.1",
     "@types/debug": "4.1.5",
     "@types/ember": "3.1.1",
     "@types/ember-qunit": "3.4.7",
     "@types/esprima": "4.0.2",
-    "@types/express": "4.17.1",
+    "@types/express": "4.17.2",
     "@types/fs-extra": "8.0.1",
     "@types/got": "8.3.5",
-    "@types/mocha": "5.2.7",
+    "@types/mocha": "7.0.1",
     "@types/node": "9.6.55",
     "@types/qunit": "2.9.0",
-    "@types/resolve": "0.0.8",
-    "@types/semver": "6.2.0",
+    "@types/resolve": "1.14.0",
+    "@types/semver": "6.2.1",
     "@types/tmp": "0.1.0",
-    "@typescript-eslint/eslint-plugin": "2.12.0",
-    "@typescript-eslint/parser": "2.12.0",
+    "@typescript-eslint/eslint-plugin": "2.19.0",
+    "@typescript-eslint/parser": "2.19.0",
     "broccoli-asset-rev": "3.0.0",
+    "broccoli-node-api": "1.7.0",
+    "broccoli-plugin": "4.0.1",
     "capture-console": "1.0.1",
     "co": "4.6.0",
-    "commitlint-azure-pipelines-cli": "1.0.2",
+    "commitlint-azure-pipelines-cli": "1.0.3",
     "conventional-changelog-cli": "2.0.31",
-    "ember-cli": "3.14.0",
+    "ember-cli": "3.15.2",
     "ember-cli-addon-docs": "ember-learn/ember-cli-addon-docs#4f5bfd11",
     "ember-cli-addon-docs-esdoc": "0.2.3",
     "ember-cli-app-version": "3.2.0",
@@ -90,40 +93,42 @@
     "ember-cli-deploy-build": "2.0.0",
     "ember-cli-deploy-git": "1.3.4",
     "ember-cli-deploy-git-ci": "1.0.1",
-    "ember-cli-htmlbars": "4.2.0",
+    "ember-cli-htmlbars": "4.2.2",
     "ember-cli-inject-live-reload": "2.0.2",
     "ember-cli-release": "0.2.9",
     "ember-cli-sri": "2.1.1",
     "ember-cli-typescript-blueprints": "3.0.0",
     "ember-cli-uglify": "3.0.0",
-    "ember-cli-update": "0.47.2",
+    "ember-cli-update": "0.52.1",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.1",
     "ember-maybe-import-regenerator": "0.1.6",
     "ember-qunit": "4.6.0",
-    "ember-resolver": "6.0.0",
-    "ember-source": "3.15.0",
+    "ember-resolver": "7.0.0",
+    "ember-source": "3.16.1",
     "ember-try": "1.4.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
+    "eslint-config-prettier": "6.10.0",
     "eslint-plugin-ember": "7.7.2",
-    "eslint-plugin-node": "10.0.0",
+    "eslint-plugin-node": "11.0.0",
     "eslint-plugin-prettier": "3.1.2",
     "esprima": "4.0.1",
     "fixturify": "1.2.0",
-    "got": "8.3.2",
-    "handlebars": "4.5.3",
-    "husky": "3.1.0",
+    "got": "10.4.0",
+    "handlebars": "4.7.3",
+    "husky": "4.2.1",
     "in-repo-a": "link:tests/dummy/lib/in-repo-a",
     "in-repo-b": "link:tests/dummy/lib/in-repo-b",
     "loader.js": "4.7.0",
-    "mocha": "6.2.2",
+    "mocha": "7.0.1",
     "prettier": "1.19.1",
-    "qunit-dom": "0.9.2",
-    "testdouble": "3.12.4",
+    "prettier-eslint": "9.0.1",
+    "qunit-dom": "1.0.0",
+    "testdouble": "3.12.5",
     "tmp": "0.1.0",
-    "ts-node": "8.5.4",
-    "typescript": "3.7.3"
+    "ts-node": "8.6.2",
+    "typescript": "3.7.5"
   },
   "resolutions": {
     "@types/ember": "3.1.1",
@@ -153,7 +158,7 @@
     "proseWrap": "never"
   },
   "volta": {
-    "node": "10.17.0",
+    "node": "10.18.1",
     "yarn": "1.21.1"
   }
 }

tests/dummy/app/shadowed-file.ts

@@ -166,7 +166,7 @@ export default class UserProfile extends Component {
   @service mySession!: MySession;
 
   login(email: string, password: string) {
-    this.session.login(email, password);
+    this.mySession.login(email, password);
   }
 }
 ```

tests/dummy/app/templates/docs/ts-guide/using-ts-effectively.md

@@ -2,6 +2,7 @@ import semver from 'semver';
 import { Remote } from 'stagehand';
 import { connect } from 'stagehand/lib/adapters/child-process';
 import Addon from 'ember-cli/lib/models/addon';
+import PreprocessRegistry from 'ember-cli-preprocess-registry';
 import { addon } from './lib/utilities/ember-cli-entities';
 import fork from './lib/utilities/fork';
 import TypecheckWorker from './lib/typechecking/worker';
@@ -17,6 +18,7 @@ export default addon({
 
   included() {
     this._super.included.apply(this, arguments);
+
     this._checkDevelopment();
     this._checkAddonAppFiles();
     this._checkBabelVersion();
@@ -68,12 +70,65 @@ export default addon({
     }
   },
 
+
+  setupPreprocessorRegistry(type, registry) {
+    if (type !== 'parent') return;
+
+    // If we're acting on behalf of the root app, issue a warning if we detect
+    // a situation where a .js file from an addon has the same name as a .ts
+    // file in the app, as which file wins is nondeterministic.
+    if (this.parent === this.project) {
+      this._registerCollisionDetectionPreprocessor(registry);
+    }
+  },
+
   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 !['in-repo-a', 'in-repo-b'].includes(addon.name);
   },
 
+  _registerCollisionDetectionPreprocessor(registry: PreprocessRegistry) {
+    registry.add('js', {
+      name: 'ember-cli-typescript-collision-check',
+      toTree: (input, path) => {
+        if (path !== '/') return input;
+
+        let addon = this;
+        let checked = false;
+        let stew = require('broccoli-stew') as typeof import('broccoli-stew');
+
+        return stew.afterBuild(input, function() {
+          if (!checked) {
+            checked = true;
+            addon._checkForFileCollisions(this.inputPaths[0]);
+          }
+        });
+      },
+    });
+  },
+
+  _checkForFileCollisions(directory: string) {
+    let walkSync = require('walk-sync') as typeof import('walk-sync');
+    let files = new Set(walkSync(directory, ['**/*.{js,ts}']));
+
+    let collisions = [];
+    for (let file of files) {
+      if (file.endsWith('.js') && files.has(file.replace(/\.js$/, '.ts'))) {
+        collisions.push(file.replace(/\.js$/, '.{js,ts}'));
+      }
+    }
+
+    if (collisions.length) {
+      this.ui.writeWarnLine(
+        'Detected collisions between .js and .ts files of the same name. ' +
+          'This can result in nondeterministic build output; ' +
+          'see https://git.io/JvIwo for more information.\n  - ' +
+          collisions.join('\n  - ')
+      );
+    }
+  },
+
   _checkBabelVersion() {
     let babel = this.parent.addons.find(addon => addon.name === 'ember-cli-babel');
     let version = babel && babel.pkg.version;

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

@@ -101,6 +101,33 @@ describe('Acceptance: build', function() {
 
     await server.waitForBuild();
   });
+
+  it('emits a warning when .js and .ts files conflict in the app/ tree', async () => {
+    // Set up an in-repo addon
+    app.updatePackageJSON(pkg => {
+      pkg['ember-addon'].paths.push('lib/in-repo-addon');
+    });
+
+    app.writeFile('lib/in-repo-addon/index.js', 'module.exports = { name: "in-repo-addon" };');
+    app.writeFile(
+      'lib/in-repo-addon/package.json',
+      JSON.stringify({
+        name: 'in-repo-addon',
+        keywords: ['ember-addon'],
+      })
+    );
+
+    // Have it export a .js app file and attempt to overwrite it in the host with a .ts file
+    app.writeFile('lib/in-repo-addon/app/foo.js', '// addon');
+    app.writeFile('app/foo.ts', '// app');
+
+    let output = await app.build();
+
+    expect(output.all).to.include('skeleton-app/foo.{js,ts}');
+    expect(output.all).to.include(
+      'WARNING: Detected collisions between .js and .ts files of the same name.'
+    );
+  });
 });
 
 function isExpressionStatement(stmt: Statement | ModuleDeclaration): stmt is ExpressionStatement {

tests/dummy/lib/in-repo-b/app/shadowed-file.js

@@ -44,7 +44,7 @@ export default class SkeletonApp {
     ));
   }
 
-  updatePackageJSON(callback: (arg: any) => string) {
+  updatePackageJSON(callback: (arg: any) => any) {
     let pkgPath = `${this.root}/package.json`;
     let pkg = fs.readJSONSync(pkgPath);
     fs.writeJSONSync(pkgPath, callback(pkg) || pkg, { spaces: 2 });

ts/addon.ts

@@ -0,0 +1,6 @@
+declare module 'broccoli-stew' {
+  import { Node as BroccoliNode } from 'broccoli-node-api';
+  import Plugin from 'broccoli-plugin';
+
+  export function afterBuild(node: BroccoliNode, callback: (this: Plugin) => void): BroccoliNode;
+}