Skip to content

Commit 12c1c89

Browse files
alexdilibertojbailey4
authored andcommitted
Ember CLI v2.12 -> v2.13 (#62)
1 parent 867ab5b commit 12c1c89

File tree

11 files changed

+1379
-1141
lines changed

11 files changed

+1379
-1141
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module.exports = {
22
root: true,
33
parser: 'babel-eslint',
44
parserOptions: {
5-
ecmaVersion: 7,
5+
ecmaVersion: 2017,
66
sourceType: 'module'
77
},
88
extends: [

.template-lintrc.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 = {

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ node_js:
66
sudo: false
77

88
cache:
9-
directories:
10-
- $HOME/.npm
11-
- $HOME/.cache # includes bowers cache
9+
yarn: true
1210

1311
env:
1412
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
@@ -25,13 +23,14 @@ matrix:
2523
- env: EMBER_TRY_SCENARIO=ember-canary
2624

2725
before_install:
28-
- npm config set spin false
29-
- npm install -g bower phantomjs-prebuilt
26+
- curl -o- -L https://yarnpkg.com/install.sh | bash
27+
- export PATH=$HOME/.yarn/bin:$PATH
28+
- yarn global add bower phantomjs-prebuilt
3029
- bower --version
3130
- phantomjs --version
3231

3332
install:
34-
- npm install
33+
- yarn install --no-lockfile
3534
- bower install
3635

3736
script:

LICENSE

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

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function(defaults) {
55
var app = new EmberAddon(defaults, {
66
// Add options here
77
babel: {
8-
optional: ['es7.decorators']
8+
plugins: ['transform-decorators-legacy']
99
}
1010
});
1111

index.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* eslint-env node */
22
'use strict';
33

4-
var path = require('path');
5-
var Funnel = require('broccoli-funnel');
6-
var intersection = require('./lib/intersection');
7-
var difference = require('./lib/difference');
4+
const path = require('path');
5+
const Funnel = require('broccoli-funnel');
6+
const intersection = require('./lib/intersection');
7+
const difference = require('./lib/difference');
88

99
module.exports = {
1010
name: 'ember-bulma',
1111

12-
init: function(app) {
12+
init(app) {
1313
this._super.init && this._super.init.apply(this, arguments);
1414

1515
this.options = this.options || {};
1616
this.options.babel = this.options.babel || {};
17-
this.options.babel.optional = this.options.babel.optional || [];
17+
this.options.babel.plugins = this.options.babel.plugins || [];
1818

19-
if (this.options.babel.optional.indexOf('es7.decorators') === -1) {
20-
this.options.babel.optional.push('es7.decorators');
19+
if (this.options.babel.plugins.indexOf('transform-decorators-legacy') === -1) {
20+
this.options.babel.plugins.push('transform-decorators-legacy');
2121
}
2222
},
2323

24-
included: function(app, parentAddon) {
24+
included(app, parentAddon) {
2525
this._super.included.apply(this, arguments);
2626

2727
var target = parentAddon || app;
@@ -56,14 +56,14 @@ module.exports = {
5656
https://github.com/DockYard/ember-composable-components/
5757
https://github.com/DockYard/ember-composable-components#configuration
5858
*/
59-
treeForAddon: function() {
59+
treeForAddon() {
6060
// see: https://github.com/ember-cli/ember-cli/issues/4463
6161
var tree = this._super.treeForAddon.apply(this, arguments);
6262

6363
return this.filterComponents(tree, new RegExp('^modules\/' + this.name + '\/components\/', 'i'));
6464
},
6565

66-
filterComponents: function(tree, regex) {
66+
filterComponents(tree, regex) {
6767
var whitelist = this.whitelist;
6868
var blacklist = this.blacklist;
6969
var _this = this;
@@ -85,7 +85,7 @@ module.exports = {
8585
return funnelTree;
8686
},
8787

88-
exclusionFilter: function(name, regex, lists) {
88+
exclusionFilter(name, regex, lists) {
8989
var whitelist = lists.whitelist || [];
9090
var blacklist = lists.blacklist || [];
9191
var isAddonComponent = regex.test(name);
@@ -121,7 +121,7 @@ module.exports = {
121121
return !isWhitelisted || isBlacklisted;
122122
},
123123

124-
generateWhitelist: function(addonConfig) {
124+
generateWhitelist(addonConfig) {
125125
var only = addonConfig.only || [];
126126
var except = addonConfig.except || [];
127127

@@ -132,7 +132,7 @@ module.exports = {
132132
return only;
133133
},
134134

135-
generateBlacklist: function(addonConfig) {
135+
generateBlacklist(addonConfig) {
136136
var only = addonConfig.only || [];
137137
var except = addonConfig.except || [];
138138

@@ -143,7 +143,7 @@ module.exports = {
143143
return except;
144144
},
145145

146-
isDevelopingAddon: function() {
146+
isDevelopingAddon() {
147147
return true;
148148
}
149149
};

package.json

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,34 @@
2424
"test": "ember try:each"
2525
},
2626
"dependencies": {
27-
"babel-eslint": "^7.2.1",
28-
"broccoli-funnel": "^1.0.1",
29-
"ember-cli-babel": "^5.1.7",
27+
"babel-eslint": "^7.2.3",
28+
"broccoli-funnel": "^1.2.0",
29+
"ember-cli-babel": "^6.0.0",
3030
"ember-cli-htmlbars": "^1.1.1",
3131
"ember-computed-decorators": "^0.3.0"
3232
},
3333
"devDependencies": {
34+
"babel-plugin-transform-decorators-legacy": "^1.3.4",
3435
"broccoli-asset-rev": "^2.4.5",
35-
"bulma": "^0.1.2",
36-
"ember-ajax": "^2.4.1",
37-
"ember-cli": "2.12.1",
36+
"bulma": "0.1.2",
37+
"ember-ajax": "^3.0.0",
38+
"ember-cli": "2.13.2",
3839
"ember-cli-content-security-policy": "^0.6.0",
3940
"ember-cli-dependency-checker": "^1.3.0",
40-
"ember-cli-eslint": "^3.0.3",
41-
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
41+
"ember-cli-eslint": "^3.0.0",
42+
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
4243
"ember-cli-inject-live-reload": "^1.4.1",
43-
"ember-cli-qunit": "^3.1.0",
44+
"ember-cli-qunit": "^4.0.0",
4445
"ember-cli-sass": "^6.1.3",
45-
"ember-cli-shims": "^1.0.2",
46+
"ember-cli-shims": "^1.1.0",
4647
"ember-cli-sri": "^2.1.0",
4748
"ember-cli-uglify": "^1.2.0",
4849
"ember-composable-helpers": "~2.0.0",
4950
"ember-disable-prototype-extensions": "^1.1.0",
5051
"ember-export-application-global": "^2.0.0",
5152
"ember-load-initializers": "^1.0.0",
5253
"ember-resolver": "^4.0.0",
53-
"ember-source": "~2.12.0",
54+
"ember-source": "~2.13.3",
5455
"ember-themed-syntax": "0.0.7",
5556
"eslint-plugin-ember-suave": "^1.0.0",
5657
"loader.js": "^4.2.3"
@@ -60,6 +61,9 @@
6061
},
6162
"ember-addon": {
6263
"configPath": "tests/dummy/config",
63-
"demoURL": "http://open-tux.github.io/ember-bulma/"
64+
"demoURL": "http://open-tux.github.io/ember-bulma/",
65+
"after": [
66+
"ember-computed-decorators"
67+
]
6468
}
6569
}

tests/dummy/app/app.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ const {
99

1010
let App;
1111

12-
Ember.MODEL_FACTORY_INJECTIONS = true;
13-
1412
App = Application.extend({
1513
modulePrefix: config.modulePrefix,
1614
podModulePrefix: config.podModulePrefix,

tests/dummy/config/targets.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/* eslint-env node */
2+
3+
module.exports = {
4+
browsers: [
5+
'ie 9',
6+
'last 1 Chrome versions',
7+
'last 1 Firefox versions',
8+
'last 1 Safari versions'
9+
]
10+
};

tests/test-helper.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
22
import {
33
setResolver
44
} from 'ember-qunit';
5+
import { start } from 'ember-cli-qunit';
56

67
setResolver(resolver);
8+
start();

0 commit comments

Comments
 (0)