Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Commit 02ffd4d

Browse files
upgrade!
1 parent 524d9f3 commit 02ffd4d

5 files changed

Lines changed: 258 additions & 270 deletions

File tree

.eslintrc.js

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module',
4+
ecmaVersion: 2018,
5+
sourceType: 'module'
66
},
7-
plugins: ['prettier', 'ember'],
8-
extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
914
env: {
10-
browser: true,
15+
browser: true
1116
},
1217
rules: {
1318
'comma-dangle': [
@@ -33,30 +38,26 @@ module.exports = {
3338
'testem.js',
3439
'blueprints/*/index.js',
3540
'config/**/*.js',
36-
'tests/dummy/config/**/*.js',
41+
'tests/dummy/config/**/*.js'
3742
],
3843
excludedFiles: [
3944
'addon/**',
4045
'addon-test-support/**',
4146
'app/**',
42-
'tests/dummy/app/**',
47+
'tests/dummy/app/**'
4348
],
4449
parserOptions: {
4550
sourceType: 'script',
46-
ecmaVersion: 2015,
51+
ecmaVersion: 2015
4752
},
4853
env: {
4954
browser: false,
50-
node: true,
55+
node: true
5156
},
5257
plugins: ['node'],
53-
rules: Object.assign(
54-
{},
55-
require('eslint-plugin-node').configs.recommended.rules,
56-
{
57-
// add your custom rules and overrides for node files here
58-
}
59-
),
60-
},
61-
],
58+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
59+
// add your custom rules and overrides for node files here
60+
})
61+
}
62+
]
6263
};

.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "6"
6+
- "8"
77

88
sudo: false
99
dist: trusty
@@ -12,7 +12,8 @@ addons:
1212
chrome: stable
1313

1414
cache:
15-
yarn: true
15+
directories:
16+
- $HOME/.npm
1617

1718
env:
1819
global:
@@ -50,12 +51,5 @@ jobs:
5051
- env: EMBER_TRY_SCENARIO=ember-canary
5152
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5253

53-
before_install:
54-
- curl -o- -L https://yarnpkg.com/install.sh | bash
55-
- export PATH=$HOME/.yarn/bin:$PATH
56-
57-
install:
58-
- yarn install --no-lockfile --non-interactive
59-
6054
script:
6155
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Compatibility
99

1010
* Ember.js v2.18 or above
1111
* Ember CLI v2.13 or above
12+
* Node.js v8 or above
1213

1314

1415
Installation

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,42 +28,42 @@
2828
},
2929
"dependencies": {
3030
"ember-auto-import": "^1.3.0",
31-
"ember-cli-babel": "^7.1.2",
32-
"ember-cli-htmlbars": "^3.0.0",
31+
"ember-cli-babel": "^7.7.3",
32+
"ember-cli-htmlbars": "^3.0.1",
3333
"justified-layout": "^2.1.1"
3434
},
3535
"devDependencies": {
36-
"@ember/optional-features": "^0.6.3",
37-
"broccoli-asset-rev": "^2.7.0",
38-
"ember-cli": "~3.9.0",
36+
"@ember/optional-features": "^0.7.0",
37+
"broccoli-asset-rev": "^3.0.0",
38+
"ember-cli": "~3.10.1",
3939
"ember-cli-dependency-checker": "^3.1.0",
4040
"ember-cli-eslint": "^5.1.0",
4141
"ember-cli-htmlbars": "^2.0.3",
42-
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
42+
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
4343
"ember-cli-inject-live-reload": "^1.8.2",
4444
"ember-cli-sri": "^2.1.1",
4545
"ember-cli-template-lint": "^1.0.0-beta.1",
4646
"ember-cli-uglify": "^2.1.0",
4747
"ember-disable-prototype-extensions": "^1.1.3",
4848
"ember-export-application-global": "^2.0.0",
49-
"ember-load-initializers": "^1.1.0",
49+
"ember-load-initializers": "^2.0.0",
5050
"ember-maybe-import-regenerator": "^0.1.6",
51-
"ember-qunit": "^3.4.1",
51+
"ember-qunit": "^4.4.1",
5252
"ember-resolver": "^5.0.1",
53-
"ember-source": "~3.9.0",
53+
"ember-source": "~3.10.0",
5454
"ember-source-channel-url": "^1.1.0",
5555
"ember-try": "^1.0.0",
5656
"ember-welcome-page": "^3.0.0",
5757
"eslint-config-prettier": "^2.9.0",
58-
"eslint-plugin-ember": "^5.2.0",
59-
"eslint-plugin-node": "^7.0.1",
58+
"eslint-plugin-ember": "^6.2.0",
59+
"eslint-plugin-node": "^9.0.1",
6060
"eslint-plugin-prettier": "^2.4.0",
6161
"loader.js": "^4.7.0",
6262
"prettier": "^1.9.2",
63-
"qunit-dom": "^0.8.0"
63+
"qunit-dom": "^0.8.4"
6464
},
6565
"engines": {
66-
"node": "6.* || 8.* || >= 10.*"
66+
"node": "8.* || >= 10.*"
6767
},
6868
"ember-addon": {
6969
"configPath": "tests/dummy/config"
@@ -73,7 +73,7 @@
7373
},
7474
"homepage": "https://github.com/Teamtailor/ember-justified-layout#readme",
7575
"toolchain": {
76-
"node": "6.17.1",
76+
"node": "8.16.0",
7777
"yarn": "1.16.0"
7878
}
7979
}

0 commit comments

Comments
 (0)