Skip to content

Commit 9fc93e5

Browse files
committed
fix: update
1 parent f9ce553 commit 9fc93e5

34 files changed

+388
-385
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.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

.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: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 2018,
5+
sourceType: 'module'
6+
},
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
14+
env: {
15+
browser: true
16+
},
17+
rules: {
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'.eslintrc.js',
24+
'.template-lintrc.js',
25+
'ember-cli-build.js',
26+
'index.js',
27+
'testem.js',
28+
'blueprints/*/index.js',
29+
'config/**/*.js',
30+
'tests/dummy/config/**/*.js'
31+
],
32+
excludedFiles: [
33+
'addon/**',
34+
'addon-test-support/**',
35+
'app/**',
36+
'tests/dummy/app/**'
37+
],
38+
parserOptions: {
39+
sourceType: 'script',
40+
ecmaVersion: 2015
41+
},
42+
env: {
43+
browser: false,
44+
node: true
45+
},
46+
plugins: ['node'],
47+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48+
// add your custom rules and overrides for node files here
49+
})
50+
}
51+
]
52+
};

.gitignore

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# 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
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
14-
/coverage/*
16+
/coverage/
1517
/libpeerconnection.log
16-
npm-debug.log
17-
testem.log
18+
/npm-debug.log*
19+
/testem.log
20+
/yarn-error.log
21+
22+
# ember-try
23+
/.node_modules.ember-try/
24+
/bower.json.ember-try
25+
/package.json.ember-try

.jshintrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

.npmignore

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
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+
/.env*
13+
/.eslintignore
14+
/.eslintrc.js
15+
/.gitignore
16+
/.template-lintrc.js
17+
/.travis.yml
18+
/.watchmanconfig
19+
/bower.json
220
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.gitignore
11-
.jshintrc
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
21+
/CONTRIBUTING.md
22+
/ember-cli-build.js
23+
/testem.js
24+
/tests/
25+
/yarn.lock
26+
.gitkeep
27+
28+
# ember-try
29+
/.node_modules.ember-try/
30+
/bower.json.ember-try
31+
/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: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,55 @@
11
---
22
language: node_js
33
node_js:
4-
- "4"
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+
- "8"
57

68
sudo: false
9+
dist: trusty
10+
11+
addons:
12+
chrome: stable
713

814
cache:
915
directories:
10-
- node_modules
16+
- $HOME/.npm
1117

1218
env:
13-
- EMBER_TRY_SCENARIO=default
14-
- EMBER_TRY_SCENARIO=ember-1.13
15-
- EMBER_TRY_SCENARIO=ember-release
16-
- EMBER_TRY_SCENARIO=ember-beta
17-
- EMBER_TRY_SCENARIO=ember-canary
18-
19-
matrix:
20-
fast_finish: true
19+
global:
20+
# See https://git.io/vdao3 for details.
21+
- JOBS=1
22+
23+
branches:
24+
only:
25+
- master
26+
# npm version tags
27+
- /^v\d+\.\d+\.\d+/
28+
29+
jobs:
30+
fail_fast: true
2131
allow_failures:
2232
- env: EMBER_TRY_SCENARIO=ember-canary
2333

24-
before_install:
25-
- npm config set spin false
26-
- npm install -g bower
27-
- npm install phantomjs-prebuilt
34+
include:
35+
# runs linting and tests with current locked deps
2836

29-
install:
30-
- npm install
31-
- bower install
37+
- stage: "Tests"
38+
name: "Tests"
39+
script:
40+
- npm run lint:hbs
41+
- npm run lint:js
42+
- npm test
43+
44+
# we recommend new addons test the current and previous LTS
45+
# as well as latest stable release (bonus points to beta/canary)
46+
- stage: "Additional Tests"
47+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
48+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
49+
- env: EMBER_TRY_SCENARIO=ember-release
50+
- env: EMBER_TRY_SCENARIO=ember-beta
51+
- env: EMBER_TRY_SCENARIO=ember-canary
52+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
3253

3354
script:
34-
# Usually, it's ok to finish the test scenario without reverting
35-
# to the addon's original dependency state, skipping "cleanup".
36-
- ember try $EMBER_TRY_SCENARIO test --skip-cleanup
55+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CONTRIBUTING.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
1+
# How To Contribute
2+
13
## Installation
24

3-
* `git clone` this repository
5+
* `git clone <repository-url>`
6+
* `cd my-addon`
47
* `npm install`
5-
* `bower install`
68

7-
## Running
9+
## Linting
810

9-
* `ember server`
10-
* Visit your app at http://localhost:4200.
11+
* `npm run lint:hbs`
12+
* `npm run lint:js`
13+
* `npm run lint:js -- --fix`
1114

12-
## Running Tests
15+
## Running tests
1316

14-
* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
15-
* `ember test`
16-
* `ember test --server`
17+
* `ember test` Runs the test suite on the current Ember version
18+
* `ember test --server` – Runs the test suite in "watch mode"
19+
* `ember try:each` – Runs the test suite against multiple Ember versions
1720

18-
## Building
21+
## Running the dummy application
1922

20-
* `ember build`
23+
* `ember serve`
24+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2125

22-
For more information on using ember-cli, visit [http://ember-cli.com/](http://ember-cli.com/).
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

0 commit comments

Comments
 (0)