Skip to content

Commit fc53a01

Browse files
roncoronco
authored
Merge pull request #32 from cibernox/unify-second-attempt
Make addon more idiomatic at the expense of making it 2.10+ & fastboot 1.0rc+
2 parents 55e180d + b004393 commit fc53a01

16 files changed

Lines changed: 311 additions & 453 deletions

File tree

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ env:
1717
- EMBER_TRY_SCENARIO=ember-canary
1818
- EMBER_TRY_SCENARIO=ember-default
1919
- EMBER_TRY_SCENARIO=fastboot
20-
- EMBER_TRY_SCENARIO=fastboot-ember-2.9
2120

2221
matrix:
2322
fast_finish: true

‎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.

‎config/ember-try.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,6 @@ module.exports = {
9595
'ember-source': null
9696
}
9797
}
98-
},
99-
{
100-
name: 'fastboot-ember-2.9',
101-
command: 'ember fastboot:test --ember-version 2.9.0',
102-
npm: {
103-
devDependencies: {
104-
'ember-source': null
105-
}
106-
}
10798
}
10899
]
109100
};

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

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

‎fastboot-tests/fastboot-1.0-beta-test.js‎

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

‎fastboot-tests/fixtures/fastboot-beta/app/router.js‎

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

‎fastboot-tests/fixtures/fastboot-beta/app/routes/application.js‎

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

‎fastboot-tests/fixtures/fastboot-beta/app/routes/other-page.js‎

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

‎fastboot-tests/fixtures/fastboot-beta/app/templates/head.hbs‎

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

0 commit comments

Comments
 (0)