Skip to content

Commit 8bf5324

Browse files
committed
Update to latest ember. Tests pass
1 parent 512a65b commit 8bf5324

26 files changed

Lines changed: 22060 additions & 173 deletions

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# misc
1515
/coverage/
1616
!.*
17+
.eslintcache
1718

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

.eslintrc.js

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,48 @@ 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',
17+
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-jquery': 'error',
25-
'ember/no-get': 'off',
20+
browser: true,
2621
},
22+
rules: {},
2723
overrides: [
2824
// node files
2925
{
3026
files: [
3127
'.eslintrc.js',
28+
'.prettierrc.js',
3229
'.template-lintrc.js',
3330
'ember-cli-build.js',
3431
'index.js',
3532
'testem.js',
3633
'blueprints/*/index.js',
3734
'config/**/*.js',
38-
'tests/dummy/config/**/*.js'
35+
'tests/dummy/config/**/*.js',
3936
],
4037
excludedFiles: [
4138
'addon/**',
4239
'addon-test-support/**',
4340
'app/**',
44-
'tests/dummy/app/**'
41+
'tests/dummy/app/**',
4542
],
4643
parserOptions: {
47-
sourceType: 'script'
44+
sourceType: 'script',
4845
},
4946
env: {
5047
browser: false,
51-
node: true
48+
node: true,
5249
},
5350
plugins: ['node'],
54-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
55-
// add your custom rules and overrides for node files here
56-
})
57-
}
58-
]
51+
extends: ['plugin:node/recommended'],
52+
},
53+
],
5954
};

.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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended',
5-
rules: {
6-
'no-html-comments': false
7-
}
4+
extends: 'octane',
85
};

.travis.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
---
2+
language: node_js
3+
node_js:
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
6+
- "10"
7+
8+
dist: xenial
9+
10+
addons:
11+
chrome: stable
12+
13+
cache:
14+
yarn: true
15+
16+
env:
17+
global:
18+
# See https://git.io/vdao3 for details.
19+
- JOBS=1
20+
21+
branches:
22+
only:
23+
- master
24+
# npm version tags
25+
- /^v\d+\.\d+\.\d+/
26+
27+
jobs:
28+
fast_finish: true
29+
allow_failures:
30+
- env: EMBER_TRY_SCENARIO=ember-canary
31+
32+
include:
33+
# runs linting and tests with current locked deps
34+
- stage: "Tests"
35+
name: "Tests"
36+
script:
37+
- yarn lint
38+
- yarn test:ember
39+
40+
- stage: "Additional Tests"
41+
name: "Floating Dependencies"
42+
install:
43+
- yarn install --no-lockfile --non-interactive
44+
script:
45+
- yarn test:ember
46+
47+
# we recommend new addons test the current and previous LTS
48+
# as well as latest stable release (bonus points to beta/canary)
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
51+
- env: EMBER_TRY_SCENARIO=ember-release
52+
- env: EMBER_TRY_SCENARIO=ember-beta
53+
- env: EMBER_TRY_SCENARIO=ember-canary
54+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
55+
- env: EMBER_TRY_SCENARIO=ember-classic
56+
- env: EMBER_TRY_SCENARIO=embroider-safe
57+
- env: EMBER_TRY_SCENARIO=embroider-optimized
58+
59+
before_install:
60+
- curl -o- -L https://yarnpkg.com/install.sh | bash
61+
- export PATH=$HOME/.yarn/bin:$PATH
62+
63+
script:
64+
- 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: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ This addon lets you populate `<head>` tag from your Ember code without any direc
66

77
The hope is that, in the future, Ember will provide a mechanism for populating `<head>` tag from your app. Until then, this addon provides that functionality.
88

9-
10-
## Compatibility
11-
12-
* Ember.js v2.18 or above
9+
* Ember.js v3.16 or above
1310
* Ember CLI v2.13 or above
1411
* Node.js v10 or above
1512

0 commit comments

Comments
 (0)