Skip to content

Commit db9b4b5

Browse files
committed
Merge branch 'NullVoxPopuli-upgrade-ember'
2 parents e235a5f + a3a735f commit db9b4b5

Some content is hidden

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

54 files changed

+853
-41
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"directory": "bower_components",
3+
"analytics": false
4+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# EditorConfig helps developers define and maintain consistent
2+
# coding styles between different editors and IDEs
3+
# editorconfig.org
4+
5+
root = true
6+
7+
8+
[*]
9+
end_of_line = lf
10+
charset = utf-8
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true
13+
indent_style = space
14+
indent_size = 2
15+
16+
[*.hbs]
17+
insert_final_newline = false
18+
19+
[*.{diff,md}]
20+
trim_trailing_whitespace = false
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
/**
3+
Ember CLI sends analytics information by default. The data is completely
4+
anonymous, but there are times when you might want to disable this behavior.
5+
6+
Setting `disableAnalytics` to true will prevent any data from being sent.
7+
*/
8+
"disableAnalytics": false
9+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
# ember-try
16+
/.node_modules.ember-try/
17+
/bower.json.ember-try
18+
/package.json.ember-try
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
module.exports = {
2+
root: true,
3+
parser: 'babel-eslint',
4+
parserOptions: {
5+
ecmaVersion: 2017,
6+
sourceType: 'module'
7+
},
8+
plugins: [
9+
'ember'
10+
],
11+
extends: [
12+
'eslint:recommended',
13+
'plugin:ember/recommended'
14+
],
15+
env: {
16+
browser: true
17+
},
18+
rules: {
19+
},
20+
overrides: [
21+
// node files
22+
{
23+
files: [
24+
'.template-lintrc.js',
25+
'ember-cli-build.js',
26+
'testem.js',
27+
'blueprints/*/index.js',
28+
'config/**/*.js',
29+
'lib/*/index.js'
30+
],
31+
parserOptions: {
32+
sourceType: 'script',
33+
ecmaVersion: 2015
34+
},
35+
env: {
36+
browser: false,
37+
node: true
38+
}
39+
}
40+
]
41+
};
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
2+
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
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+
};
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
language: node_js
3+
node_js:
4+
- "6"
5+
6+
sudo: false
7+
dist: trusty
8+
9+
addons:
10+
chrome: stable
11+
12+
cache:
13+
yarn: true
14+
15+
env:
16+
global:
17+
# See https://git.io/vdao3 for details.
18+
- JOBS=1
19+
20+
before_install:
21+
- curl -o- -L https://yarnpkg.com/install.sh | bash
22+
- export PATH=$HOME/.yarn/bin:$PATH
23+
24+
install:
25+
- yarn install --non-interactive
26+
27+
script:
28+
- npm run lint:hbs
29+
- npm run lint:js
30+
- npm test
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"ignore_dirs": ["tmp", "dist"]
3+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Check https://github.com/ember-cli/ember-cli/releases and see the release notes.
2+
Just using ncu will not be sufficient.

0 commit comments

Comments
 (0)