Skip to content

Commit a4a430d

Browse files
committed
v2.18.2...v3.4.4
1 parent dafd263 commit a4a430d

File tree

15 files changed

+14154
-10009
lines changed

15 files changed

+14154
-10009
lines changed

frontend/.eslintignore

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

frontend/.eslintrc.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ module.exports = {
3030
// node files
3131
{
3232
files: [
33-
'testem.js',
33+
'.template-lintrc.js',
3434
'ember-cli-build.js',
35+
'testem.js',
36+
'blueprints/*/index.js',
3537
'config/**/*.js',
3638
'lib/*/index.js'
3739
],
@@ -43,15 +45,6 @@ module.exports = {
4345
browser: false,
4446
node: true
4547
}
46-
},
47-
48-
// test files
49-
{
50-
files: ['tests/**/*.js'],
51-
excludedFiles: ['tests/dummy/**/*.js'],
52-
env: {
53-
embertest: true
54-
}
5548
}
5649
]
5750
};

frontend/.gitignore

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
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
1212
/.sass-cache
1313
/connect.lock
14-
/coverage/*
14+
/coverage/
1515
/libpeerconnection.log
16-
npm-debug.log
17-
testem.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

frontend/.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+
};

frontend/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ Make use of the many generators for code, try `ember help generate` for more det
4141
* `ember test`
4242
* `ember test --server`
4343

44+
### Linting
45+
46+
* `npm run lint:hbs`
47+
* `npm run lint:js`
48+
* `npm run lint:js -- --fix`
49+
4450
### Building
4551

4652
* `ember build` (development)

frontend/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "2.18.2",
6+
"version": "3.4.4",
77
"blueprints": [
88
{
99
"name": "app",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"jquery-integration": true
3+
}

frontend/config/targets.js

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1+
'use strict';
2+
3+
const browsers = [
4+
'last 1 Chrome versions',
5+
'last 1 Firefox versions',
6+
'last 1 Safari versions'
7+
];
8+
9+
const isCI = !!process.env.CI;
10+
const isProduction = process.env.EMBER_ENV === 'production';
11+
12+
if (isCI || isProduction) {
13+
browsers.push('ie 11');
14+
}
15+
116
module.exports = {
2-
browsers: [
3-
'ie 9',
4-
'last 1 Chrome versions',
5-
'last 1 Firefox versions',
6-
'last 1 Safari versions'
7-
]
17+
browsers
818
};

0 commit comments

Comments
 (0)