Skip to content

Commit 4080028

Browse files
cibernoxcibernox
committed
Make addon more idiomatic at the expense of making it 2.10+ & fastboot 1.0rc+
1 parent 55e180d commit 4080028

7 files changed

Lines changed: 311 additions & 367 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Install by running
1717
ember install ember-cli-head
1818
```
1919

20+
#### Version
21+
Take into account that version >= 0.3 of this addon require Ember 2.10+ and fastboot >=1.0.rc1
22+
Please use 0.2.X if you don't fulfull both requirements.
23+
2024
## Usage
2125

2226
#### Template
@@ -82,11 +86,11 @@ This will result in a document along the lines of:
8286

8387
<link rel="stylesheet" href="assets/vendor.css">
8488
<link rel="stylesheet" href="assets/my-app.css">
85-
89+
8690
<meta property="og:title" content="Demo App">
8791
</head>
8892
<body class="ember-application">
89-
93+
9094

9195
<script src="assets/vendor.js"></script>
9296
<script src="assets/my-app.js"></script>

‎app-lt-2-10/instance-initializers/head.js‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎fastboot-lt-2-10/instance-initializers/fastboot/head.js‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/instance-initializers/fastboot/head.js renamed to fastboot/instance-initializers/head.js

File renamed without changes.

‎index.js‎

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,6 @@
11
/* eslint-env node */
22
'use strict';
33

4-
const path = require('path');
5-
const filterInitializers = require('fastboot-filter-initializers');
6-
const VersionChecker = require('ember-cli-version-checker');
7-
const mergeTrees = require('broccoli-merge-trees');
8-
94
module.exports = {
10-
name: 'ember-cli-head',
11-
12-
treeForApp(defaultTree) {
13-
if (!process.env.FASTBOOT_NEW_BUILD) {
14-
let trees = [defaultTree];
15-
16-
if (!this.hasGlimmer2()) {
17-
trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-10')));
18-
trees.push(this.treeGenerator(path.resolve(this.root, 'fastboot-lt-2-10')));
19-
}
20-
21-
let tree = mergeTrees(trees, { overwrite: true });
22-
23-
return filterInitializers(tree);
24-
} else {
25-
let trees = [defaultTree];
26-
if (!this.hasGlimmer2()) {
27-
trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-10')));
28-
}
29-
30-
return mergeTrees(trees, { overwrite: true });
31-
}
32-
},
33-
34-
treeForFastBoot(tree) {
35-
// this hook will be invoked in post FastBoot 1.0
36-
if (!this.hasGlimmer2) {
37-
let fastBootHtmlBarsTree = this.treeGenerator(path.resolve(this.root, 'fastboot-lt-2-10'));
38-
return tree ? mergeTrees([tree, fastBootHtmlBarsTree], { overwrite: true }) : fastBootHtmlBarsTree;
39-
}
40-
return tree;
41-
},
42-
43-
hasGlimmer2() {
44-
let checker = new VersionChecker(this);
45-
let emberVersion = checker.for('ember-source', 'npm');
46-
47-
if (!emberVersion.version) {
48-
emberVersion = checker.for('ember', 'bower');
49-
}
50-
51-
// 2.9.0-beta.1 - 2.9.0-beta.5 used glimmer2 (but 2.9.0 did not)
52-
// 2.10.0-beta.1+ includes glimmer2
53-
return (emberVersion.gt('2.9.0-beta') && emberVersion.lt('2.9.0')) || emberVersion.gt('2.10.0-beta');
54-
}
5+
name: 'ember-cli-head'
556
};

‎package.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,8 @@
4747
"ember-addon"
4848
],
4949
"dependencies": {
50-
"broccoli-merge-trees": "^1.1.4",
51-
"ember-cli-babel": "^6.0.0",
52-
"ember-cli-htmlbars": "^1.3.0",
53-
"ember-cli-version-checker": "^1.1.6",
54-
"fastboot-filter-initializers": "^0.0.2"
50+
"ember-cli-babel": "^6.1.0",
51+
"ember-cli-htmlbars": "^2.0.1"
5552
},
5653
"engines": {
5754
"node": ">= 4"

0 commit comments

Comments
 (0)