Skip to content

Commit bcd4bc7

Browse files
committed
upgrade to ember 3.4
1 parent b7e63ed commit bcd4bc7

File tree

94 files changed

+5411
-5960
lines changed

Some content is hidden

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

94 files changed

+5411
-5960
lines changed

.eslintignore

+18
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

.eslintrc.js

+3-22
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
module.exports = {
2-
globals: {
3-
server: true,
4-
},
52
root: true,
63
parserOptions: {
74
ecmaVersion: 2017,
@@ -24,8 +21,10 @@ module.exports = {
2421
// node files
2522
{
2623
files: [
27-
'testem.js',
24+
'.template-lintrc.js',
2825
'ember-cli-build.js',
26+
'testem.js',
27+
'blueprints/*/index.js',
2928
'config/**/*.js',
3029
'lib/*/index.js'
3130
],
@@ -37,24 +36,6 @@ module.exports = {
3736
browser: false,
3837
node: true
3938
}
40-
},
41-
42-
// test files
43-
{
44-
files: ['tests/**/*.js'],
45-
excludedFiles: ['tests/dummy/**/*.js'],
46-
env: {
47-
embertest: true
48-
},
49-
globals: {
50-
backButton: true,
51-
pollHasUser: true,
52-
pollHasUsersCount: true,
53-
pollParticipate: true,
54-
setupBrowserNavigationButtons: true,
55-
switchTab: true,
56-
t: true,
57-
}
5839
}
5940
]
6041
};

.gitignore

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
6-
/api/tests/_output
7-
/api/tests/_tmp
8-
/api/tests/_support/_generated
4+
/dist/
5+
/tmp/
6+
/api/tests/_output/
7+
/api/tests/_tmp/
8+
/api/tests/_support/_generated/
99

1010
# dependencies
11-
/node_modules
12-
/bower_components
13-
/api/vendor
11+
/bower_components/
12+
/node_modules/
13+
/api/vendor/
1414

1515
# misc
1616
/.sass-cache
1717
/connect.lock
18-
/coverage/*
18+
/coverage/
1919
/libpeerconnection.log
20-
npm-debug.log*
21-
yarn-error.log
22-
testem.log
20+
/npm-debug.log*
21+
/testem.log
22+
/yarn-error.log
2323

2424
# ember-try
25-
.node_modules.ember-try/
26-
bower.json.ember-try
27-
package.json.ember-try
25+
/.node_modules.ember-try/
26+
/bower.json.ember-try
27+
/package.json.ember-try

.template-lintrc.js

+5
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

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ before_script:
4545

4646
script:
4747
# run frontend and integration tests
48+
- if $TEST_EMBER; then yarn run lint:hbs; fi
4849
- if $TEST_EMBER; then yarn run lint:js; fi
4950
- if $TEST_EMBER; then yarn test; fi
5051
# test against different browsers using sauce lab

MODULE_REPORT.md

-252
This file was deleted.

0 commit comments

Comments
 (0)