Skip to content

Commit 5582d69

Browse files
raidokimroen
authored andcommitted
Update to Ember.js and Ember-CLI 2.18, Babel 6.6.0
1 parent 505367e commit 5582d69

39 files changed

Lines changed: 171 additions & 130 deletions

.codeclimate.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ engines:
77
- javascript
88
eslint:
99
enabled: true
10+
channel: "eslint-4"
1011
fixme:
1112
enabled: true
1213
ratings:
@@ -17,5 +18,6 @@ exclude_paths:
1718
- dist/
1819
- node_modules/
1920
- tests/
21+
- fastboot-tests/
2022
- vendor/
2123
- tmp/

.editorconfig

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,8 @@ insert_final_newline = true
1313
indent_style = space
1414
indent_size = 2
1515

16-
[*.js]
17-
indent_style = space
18-
indent_size = 2
19-
2016
[*.hbs]
2117
insert_final_newline = false
22-
indent_style = space
23-
indent_size = 2
24-
25-
[*.css]
26-
indent_style = space
27-
indent_size = 2
28-
29-
[*.html]
30-
indent_style = space
31-
indent_size = 2
3218

3319
[*.{diff,md}]
3420
trim_trailing_whitespace = false

.eslintrc.js

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,56 @@ module.exports = {
44
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'index.js',
24+
'testem.js',
25+
'ember-cli-build.js',
26+
'config/**/*.js',
27+
'tests/dummy/config/**/*.js',
28+
'fastboot-tests/*.js'
29+
],
30+
excludedFiles: [
31+
'app/**',
32+
'addon/**',
33+
'tests/dummy/app/**',
34+
'fastboot-tests/fixtures/**'
35+
],
36+
parserOptions: {
37+
sourceType: 'script',
38+
ecmaVersion: 2015
39+
},
40+
env: {
41+
browser: false,
42+
node: true
43+
},
44+
plugins: ['node'],
45+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
46+
// add your custom rules and overrides for node files here
47+
})
48+
},
49+
50+
// test files
51+
{
52+
files: ['tests/**/*.js'],
53+
excludedFiles: ['tests/dummy/**/*.js'],
54+
env: {
55+
embertest: true
56+
}
57+
}
58+
]
1359
};

.npmignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
.bowerrc
99
.editorconfig
1010
.ember-cli
11-
.gitignore
1211
.eslintrc.js
12+
.gitignore
1313
.watchmanconfig
1414
.travis.yml
1515
bower.json
1616
ember-cli-build.js
1717
testem.js
18+
19+
# ember-try
20+
.node_modules.ember-try/
21+
bower.json.ember-try
22+
package.json.ember-try

.travis.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,21 @@ cache:
1616
- $HOME/.npm
1717

1818
env:
19+
global:
20+
# See https://git.io/vdao3 for details.
21+
- JOBS=1
1922
# we recommend new addons test the current and previous LTS
2023
# as well as latest stable release (bonus points to beta/canary)
21-
- EMBER_TRY_SCENARIO=ember-pre-2
22-
- EMBER_TRY_SCENARIO=ember-lts-2.8
23-
- EMBER_TRY_SCENARIO=ember-lts-2.12
24-
- EMBER_TRY_SCENARIO=ember-release
25-
- EMBER_TRY_SCENARIO=ember-beta
26-
- EMBER_TRY_SCENARIO=ember-canary
27-
- EMBER_TRY_SCENARIO=fastboot-addon-tests
28-
- EMBER_TRY_SCENARIO=ember-default
24+
matrix:
25+
- EMBER_TRY_SCENARIO=ember-pre-2
26+
- EMBER_TRY_SCENARIO=ember-lts-2.8
27+
- EMBER_TRY_SCENARIO=ember-lts-2.12
28+
- EMBER_TRY_SCENARIO=ember-lts-2.16
29+
- EMBER_TRY_SCENARIO=ember-release
30+
- EMBER_TRY_SCENARIO=ember-beta
31+
- EMBER_TRY_SCENARIO=ember-canary
32+
- EMBER_TRY_SCENARIO=fastboot-addon-tests
33+
- EMBER_TRY_SCENARIO=ember-default
2934

3035
matrix:
3136
fast_finish: true
@@ -38,6 +43,7 @@ before_install:
3843
- npm --version
3944

4045
script:
46+
- npm run lint:js
4147
# Usually, it's ok to finish the test scenario without reverting
4248
# to the addon's original dependency state, skipping "cleanup".
4349
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

config/ember-try.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
module.exports = {
32
scenarios: [
43
{
@@ -41,6 +40,14 @@ module.exports = {
4140
}
4241
}
4342
},
43+
{
44+
name: 'ember-lts-2.16',
45+
npm: {
46+
devDependencies: {
47+
'ember-source': '~2.16.0'
48+
}
49+
}
50+
},
4451
{
4552
name: 'ember-release',
4653
bower: {

config/environment.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

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

ember-cli-build.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Ember from 'ember';
1+
import EmberRouter from '@ember/routing/router';
22
import config from './config/environment';
33

4-
const Router = Ember.Router.extend({
4+
const Router = EmberRouter.extend({
55
location: config.locationType,
66
rootURL: config.rootURL
77
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Ember from 'ember';
1+
import Route from '@ember/routing/route';
22

3-
export default Ember.Route.extend({
3+
export default Route.extend({
44
title(tokens) {
55
tokens = [...tokens, "application"];
66
return tokens.reverse().join(' - ');

0 commit comments

Comments
 (0)