Skip to content

Commit bb83d00

Browse files
amkirwanamkirwan
authored
Merge pull request #37 from miguelcobain/master
update ember-cli. update tests. use ES6. cleanup.
2 parents 75073ae + 9c41ece commit bb83d00

Some content is hidden

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

45 files changed

+11716
-900
lines changed

‎.bowerrc‎

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

‎.eslintignore‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
12+
# misc
13+
/coverage/
14+
!.*
15+
16+
# ember-try
17+
/.node_modules.ember-try/
18+
/bower.json.ember-try
19+
/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: 2017,
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: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
*.gem
2-
*.rbc
3-
.bundle
4-
.config
5-
.yardoc
6-
*.swp
7-
*.swo
8-
.DS_Store
9-
.grunt
10-
Gemfile.lock
11-
InstalledFiles
12-
_yardoc
13-
coverage
14-
doc/
15-
lib/bundler/man
16-
pkg
17-
rdoc
18-
spec/reports
19-
test/tmp
20-
test/version_tmp
21-
tmp/
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
222

23-
bower_components/
24-
node_modules/
25-
vendor/
3+
# compiled output
4+
/dist/
5+
/tmp/
6+
7+
# dependencies
8+
/bower_components/
9+
/node_modules/
10+
11+
# misc
12+
/.sass-cache
13+
/connect.lock
14+
/coverage/
15+
/libpeerconnection.log
16+
/npm-debug.log*
17+
/testem.log
18+
/yarn-error.log
19+
20+
# ember-try
21+
/.node_modules.ember-try/
22+
/bower.json.ember-try
23+
/package.json.ember-try

‎.jshintrc‎

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

‎.npmignore‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
1-
*.gem
2-
*.rbc
3-
.bundle
4-
.config
5-
.yardoc
6-
*.swp
7-
*.swo
8-
.DS_Store
9-
.grunt
10-
Gemfile.lock
11-
InstalledFiles
12-
_yardoc
13-
coverage
14-
doc/
15-
lib/bundler/man
16-
pkg
17-
rdoc
18-
spec/reports
19-
test/tmp
20-
test/version_tmp
21-
tmp/
1+
# compiled output
2+
/dist/
3+
/tmp/
224

23-
bower_components/
24-
node_modules/
25-
Gruntfile.js
26-
yuidoc.json
27-
src/
28-
.travis.yml
29-
CHANGELOG.md
30-
bower.json
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
19+
/config/ember-try.js
20+
/ember-cli-build.js
21+
/testem.js
22+
/tests/
23+
/yarn.lock
24+
.gitkeep
25+
26+
# 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: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,54 @@
11
---
2-
dist: trusty
3-
42
language: node_js
53
node_js:
6-
- "6.11"
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+
- "6"
77

8-
sudo: required
8+
sudo: false
9+
dist: trusty
10+
11+
addons:
12+
chrome: stable
913

1014
cache:
1115
directories:
12-
- node_modules
16+
- $HOME/.npm
1317

14-
addons:
15-
chrome: stable
18+
env:
19+
global:
20+
# See https://git.io/vdao3 for details.
21+
- JOBS=1
22+
23+
jobs:
24+
fail_fast: true
25+
allow_failures:
26+
- env: EMBER_TRY_SCENARIO=ember-canary
27+
28+
include:
29+
# runs linting and tests with current locked deps
30+
31+
- stage: "Tests"
32+
name: "Tests"
33+
script:
34+
- npm run lint:hbs
35+
- npm run lint:js
36+
- npm test
37+
38+
# we recommend new addons test the current and previous LTS
39+
# as well as latest stable release (bonus points to beta/canary)
40+
- stage: "Additional Tests"
41+
env: EMBER_TRY_SCENARIO=ember-lts-2.16
42+
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
43+
- env: EMBER_TRY_SCENARIO=ember-release
44+
- env: EMBER_TRY_SCENARIO=ember-beta
45+
- env: EMBER_TRY_SCENARIO=ember-canary
46+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
1647

1748
before_install:
18-
- google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
1949
- npm config set spin false
20-
- npm install -g bower
21-
- bower --version
22-
23-
install:
24-
- npm install
25-
- bower install
50+
- npm install -g npm@4
51+
- npm --version
2652

2753
script:
28-
- npm test
54+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

‎LICENSE.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2018
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)