Skip to content

Commit bd89664

Browse files
committed
Ember CLI v2.12.1
1 parent ed3fb21 commit bd89664

File tree

11 files changed

+251
-689
lines changed

11 files changed

+251
-689
lines changed

.npmignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
.editorconfig
99
.ember-cli
1010
.gitignore
11-
.jshintrc
11+
.eslintrc.js
1212
.watchmanconfig
1313
.travis.yml
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
1717

1818
/*.sublime-workspace
19-
/*.sublime-project
19+
/*.sublime-project

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
language: node_js
33
node_js:
4-
- "4"
4+
- "6"
55

66
sudo: false
77

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@ All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [Unreleased][unreleased]
6+
### Added
7+
- Github Fork ribbon for dummy app `application.hbs`
8+
- Github Star button for dummy app `application.hbs`
9+
610
### Updated
711
- `package.json` dependencies
812
- Integration tests now use standard DOM instead of jQuery
913
- API uses `onclick` instead of `action` for strict closure action handling
1014
- Use native Ember `ariaRole` property
1115
- `package.json` dependencies
16+
- Ember CLI v2.12.1
1217

1318
### Removed
1419
- Acceptance tests

config/ember-try.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
module.exports = {
33
scenarios: [
44
{

config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
'use strict';
33

44
module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/*jshint node:true*/
2-
/* global require, module */
3-
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
1+
/* eslint-env node */
2+
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
43

54
module.exports = function(defaults) {
65
var app = new EmberAddon(defaults, {

package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,39 +42,37 @@
4242
"chai": "^3.5.0",
4343
"chalk": "^1.1.3",
4444
"ember-ajax": "^2.4.1",
45-
"ember-cli": "2.11.1",
45+
"ember-cli": "2.12.1",
4646
"ember-cli-addon-tests": "~0.6.3",
4747
"ember-cli-anybar": "0.5.0",
48-
"ember-cli-app-version": "^2.0.0",
4948
"ember-cli-content-security-policy": "0.6.0",
5049
"ember-cli-dependency-checker": "^1.3.0",
5150
"ember-cli-dependency-lint": "1.0.2",
52-
"ember-cli-eslint": "3.0.2",
51+
"ember-cli-eslint": "^3.0.0",
5352
"ember-cli-github-pages": "0.1.2",
5453
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
5554
"ember-cli-inject-live-reload": "^1.4.1",
56-
"ember-cli-qunit": "^3.0.1",
55+
"ember-cli-qunit": "^3.1.0",
5756
"ember-cli-release": "^0.2.9",
5857
"ember-cli-sass": "^6.1.1",
5958
"ember-cli-shims": "^1.0.2",
6059
"ember-cli-sri": "^2.1.0",
61-
"ember-cli-test-loader": "^1.1.0",
6260
"ember-cli-uglify": "^1.2.0",
6361
"ember-disable-prototype-extensions": "^1.1.0",
6462
"ember-export-application-global": "^1.0.5",
6563
"ember-load-initializers": "^0.6.0",
6664
"ember-native-dom-helpers": "0.3.2",
6765
"ember-percy": "1.2.6",
6866
"ember-resolver": "^2.0.3",
69-
"ember-source": "~2.11.3",
67+
"ember-source": "~2.12.0",
7068
"eslint-plugin-ember-suave": "^1.0.0",
71-
"loader.js": "^4.0.10",
69+
"loader.js": "^4.2.3",
7270
"mocha": "^3.1.2",
7371
"request": "^2.81.0",
7472
"rsvp": "^3.5.0"
7573
},
7674
"engines": {
77-
"node": ">= 0.12.0"
75+
"node": ">= 4"
7876
},
7977
"ember-addon": {
8078
"configPath": "tests/dummy/config",

testem.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
module.exports = {
3-
"framework": "qunit",
43
"test_page": "tests/index.html?hidepassed",
54
"disable_watching": true,
65
"launch_in_ci": [

tests/dummy/app/templates/application.hbs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="container">
22
<div class="page-header">
3-
<h1>ember-cli-transformicons</h1>
3+
<h1>ember-cli-transformicons</h1><iframe src="https://ghbtns.com/github-btn.html?user=alexdiliberto&repo=ember-cli-transformicons&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe>
44
</div>
55
<div class="row">
66
<div class="col-xs-12">
@@ -20,3 +20,5 @@
2020

2121
{{outlet}}
2222
</div>
23+
24+
<a href="https://github.com/you"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>

tests/dummy/config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* jshint node: true */
1+
/* eslint-env node */
22

33
module.exports = function(environment) {
44
var ENV = {

0 commit comments

Comments
 (0)