Skip to content

Commit dd3efb5

Browse files
authored
Upgrading to latest addon blueprint (#80)
* Upgrading to latest addon blueprint * Removing MODULE_REPORT.md * Adding extra blank line, because I'm OCD * Renames router to _router to remove deprecation warning * Fixing linting errors * Fixing the way we access router to be more robust
1 parent 4c3d7c2 commit dd3efb5

17 files changed

Lines changed: 8321 additions & 363 deletions

File tree

.eslintignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
17+
# ember-try
18+
/.node_modules.ember-try/
19+
/bower.json.ember-try
20+
/package.json.ember-try

.eslintrc.js

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,51 @@ module.exports = {
22
root: true,
33
parserOptions: {
44
ecmaVersion: 2017,
5-
sourceType: 'module'
5+
sourceType: 'module',
66
},
7-
plugins: [
8-
'ember'
9-
],
10-
extends: [
11-
'eslint:recommended',
12-
'plugin:ember/recommended'
13-
],
7+
plugins: ['ember'],
8+
extends: ['eslint:recommended', 'plugin:ember/recommended'],
149
env: {
15-
browser: true
16-
},
17-
rules: {
10+
browser: true,
1811
},
12+
rules: {},
1913
overrides: [
2014
// node files
2115
{
2216
files: [
17+
'.eslintrc.js',
18+
'.template-lintrc.js',
19+
'ember-cli-build.js',
2320
'index.js',
2421
'testem.js',
25-
'ember-cli-build.js',
22+
'blueprints/*/index.js',
2623
'config/**/*.js',
2724
'tests/dummy/config/**/*.js',
28-
'fastboot-tests/*.js'
25+
'fastboot-tests/*.js',
2926
],
3027
excludedFiles: [
31-
'app/**',
3228
'addon/**',
29+
'addon-test-support/**',
30+
'app/**',
3331
'tests/dummy/app/**',
34-
'fastboot-tests/fixtures/**'
32+
'fastboot-tests/fixtures/**',
3533
],
3634
parserOptions: {
3735
sourceType: 'script',
38-
ecmaVersion: 2015
36+
ecmaVersion: 2015,
3937
},
4038
env: {
4139
browser: false,
42-
node: true
40+
node: true,
4341
},
4442
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-
})
43+
rules: Object.assign(
44+
{},
45+
require('eslint-plugin-node').configs.recommended.rules,
46+
{
47+
// add your custom rules and overrides for node files here
48+
}
49+
),
4850
},
49-
50-
// test files
51-
{
52-
files: ['tests/**/*.js'],
53-
excludedFiles: ['tests/dummy/**/*.js'],
54-
env: {
55-
embertest: true
56-
}
57-
}
58-
]
51+
],
5952
};

.gitignore

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
1212
/.sass-cache
1313
/connect.lock
14-
/coverage/*
14+
/coverage/
1515
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
16+
/npm-debug.log*
17+
/testem.log
18+
/yarn-error.log
1919

2020
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
21+
/.node_modules.ember-try/
22+
/bower.json.ember-try
23+
/package.json.ember-try

.npmignore

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
1-
/bower_components
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.eslintignore
13+
/.eslintrc.js
14+
/.gitignore
15+
/.template-lintrc.js
16+
/.travis.yml
17+
/.watchmanconfig
18+
/bower.json
219
/config/ember-try.js
3-
/dist
4-
/fastboot-tests
5-
/tests
6-
/tmp
7-
**/.gitkeep
8-
.bowerrc
9-
.editorconfig
10-
.ember-cli
11-
.eslintrc.js
12-
.gitignore
13-
.watchmanconfig
14-
.travis.yml
15-
bower.json
16-
ember-cli-build.js
17-
testem.js
20+
/ember-cli-build.js
21+
/testem.js
22+
/tests/
23+
/yarn.lock
24+
.gitkeep
1825

1926
# ember-try
20-
.node_modules.ember-try/
21-
bower.json.ember-try
22-
package.json.ember-try
27+
/.node_modules.ember-try/
28+
/bower.json.ember-try
29+
/package.json.ember-try

.template-lintrc.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+
extends: 'recommended'
5+
};

.travis.yml

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,59 @@ 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-
- "4"
6+
- "6"
77

8-
sudo: required
8+
sudo: false
99
dist: trusty
1010

1111
addons:
1212
chrome: stable
1313

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

1817
env:
1918
global:
2019
# See https://git.io/vdao3 for details.
2120
- JOBS=1
22-
# we recommend new addons test the current and previous LTS
23-
# as well as latest stable release (bonus points to beta/canary)
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
34-
35-
matrix:
36-
fast_finish: true
21+
22+
jobs:
23+
fail_fast: true
3724
allow_failures:
3825
- env: EMBER_TRY_SCENARIO=ember-canary
3926

27+
include:
28+
# runs linting and tests with current locked deps
29+
30+
- stage: "Tests"
31+
name: "Tests"
32+
install:
33+
- yarn install --non-interactive
34+
script:
35+
- yarn lint:hbs
36+
- yarn lint:js
37+
- yarn test
38+
39+
- name: "Floating Dependencies"
40+
script:
41+
- yarn test
42+
43+
# we recommend new addons test the current and previous LTS
44+
# as well as latest stable release (bonus points to beta/canary)
45+
- stage: "Additional Tests"
46+
env: EMBER_TRY_SCENARIO=ember-lts-2.16
47+
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
48+
- env: EMBER_TRY_SCENARIO=ember-release
49+
- env: EMBER_TRY_SCENARIO=ember-beta
50+
- env: EMBER_TRY_SCENARIO=ember-canary
51+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
52+
4053
before_install:
41-
- npm config set spin false
42-
- npm install -g npm@4
43-
- npm --version
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
4459

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

0 commit comments

Comments
 (0)