Merge branch 'master' into patch-4

Author: chriskrycho

CHANGELOG.md

@@ -1,5 +1,3 @@
-export default config;
-
 /**
  * Type declarations for
  *    import config from 'my-app/config/environment'
@@ -12,3 +10,5 @@ declare const config: {
   rootURL: string;
   APP: Record<string, unknown>;
 };
+
+export default config;

blueprint-files/ember-cli-typescript/__config_root__/config/environment.d.ts

@@ -215,7 +215,7 @@ Now, with that setup out of the way, let’s get back to talking about the text
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
 
 import User from 'app/types/user';
 
@@ -283,7 +283,7 @@ Putting it all together, this is what our updated test definition would look lik
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, TestContext } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
 
 import User from 'app/types/user';
 

docs/ember/testing.md

@@ -16,18 +16,18 @@ Addons need to import templates from the associated `.hbs` file to bind to the l
 
 ```ts
 declare module '\*/template' {
-  import { TemplateFactory } from 'htmlbars-inline-precompile';
+  import { TemplateFactory } from 'ember-cli-htmlbars';
   const template: TemplateFactory; export default template;
 }
 
 
 declare module 'app/templates/\*' {
-  import { TemplateFactory } from 'htmlbars-inline-precompile';
+  import { TemplateFactory } from 'ember-cli-htmlbars';
   const template: TemplateFactory; export default template;
 }
 
 declare module 'addon/templates/\*' {
-  import { TemplateFactory } from 'htmlbars-inline-precompile';
+  import { TemplateFactory } from 'ember-cli-htmlbars';
   const template: TemplateFactory; export default template;
 }
 ```
@@ -42,14 +42,14 @@ import { action } from '@ember/object';
 
 export default class MyGame extends Component {
   @action turnWheel(degrees: number) {
-    // ... 
+    // ...
   }
-} 
+}
 ```
 
 ```hbs
 <button {{on "click" (fn this.turnWheel "potato")}}>
-Click Me 
+Click Me
 </button>
 ```
 

docs/ts/current-limitations.md

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-typescript",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "Allow Ember apps to use TypeScript files.",
   "keywords": [
     "ember-addon",

package.json

@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
 
 module('Integration | Component | js importing ts', function (hooks) {
   setupRenderingTest(hooks);

tests/integration/components/js-importing-ts-test.js

@@ -1,7 +1,7 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
 
 module('Integration | Component | ts component', function (hooks) {
   setupRenderingTest(hooks);

tests/integration/components/ts-component-test.js

@@ -22,7 +22,8 @@ export {};`;
 function buildTemplateDeclarations(projectName, layout) {
   const comment = '// Types for compiled templates';
   const moduleBody = `
-  import { TemplateFactory } from 'htmlbars-inline-precompile';
+  import { TemplateFactory } from 'ember-cli-htmlbars';
+
   const tmpl: TemplateFactory;
   export default tmpl;
 `;
@@ -169,7 +170,6 @@ module.exports = {
       '@types/ember__component',
       '@types/ember__routing',
       '@types/rsvp',
-      '@types/htmlbars-inline-precompile',
     ];
 
     if (this._has('@ember/jquery')) {

ts/blueprints/ember-cli-typescript/index.js

@@ -147,7 +147,8 @@ describe('Acceptance: ember-cli-typescript generator', function () {
     const globalTypes = file('types/global.d.ts');
     expect(globalTypes).to.exist;
     expect(globalTypes).to.include("declare module 'my-addon/templates/*'").to.include(`
-  import { TemplateFactory } from 'htmlbars-inline-precompile';
+  import { TemplateFactory } from 'ember-cli-htmlbars';
+
   const tmpl: TemplateFactory;
   export default tmpl;
 `);