Skip to content

Commit c3450bc

Browse files
authored
Merge pull request #54 from btecu/octane
Octane Updates
2 parents 2975a0e + ac1a183 commit c3450bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5277
-2771
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.eslintcache
1617

1718
# ember-try
1819
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,47 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
1917
],
2018
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-jquery': 'error'
19+
browser: true,
2520
},
21+
rules: {},
2622
overrides: [
2723
// node files
2824
{
2925
files: [
3026
'.eslintrc.js',
27+
'.prettierrc.js',
3128
'.template-lintrc.js',
3229
'ember-cli-build.js',
3330
'index.js',
3431
'testem.js',
3532
'blueprints/*/index.js',
3633
'config/**/*.js',
37-
'tests/dummy/config/**/*.js'
34+
'tests/dummy/config/**/*.js',
3835
],
3936
excludedFiles: [
4037
'addon/**',
4138
'addon-test-support/**',
4239
'app/**',
43-
'tests/dummy/app/**'
40+
'tests/dummy/app/**',
4441
],
4542
parserOptions: {
46-
sourceType: 'script'
43+
sourceType: 'script',
4744
},
4845
env: {
4946
browser: false,
50-
node: true
47+
node: true,
5148
},
5249
plugins: ['node'],
53-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
54-
// add your custom rules and overrides for node files here
55-
})
56-
}
57-
]
50+
extends: ['plugin:node/recommended'],
51+
},
52+
],
5853
};

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
1617
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1720
/.template-lintrc.js
1821
/.travis.yml
1922
/.watchmanconfig

.prettierignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.prettierrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'octane',
55
};

.travis.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ 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-
- "10"
6+
- "12"
77

8-
dist: trusty
8+
dist: xenial
99

1010
addons:
1111
chrome: stable
@@ -46,20 +46,19 @@ jobs:
4646

4747
# we recommend new addons test the current and previous LTS
4848
# as well as latest stable release (bonus points to beta/canary)
49-
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
50-
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.24
5151
- env: EMBER_TRY_SCENARIO=ember-release
5252
- env: EMBER_TRY_SCENARIO=ember-beta
5353
- env: EMBER_TRY_SCENARIO=ember-canary
5454
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5555
- env: EMBER_TRY_SCENARIO=ember-classic
56+
# - env: EMBER_TRY_SCENARIO=embroider-safe
57+
# - env: EMBER_TRY_SCENARIO=embroider-optimized
5658

5759
before_install:
5860
- curl -o- -L https://yarnpkg.com/install.sh | bash
5961
- export PATH=$HOME/.yarn/bin:$PATH
6062

61-
install:
62-
- yarn install --non-interactive
63-
6463
script:
6564
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

11-
* `yarn lint:hbs`
12-
* `yarn lint:js`
13-
* `yarn lint:js --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Lightweight, composable tree component for Ember without any dependency.
77
Compatibility
88
------------------------------------------------------------------------------
99

10-
* Ember.js v3.4 or above
11-
* Ember CLI v3.0 or above
12-
* Node.js v8 or above
10+
* Ember.js v3.16 or above
11+
* Ember CLI v2.13 or above
12+
* Node.js v12 or above
1313

1414
If you are using 0.5.x and would like to upgrade to 0.6.0, please note there
1515
are BREAKING CHANGES. For details, see [Upgrading](UPGRADING.md).

0 commit comments

Comments
 (0)