Skip to content

Commit 75cbe8b

Browse files
committed
prevent merge conflict in test to fix CI
1 parent a995ebe commit 75cbe8b

2 files changed

Lines changed: 96 additions & 0 deletions

File tree

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,50 @@
11
module.exports = {
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+
'.eslintrc.js',
24+
'.template-lintrc.js',
25+
'ember-cli-build.js',
26+
'testem.js',
27+
'blueprints/*/index.js',
28+
'config/**/*.js',
29+
'lib/*/index.js',
30+
'server/**/*.js'
31+
],
32+
parserOptions: {
33+
sourceType: 'script',
34+
ecmaVersion: 2015
35+
},
36+
env: {
37+
browser: false,
38+
node: true
39+
},
40+
plugins: ['node'],
41+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
42+
// add your custom rules and overrides for node files here
43+
44+
// this can be removed once the following is fixed
45+
// https://github.com/mysticatea/eslint-plugin-node/issues/77
46+
'node/no-unpublished-require': 'off'
47+
})
48+
}
49+
]
250
};
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,50 @@
11
module.exports = {
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+
'.eslintrc.js',
24+
'.template-lintrc.js',
25+
'ember-cli-build.js',
26+
'testem.js',
27+
'blueprints/*/index.js',
28+
'config/**/*.js',
29+
'lib/*/index.js',
30+
'server/**/*.js'
31+
],
32+
parserOptions: {
33+
sourceType: 'script',
34+
ecmaVersion: 2015
35+
},
36+
env: {
37+
browser: false,
38+
node: true
39+
},
40+
plugins: ['node'],
41+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
42+
// add your custom rules and overrides for node files here
43+
44+
// this can be removed once the following is fixed
45+
// https://github.com/mysticatea/eslint-plugin-node/issues/77
46+
'node/no-unpublished-require': 'off'
47+
})
48+
}
49+
]
250
};

0 commit comments

Comments
 (0)