Skip to content

Commit 28945b9

Browse files
committed
fix: switch to ember-cli-htmlbars
1 parent 5e4a98a commit 28945b9

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

Diff for: docs/ember/testing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Now, with that setup out of the way, let’s get back to talking about the text
215215
import { module, test } from 'qunit';
216216
import { setupRenderingTest } from 'ember-qunit';
217217
import { render } from '@ember/test-helpers';
218-
import hbs from 'htmlbars-inline-precompile';
218+
import { hbs } from 'ember-cli-htmlbars';
219219

220220
import User from 'app/types/user';
221221

@@ -283,7 +283,7 @@ Putting it all together, this is what our updated test definition would look lik
283283
import { module, test } from 'qunit';
284284
import { setupRenderingTest } from 'ember-qunit';
285285
import { render, TestContext } from '@ember/test-helpers';
286-
import hbs from 'htmlbars-inline-precompile';
286+
import { hbs } from 'ember-cli-htmlbars';
287287

288288
import User from 'app/types/user';
289289

Diff for: docs/ts/current-limitations.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ Addons need to import templates from the associated `.hbs` file to bind to the l
1616

1717
```ts
1818
declare module '\*/template' {
19-
import { TemplateFactory } from 'htmlbars-inline-precompile';
19+
import { TemplateFactory } from 'ember-cli-htmlbars';
2020
const template: TemplateFactory; export default template;
2121
}
2222

2323

2424
declare module 'app/templates/\*' {
25-
import { TemplateFactory } from 'htmlbars-inline-precompile';
25+
import { TemplateFactory } from 'ember-cli-htmlbars';
2626
const template: TemplateFactory; export default template;
2727
}
2828

2929
declare module 'addon/templates/\*' {
30-
import { TemplateFactory } from 'htmlbars-inline-precompile';
30+
import { TemplateFactory } from 'ember-cli-htmlbars';
3131
const template: TemplateFactory; export default template;
3232
}
3333
```
@@ -42,14 +42,14 @@ import { action } from '@ember/object';
4242

4343
export default class MyGame extends Component {
4444
@action turnWheel(degrees: number) {
45-
// ...
45+
// ...
4646
}
47-
}
47+
}
4848
```
4949

5050
```hbs
5151
<button {{on "click" (fn this.turnWheel "potato")}}>
52-
Click Me
52+
Click Me
5353
</button>
5454
```
5555

Diff for: tests/integration/components/js-importing-ts-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { module, test } from 'qunit';
22
import { setupRenderingTest } from 'ember-qunit';
33
import { render } from '@ember/test-helpers';
4-
import hbs from 'htmlbars-inline-precompile';
4+
import { hbs } from 'ember-cli-htmlbars';
55

66
module('Integration | Component | js importing ts', function (hooks) {
77
setupRenderingTest(hooks);

Diff for: tests/integration/components/ts-component-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { module, test } from 'qunit';
22
import { setupRenderingTest } from 'ember-qunit';
33
import { render } from '@ember/test-helpers';
4-
import hbs from 'htmlbars-inline-precompile';
4+
import { hbs } from 'ember-cli-htmlbars';
55

66
module('Integration | Component | ts component', function (hooks) {
77
setupRenderingTest(hooks);

Diff for: ts/blueprints/ember-cli-typescript/index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export {};`;
2222
function buildTemplateDeclarations(projectName, layout) {
2323
const comment = '// Types for compiled templates';
2424
const moduleBody = `
25-
import { TemplateFactory } from 'htmlbars-inline-precompile';
25+
import { TemplateFactory } from 'ember-cli-htmlbars';
2626
2727
const tmpl: TemplateFactory;
2828
export default tmpl;
@@ -171,7 +171,6 @@ module.exports = {
171171
'@types/ember__component',
172172
'@types/ember__routing',
173173
'@types/rsvp',
174-
'@types/htmlbars-inline-precompile',
175174
];
176175

177176
if (this._has('@ember/jquery')) {

Diff for: ts/tests/blueprints/ember-cli-typescript-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ describe('Acceptance: ember-cli-typescript generator', function () {
148148
const globalTypes = file('types/global.d.ts');
149149
expect(globalTypes).to.exist;
150150
expect(globalTypes).to.include("declare module 'my-addon/templates/*'").to.include(`
151-
import { TemplateFactory } from 'htmlbars-inline-precompile';
151+
import { TemplateFactory } from 'ember-cli-htmlbars';
152152
153153
const tmpl: TemplateFactory;
154154
export default tmpl;

0 commit comments

Comments
 (0)