Skip to content

Commit 21973a9

Browse files
committed
Migrate from htmlbars-inline-precompile to ember-cli-htmlbars
1 parent 80b215d commit 21973a9

File tree

8 files changed

+42
-10
lines changed

8 files changed

+42
-10
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ It will setup your test context the same way as `setupTest()`, and additionally:
129129
import { module, test } from 'qunit';
130130
import { setupRenderingTest } from 'ember-qunit';
131131
import { render } from '@ember/test-helpers';
132-
import hbs from 'htmlbars-inline-precompile';
132+
import { hbs } from 'ember-cli-htmlbars';
133133

134134
module('GravatarImageComponent', function(hooks) {
135135
setupRenderingTest(hooks);

docs/legacy.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Legacy Guide
44

55
This document describes the use of `ember-qunit` with Ember's legacy testing
66
APIs, which have been superseded by the newer testing system based on the RFCs
7-
[232](https://github.com/emberjs/rfcs/blob/master/text/0232-simplify-qunit-testing-api.md)
8-
and
7+
[232](https://github.com/emberjs/rfcs/blob/master/text/0232-simplify-qunit-testing-api.md)
8+
and
99
[268](https://github.com/emberjs/rfcs/blob/master/text/0268-acceptance-testing-refactor.md).
1010

1111
## Usage
@@ -18,7 +18,7 @@ and
1818
### Component Integration Tests
1919

2020
```js
21-
import hbs from 'htmlbars-inline-precompile';
21+
import { hbs } from 'ember-cli-htmlbars';
2222
import { test, moduleForComponent } from 'ember-qunit';
2323

2424
moduleForComponent('x-foo', {

docs/migration.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Before:
208208

209209
```javascript
210210
import { test, moduleForComponent } from 'ember-qunit';
211-
import hbs from 'htmlbars-inline-precompile';
211+
import { hbs } from 'ember-cli-htmlbars';
212212

213213
moduleForComponent('GravatarImageComponent', {
214214
integration: true
@@ -226,7 +226,7 @@ After:
226226
import { module, test } from 'qunit';
227227
import { setupRenderingTest } from 'ember-qunit';
228228
import { render } from '@ember/test-helpers';
229-
import hbs from 'htmlbars-inline-precompile';
229+
import { hbs } from 'ember-cli-htmlbars';
230230

231231
module('GravatarImageComponent', function(hooks) {
232232
setupRenderingTest(hooks);

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"ember-angle-bracket-invocation-polyfill": "^3.0.2",
5959
"ember-cli": "~4.10.0",
6060
"ember-cli-dependency-checker": "^3.3.1",
61-
"ember-cli-htmlbars": "^6.1.1",
61+
"ember-cli-htmlbars": "^6.2.0",
6262
"ember-cli-inject-live-reload": "^2.1.0",
6363
"ember-cli-terser": "^4.0.2",
6464
"ember-disable-prototype-extensions": "^1.1.3",

tests/acceptance/basic-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { module, test } from 'qunit';
22
import EmberRouter from '@ember/routing/router';
33
import Route from '@ember/routing/route';
4-
import hbs from 'htmlbars-inline-precompile';
4+
import { hbs } from 'ember-cli-htmlbars';
55
import { setupApplicationTest } from 'ember-qunit';
66
import {
77
visit,

tests/integration/setup-rendering-test-test.js

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

types/tests.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// These tests were ported directly from DefinitelyTyped and are unlikely to be
22
// 100% desireable for the future.
3-
import hbs from 'htmlbars-inline-precompile';
3+
import { hbs } from 'ember-cli-htmlbars';
44
import { module } from 'qunit';
55
import {
66
start,

yarn.lock

+32
Original file line numberDiff line numberDiff line change
@@ -2240,6 +2240,11 @@ babel-import-util@^1.1.0, babel-import-util@^1.2.0:
22402240
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.2.2.tgz#1027560e143a4a68b1758e71d4fadc661614e495"
22412241
integrity sha512-8HgkHWt5WawRFukO30TuaL9EiDUOdvyKtDwLma4uBNeUSDbOO0/hiPfavrOWxSS6J6TKXfukWHZ3wiqZhJ8ONQ==
22422242

2243+
babel-import-util@^1.3.0:
2244+
version "1.3.0"
2245+
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e"
2246+
integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==
2247+
22432248
babel-loader@^8.0.6:
22442249
version "8.2.5"
22452250
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
@@ -2288,6 +2293,13 @@ babel-plugin-ember-template-compilation@^1.0.0:
22882293
magic-string "^0.26.0"
22892294
string.prototype.matchall "^4.0.5"
22902295

2296+
babel-plugin-ember-template-compilation@^2.0.0:
2297+
version "2.0.0"
2298+
resolved "https://registry.yarnpkg.com/babel-plugin-ember-template-compilation/-/babel-plugin-ember-template-compilation-2.0.0.tgz#41d895874ba6119dd461f61993c16d1154bf8a57"
2299+
integrity sha512-d+4jaB2ik0rt9TH0K9kOlKJeRBHEb373FgFMcU9ZaJL2zYuVXe19bqy+cWlLpLf1tpOBcBG9QTlFBCoImlOt1g==
2300+
dependencies:
2301+
babel-import-util "^1.3.0"
2302+
22912303
babel-plugin-filter-imports@^4.0.0:
22922304
version "4.0.0"
22932305
resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4"
@@ -4000,6 +4012,26 @@ ember-cli-htmlbars@^6.1.1:
40004012
silent-error "^1.1.1"
40014013
walk-sync "^2.2.0"
40024014

4015+
ember-cli-htmlbars@^6.2.0:
4016+
version "6.2.0"
4017+
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.2.0.tgz#18ec48ee1c93f9eed862a64eb24a9d14604f1dfc"
4018+
integrity sha512-j5EGixjGau23HrqRiW/JjoAovg5UBHfjbyN7wX5ekE90knIEqUUj1z/Mo/cTx/J2VepQ2lE6HdXW9LWQ/WdMtw==
4019+
dependencies:
4020+
"@ember/edition-utils" "^1.2.0"
4021+
babel-plugin-ember-template-compilation "^2.0.0"
4022+
babel-plugin-htmlbars-inline-precompile "^5.3.0"
4023+
broccoli-debug "^0.6.5"
4024+
broccoli-persistent-filter "^3.1.2"
4025+
broccoli-plugin "^4.0.3"
4026+
ember-cli-version-checker "^5.1.2"
4027+
fs-tree-diff "^2.0.1"
4028+
hash-for-dep "^1.5.1"
4029+
heimdalljs-logger "^0.1.10"
4030+
js-string-escape "^1.0.1"
4031+
semver "^7.3.4"
4032+
silent-error "^1.1.1"
4033+
walk-sync "^2.2.0"
4034+
40034035
ember-cli-inject-live-reload@^2.1.0:
40044036
version "2.1.0"
40054037
resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.1.0.tgz#ef63c733c133024d5726405a3c247fa12e88a385"

0 commit comments

Comments
 (0)