Skip to content

Commit d6c21ed

Browse files
committed
update: bumped to ember 2.18
sysdig-CLA-1.0-signed-off-by: Roberto Scolaro <[email protected]> Signed-off-by: Roberto Scolaro <[email protected]>
1 parent ba2912a commit d6c21ed

File tree

13 files changed

+1317
-1556
lines changed

13 files changed

+1317
-1556
lines changed

.eslintrc.js

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,47 @@
11
module.exports = {
2-
env: {
3-
browser: true,
4-
node: true,
5-
es6: true
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+
'testem.js',
24+
'ember-cli-build.js',
25+
'config/**/*.js',
26+
'lib/*/index.js'
27+
],
28+
parserOptions: {
29+
sourceType: 'script',
30+
ecmaVersion: 2015
31+
},
32+
env: {
33+
browser: false,
34+
node: true
35+
}
636
},
7-
root: true,
8-
parserOptions: {
9-
ecmaVersion: 2017,
10-
sourceType: 'module'
11-
},
12-
extends: [
13-
'eslint:recommended',
14-
'plugin:ember-suave/recommended'
15-
],
16-
rules: {
17-
'indent': [2, 4],
18-
'no-console': 'off',
19-
'object-curly-spacing': ['off'],
20-
'ember-suave/no-direct-property-access': 'off',
21-
'ember-suave/no-const-outside-module-scope': 'off',
22-
'one-var': ['error', 'never'],
23-
'comma-dangle': ['error', { 'arrays': 'never', 'objects': 'always-multiline' }],
24-
'no-implicit-coercion': ['error'],
25-
'no-extra-boolean-cast': ['error'],
26-
'indent': ['error', 4, { 'SwitchCase': 1 }],
27-
'operator-linebreak': ["error", "after"]
28-
},
29-
globals: {
30-
module: true,
31-
process: false,
32-
requireNode: false
37+
38+
// test files
39+
{
40+
files: ['tests/**/*.js'],
41+
excludedFiles: ['tests/dummy/**/*.js'],
42+
env: {
43+
embertest: true
44+
}
3345
}
46+
]
3447
};

.travis.yml

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

config/ember-cli-update.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"schemaVersion": "1.0.0",
3+
"packages": [
4+
{
5+
"name": "ember-cli",
6+
"version": "2.18.2",
7+
"blueprints": [
8+
{
9+
"name": "app",
10+
"outputRepo": "https://github.com/ember-cli/ember-new-output",
11+
"codemodsSource": "ember-app-codemods-manifest@1",
12+
"isBaseBlueprint": true,
13+
"options": [
14+
"--no-welcome"
15+
]
16+
}
17+
]
18+
}
19+
]
20+
}

config/environment.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
module.exports = function(environment) {

config/targets.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
module.exports = {
32
browsers: [
43
'ie 9',

ember-cli-build.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
const EmberApp = require('ember-cli/lib/broccoli/ember-app');

0 commit comments

Comments
 (0)