Skip to content

Commit 0d06440

Browse files
author
Robert Jackson
authored
Merge pull request #496 from ember-cli/drop-ember-lt-3-8
Drop support for Ember < 3.8.
2 parents e61c9b2 + d6c9f6b commit 0d06440

8 files changed

Lines changed: 41 additions & 94 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,13 @@ jobs:
7575
strategy:
7676
matrix:
7777
ember-try-scenario:
78-
- ember-lts-2.12
79-
- ember-lts-2.16
80-
- ember-lts-2.18
81-
- ember-lts-3.4
8278
- ember-lts-3.8
8379
- ember-lts-3.12
80+
- ember-lts-3.16
8481
- ember-release
8582
- ember-octane
8683
- ember-beta
8784
- ember-canary
88-
- ember-default
8985
- ember-default-with-jquery
9086
- with-ember-cli-htmlbars-inline-precompile
9187

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
<a href="https://github.com/ember-cli/ember-cli-htmlbars/actions"><img alt="Build Status" src="https://github.com/ember-cli/ember-cli-htmlbars/workflows/ci/badge.svg"></a>
44

5-
### Registering a Plugin
5+
## Compatibility
6+
7+
* Ember.js v3.8 or above
8+
* Ember CLI v3.8 or above
9+
* Node.js v10 or above
10+
11+
## Registering a Plugin
612

713
```javascript
814
var SomeTransform = require('./some-path/transform');
@@ -22,15 +28,15 @@ module.exports = {
2228
};
2329
```
2430

25-
#### Options for registering a `htmlbars-ast-plugin`
31+
### Options for registering a `htmlbars-ast-plugin`
2632

