Skip to content

Commit 55df248

Browse files
committed
message
1 parent d8da525 commit 55df248

13 files changed

+99
-94
lines changed

.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: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,14 @@ module.exports = {
2121
// node files
2222
{
2323
files: [
24-
'testem.js',
24+
'.eslintrc.js',
25+
'.template-lintrc.js',
2526
'ember-cli-build.js',
26-
'config/**/*.js'
27+
'testem.js',
28+
'blueprints/*/index.js',
29+
'config/**/*.js',
30+
'lib/*/index.js',
31+
'server/**/*.js'
2732
],
2833
parserOptions: {
2934
sourceType: 'script',
@@ -33,15 +38,6 @@ module.exports = {
3338
browser: false,
3439
node: true
3540
}
36-
},
37-
38-
// test files
39-
{
40-
files: ['tests/**/*.js'],
41-
excludedFiles: ['tests/dummy/**/*.js'],
42-
env: {
43-
embertest: true
44-
}
4541
}
4642
]
4743
};

.gitignore

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
# 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
1618
npm-debug.log*
1719
yarn-error.log

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

README.md

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

39+
### Linting
40+
41+
* `npm run lint:hbs`
42+
* `npm run lint:js`
43+
* `npm run lint:js -- --fix`
44+
3945
### Building
4046

4147
* `ember build` (development)

config/optional-features.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"jquery-integration": true
3+
}

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
};

package.json

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,72 @@
33
"version": "0.0.0",
44
"private": true,
55
"description": "Small description for codingblocks-online goes here",
6+
"repository": "",
67
"license": "MIT",
78
"author": "",
89
"directories": {
910
"doc": "doc",
1011
"test": "tests"
1112
},
12-
"repository": "",
1313
"scripts": {
1414
"build": "ember build",
15-
"lint:js": "eslint ./*.js app config lib server tests",
15+
"lint:hbs": "ember-template-lint .",
16+
"lint:js": "eslint .",
1617
"start": "ember serve",
1718
"test": "ember test"
1819
},
1920
"devDependencies": {
2021
"@ember-decorators/babel-transforms": "^0.1.1",
22+
"@ember/jquery": "^0.5.2",
23+
"@ember/optional-features": "^0.6.3",
2124
"babel-eslint": "^8.2.1",
2225
"babel-plugin-transform-object-rest-spread": "^6.26.0",
23-
"broccoli-asset-rev": "^2.4.5",
26+
"broccoli-asset-rev": "^2.7.0",
2427
"ember-ace": "^1.3.1",
25-
"ember-ajax": "^3.0.0",
26-
"ember-cli": "~2.18.1",
27-
"ember-cli-app-version": "^3.0.0",
28-
"ember-cli-babel": "^6.6.0",
29-
"ember-cli-dependency-checker": "^2.0.0",
30-
"ember-cli-eslint": "^4.2.1",
28+
"ember-ajax": "^4.0.1",
29+
"ember-cli": "~3.8.1",
30+
"ember-cli-app-version": "^3.2.0",
31+
"ember-cli-babel": "^7.1.2",
32+
"ember-cli-dependency-checker": "^3.1.0",
33+
"ember-cli-eslint": "^4.2.3",
3134
"ember-cli-head": "^0.4.1",
32-
"ember-cli-htmlbars": "^2.0.1",
33-
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
34-
"ember-cli-inject-live-reload": "^1.4.1",
35+
"ember-cli-htmlbars": "^3.0.0",
36+
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
37+
"ember-cli-inject-live-reload": "^1.8.2",
3538
"ember-cli-moment-shim": "^3.7.1",
36-
"ember-cli-qunit": "^4.1.1",
3739
"ember-cli-sass": "^7.1.7",
38-
"ember-cli-shims": "^1.2.0",
3940
"ember-cli-showdown": "^4.4.2",
40-
"ember-cli-sri": "^2.1.0",
41-
"ember-cli-uglify": "^2.0.0",
41+
"ember-cli-sri": "^2.1.1",
42+
"ember-cli-template-lint": "^1.0.0-beta.1",
43+
"ember-cli-uglify": "^2.1.0",
4244
"ember-composable-helpers": "^2.1.0",
4345
"ember-concurrency": "^0.8.14",
44-
"ember-data": "~2.18.0",
46+
"ember-data": "~3.8.0",
4547
"ember-decorators": "^1.3.4",
4648
"ember-export-application-global": "^2.0.0",
4749
"ember-facebook-pixel": "^0.1.0",
4850
"ember-keyboard-shortcuts": "^1.0.6",
49-
"ember-load-initializers": "^1.0.0",
51+
"ember-load-initializers": "^1.1.0",
5052
"ember-local-storage": "^1.4.1",
53+
"ember-maybe-import-regenerator": "^0.1.6",
5154
"ember-modal-dialog": "^3.0.0-beta.0",
5255
"ember-moment": "^7.7.0",
53-
"ember-resolver": "^4.0.0",
56+
"ember-qunit": "^3.4.1",
57+
"ember-resolver": "^5.0.1",
5458
"ember-simple-auth": "^1.4.2",
5559
"ember-simple-auth-token": "git+https://github.com/abhishek97/ember-simple-auth-token.git",
56-
"ember-source": "3.0.0-beta.5",
60+
"ember-source": "~3.8.0",
5761
"ember-task-button": "^0.0.1",
5862
"ember-truth-helpers": "^2.0.0",
5963
"ember-uploader": "^2.0.0",
60-
"ember-welcome-page": "^3.0.0",
61-
"eslint-plugin-ember": "^5.0.0",
64+
"ember-welcome-page": "^3.2.0",
65+
"eslint-plugin-ember": "^5.2.0",
6266
"liquid-fire": "^0.29.2",
63-
"loader.js": "^4.2.3"
67+
"loader.js": "^4.7.0",
68+
"qunit-dom": "^0.8.0"
6469
},
6570
"engines": {
66-
"node": "^4.5 || 6.* || >= 7.*"
71+
"node": "6.* || 8.* || >= 10.*"
6772
},
6873
"dependencies": {
6974
"@coding-blocks/motley": "0.3.34",

testem.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ module.exports = {
99
],
1010
browser_args: {
1111
Chrome: {
12-
mode: 'ci',
13-
args: [
12+
ci: [
1413
// --no-sandbox is needed when running Chrome inside a container
15-
process.env.TRAVIS ? '--no-sandbox' : null,
16-
17-
'--disable-gpu',
14+
process.env.CI ? '--no-sandbox' : null,
1815
'--headless',
16+
'--disable-gpu',
17+
'--disable-dev-shm-usage',
18+
'--disable-software-rasterizer',
19+
'--mute-audio',
1920
'--remote-debugging-port=0',
2021
'--window-size=1440,900'
2122
].filter(Boolean)

tests/helpers/.gitkeep

Whitespace-only changes.

tests/helpers/destroy-app.js

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

tests/helpers/module-for-acceptance.js

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

tests/helpers/start-app.js

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

0 commit comments

Comments
 (0)