Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ env:
- EMBER_TRY_SCENARIO=ember-canary
- EMBER_TRY_SCENARIO=ember-default
- EMBER_TRY_SCENARIO=fastboot
- EMBER_TRY_SCENARIO=fastboot-ember-2.9

matrix:
fast_finish: true
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Install by running
ember install ember-cli-head
```

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

## Usage

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

<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/my-app.css">

<meta property="og:title" content="Demo App">
</head>
<body class="ember-application">


<script src="assets/vendor.js"></script>
<script src="assets/my-app.js"></script>
Expand Down
32 changes: 0 additions & 32 deletions app-lt-2-10/instance-initializers/head.js

This file was deleted.

9 changes: 0 additions & 9 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,6 @@ module.exports = {
'ember-source': null
}
}
},
{
name: 'fastboot-ember-2.9',
command: 'ember fastboot:test --ember-version 2.9.0',
npm: {
devDependencies: {
'ember-source': null
}
}
}
]
};
19 changes: 0 additions & 19 deletions fastboot-lt-2-10/instance-initializers/fastboot/head.js

This file was deleted.

36 changes: 0 additions & 36 deletions fastboot-tests/fastboot-1.0-beta-test.js

This file was deleted.

13 changes: 0 additions & 13 deletions fastboot-tests/fixtures/fastboot-beta/app/router.js

This file was deleted.

10 changes: 0 additions & 10 deletions fastboot-tests/fixtures/fastboot-beta/app/routes/application.js

This file was deleted.

10 changes: 0 additions & 10 deletions fastboot-tests/fixtures/fastboot-beta/app/routes/other-page.js

This file was deleted.

5 changes: 0 additions & 5 deletions fastboot-tests/fixtures/fastboot-beta/app/templates/head.hbs

This file was deleted.

This file was deleted.

This file was deleted.

51 changes: 1 addition & 50 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,55 +1,6 @@
/* eslint-env node */
'use strict';

const path = require('path');
const filterInitializers = require('fastboot-filter-initializers');
const VersionChecker = require('ember-cli-version-checker');
const mergeTrees = require('broccoli-merge-trees');

module.exports = {
name: 'ember-cli-head',

treeForApp(defaultTree) {
if (!process.env.FASTBOOT_NEW_BUILD) {
let trees = [defaultTree];

if (!this.hasGlimmer2()) {
trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-10')));
trees.push(this.treeGenerator(path.resolve(this.root, 'fastboot-lt-2-10')));
}

let tree = mergeTrees(trees, { overwrite: true });

return filterInitializers(tree);
} else {
let trees = [defaultTree];
if (!this.hasGlimmer2()) {
trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-10')));
}

return mergeTrees(trees, { overwrite: true });
}
},

treeForFastBoot(tree) {
// this hook will be invoked in post FastBoot 1.0
if (!this.hasGlimmer2) {
let fastBootHtmlBarsTree = this.treeGenerator(path.resolve(this.root, 'fastboot-lt-2-10'));
return tree ? mergeTrees([tree, fastBootHtmlBarsTree], { overwrite: true }) : fastBootHtmlBarsTree;
}
return tree;
},

hasGlimmer2() {
let checker = new VersionChecker(this);
let emberVersion = checker.for('ember-source', 'npm');

if (!emberVersion.version) {
emberVersion = checker.for('ember', 'bower');
}

// 2.9.0-beta.1 - 2.9.0-beta.5 used glimmer2 (but 2.9.0 did not)
// 2.10.0-beta.1+ includes glimmer2
return (emberVersion.gt('2.9.0-beta') && emberVersion.lt('2.9.0')) || emberVersion.gt('2.10.0-beta');
}
name: 'ember-cli-head'
};
7 changes: 2 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,8 @@
"ember-addon"
],
"dependencies": {
"broccoli-merge-trees": "^1.1.4",
"ember-cli-babel": "^6.0.0",
"ember-cli-htmlbars": "^1.3.0",
"ember-cli-version-checker": "^1.1.6",
"fastboot-filter-initializers": "^0.0.2"
"ember-cli-babel": "^6.1.0",
"ember-cli-htmlbars": "^2.0.1"
},
"engines": {
"node": ">= 4"
Expand Down
Loading