2733
* `name` - String. The name of the AST transform for debugging purposes.
2834
* `plugin` - A function of type [`ASTPluginBuilder`](https://github.com/glimmerjs/glimmer-vm/blob/master/packages/%40glimmer/syntax/lib/parser/tokenizer-event-handlers.ts#L329-L341).
2935
* `dependencyInvalidation` - Boolean. A flag that indicates the AST Plugin may, on a per-template basis, depend on other files that affect its output.
3036
* `cacheKey` - function that returns any JSON-compatible value - The value returned is used to invalidate the persistent cache across restarts, usually in the case of a dependency or configuration change.
3137
* `baseDir` - `() => string`. A function that returns the directory on disk of the npm module for the plugin. If provided, a basic cache invalidation is performed if any of the dependencies change (e.g. due to a npm install/upgrade).
3238

33-
#### Implementing Dependency Invalidation in an AST Plugin
39+
### Implementing Dependency Invalidation in an AST Plugin
3440

3541
Plugins that set the `dependencyInvalidation` option to `true` can provide function for the `plugin` of type `ASTDependencyPlugin` as given below.
3642

@@ -71,7 +77,7 @@ export interface ASTPluginWithDeps extends ASTPlugin {
7177
}
7278
```
7379

74-
### Precompile HTMLBars template strings within other addons
80+
## Precompile HTMLBars template strings within other addons
7581

7682
```javascript
7783
module.exports = {
@@ -93,7 +99,7 @@ module.exports = {
9399
};
94100
```
95101

96-
### Tagged Template Usage / Migrating from `htmlbars-inline-precompile`
102+
## Tagged Template Usage / Migrating from `htmlbars-inline-precompile`
97103

98104
Starting with version 4.0, this addon now includes the testing helper from [ember-cli-htmlbars-inline-precompile](https://github.com/ember-cli/ember-cli-htmlbars-inline-precompile)
99105

@@ -142,12 +148,7 @@ module.exports = function(defaults) {
142148
};
143149
```
144150

145-
### Handlebars 2.0 Support (Ember < 1.10)
146-
147-
Handlebars 2.0 support has been removed. If you are using ember-cli-htmlbars with a 1.9.x project please continue
148-
to use ember-cli-htmlbars@0.6.x.
149-
150-
### Using as a Broccoli Plugin
151+
## Using as a Broccoli Plugin
151152

152153
```javascript
153154
var HtmlbarsCompiler = require('ember-cli-htmlbars');

config/ember-try.js

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,26 @@ module.exports = function () {
1212
useYarn: true,
1313
scenarios: [
1414
{
15-
name: 'ember-lts-2.12',
16-
env: {
17-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
18-
},
19-
npm: {
20-
devDependencies: {
21-
'@ember/jquery': '^0.5.1',
22-
'ember-source': '~2.12.0',
23-
},
24-
},
25-
},
26-
{
27-
name: 'ember-lts-2.16',
28-
env: {
29-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
30-
},
31-
npm: {
32-
devDependencies: {
33-
'@ember/jquery': '^0.5.1',
34-
'ember-source': '~2.16.0',
35-
},
36-
},
37-
},
38-
{
39-
name: 'ember-lts-2.18',
40-
env: {
41-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
42-
},
43-
npm: {
44-
devDependencies: {
45-
'@ember/jquery': '^0.5.1',
46-
'ember-source': '~2.18.0',
47-
},
48-
},
49-
},
50-
{
51-
name: 'ember-lts-3.4',
15+
name: 'ember-lts-3.8',
5216
npm: {
5317
devDependencies: {
54-
'ember-source': '~3.4.0',
18+
'ember-source': '~3.8.0',
5519
},
5620
},
5721
},
5822
{
59-
name: 'ember-lts-3.8',
23+
name: 'ember-lts-3.12',
6024
npm: {
6125
devDependencies: {
62-
'ember-source': '~3.8.0',
26+
'ember-source': '~3.12.0',
6327
},
6428
},
6529
},
6630
{
67-
name: 'ember-lts-3.12',
31+
name: 'ember-lts-3.16',
6832
npm: {
6933
devDependencies: {
70-
'ember-source': '~3.12.0',
34+
'ember-source': '~3.16.0',
7135
},
7236
},
7337
},

tests/dummy/lib/module-name-inliner/index.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

3-
let VersionChecker = require('ember-cli-version-checker');
4-
53
module.exports = {
64
name: require('./package').name,
75

@@ -11,11 +9,7 @@ module.exports = {
119

1210
setupPreprocessorRegistry(type, registry) {
1311
// can only add the plugin with this style on newer Ember versions
14-
let checker = new VersionChecker(this.project);
15-
if (checker.for('ember-source').gte('3.1.0')) {
16-
registry.add('htmlbars-ast-plugin', this.buildPlugin());
17-
}
18-
12+
registry.add('htmlbars-ast-plugin', this.buildPlugin());
1913
registry.add('htmlbars-ast-plugin', this.buildLegacyPlugin());
2014
},
2115

tests/dummy/lib/module-name-inliner/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
"keywords": [
55
"ember-addon"
66
],
7-
"dependencies": {
8-
"ember-cli-version-checker": "*"
9-
}
7+
"dependencies": {}
108
}

tests/integration/components/ast-plugins-test.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { module, test } from 'qunit';
22
import { setupRenderingTest } from 'ember-qunit';
33
import { render } from '@ember/test-helpers';
44
import { hbs } from 'ember-cli-htmlbars';
5-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
65

76
module('tests/integration/components/ast-plugins-test', function (hooks) {
87
setupRenderingTest(hooks);
@@ -16,14 +15,12 @@ module('tests/integration/components/ast-plugins-test', function (hooks) {
1615
);
1716
});
1817

19-
if (hasEmberVersion(3, 1)) {
20-
test('stand alone templates have AST plugins ran', async function (assert) {
21-
await render(hbs`{{x-module-name-inlined-component}}`);
18+
test('stand alone templates have AST plugins ran', async function (assert) {
19+
await render(hbs`{{x-module-name-inlined-component}}`);
2220

23-
assert.equal(
24-
this.element.textContent.trim(),
25-
'dummy/templates/components/x-module-name-inlined-component.hbs'
26-
);
27-
});
28-
}
21+
assert.equal(
22+
this.element.textContent.trim(),
23+
'dummy/templates/components/x-module-name-inlined-component.hbs'
24+
);
25+
});
2926
});

tests/integration/components/test-inline-precompile-test.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { render } from '@ember/test-helpers';
44
import hbsOne from 'htmlbars-inline-precompile';
55
import hbsTwo from 'ember-cli-htmlbars-inline-precompile';
66
import { hbs as hbsThree } from 'ember-cli-htmlbars';
7-
import hasEmberVersion from '@ember/test-helpers/has-ember-version';
87

98
module('tests/integration/components/test-inline-precompile', function (hooks) {
109
setupRenderingTest(hooks);
@@ -33,11 +32,9 @@ module('tests/integration/components/test-inline-precompile', function (hooks) {
3332
assert.equal(this.element.textContent.trim(), 'sbh.etalpmet-olleh');
3433
});
3534

36-
if (hasEmberVersion(3, 1)) {
37-
test('inline templates have AST plugins ran', async function (assert) {
38-
await render(hbsThree('{{module-name-inliner}}', { moduleName: 'hello-template.hbs' }));
35+
test('inline templates have AST plugins ran', async function (assert) {
36+
await render(hbsThree('{{module-name-inliner}}', { moduleName: 'hello-template.hbs' }));
3937

40-
assert.equal(this.element.textContent.trim(), 'hello-template.hbs');
41-
});
42-
}
38+
assert.equal(this.element.textContent.trim(), 'hello-template.hbs');
39+
});
4340
});

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4028,15 +4028,6 @@ ember-cli-typescript@^2.0.2:
40284028
stagehand "^1.0.0"
40294029
walk-sync "^1.0.0"
40304030

4031-
ember-cli-version-checker@*, ember-cli-version-checker@^5.0.2:
4032-
version "5.0.2"
4033-
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.0.2.tgz#7e96157be4b13b083a68078b188820193275d8c4"
4034-
integrity sha512-cqFrIg9++GKdpMv2DP8pryAhTcmCYUL2hzHatLwkcJe23s+ioZ0JQWte0avxZ5lJnwn5e3kzUKkLkDfHDFBMUw==
4035-
dependencies:
4036-
resolve-package-path "^2.0.0"
4037-
semver "^7.1.3"
4038-
silent-error "^1.1.1"
4039-
40404031
ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.2:
40414032
version "2.2.0"
40424033
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
@@ -4062,6 +4053,15 @@ ember-cli-version-checker@^4.1.0:
40624053
semver "^6.3.0"
40634054
silent-error "^1.1.1"
40644055

4056+
ember-cli-version-checker@^5.0.2:
4057+
version "5.0.2"
4058+
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.0.2.tgz#7e96157be4b13b083a68078b188820193275d8c4"
4059+
integrity sha512-cqFrIg9++GKdpMv2DP8pryAhTcmCYUL2hzHatLwkcJe23s+ioZ0JQWte0avxZ5lJnwn5e3kzUKkLkDfHDFBMUw==
4060+
dependencies:
4061+
resolve-package-path "^2.0.0"
4062+
semver "^7.1.3"
4063+
silent-error "^1.1.1"
4064+
40654065
ember-cli@~3.16.1:
40664066
version "3.16.1"
40674067
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.16.1.tgz#9c7333b5c939488b41820c4b59e6e00dc3e25a7b"

0 commit comments

Comments
 (0)