Skip to content

Commit effa0cc

Browse files
committed
Upgrade dependencies and enforce node 4 support
1 parent 3161a06 commit effa0cc

File tree

26 files changed

+957
-379
lines changed

26 files changed

+957
-379
lines changed

.eslintrc.js

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,54 @@ module.exports = {
44
ecmaVersion: 2017,
55
sourceType: 'module',
66
},
7-
extends: 'eslint:recommended',
7+
plugins: ['ember'],
8+
extends: ['eslint:recommended', 'plugin:ember/recommended'],
89
env: {
910
browser: true,
10-
node: true,
11-
mocha: true,
1211
},
1312
rules: {},
13+
overrides: [
14+
// node files
15+
{
16+
files: [
17+
'index.js',
18+
'testem.js',
19+
'ember-cli-build.js',
20+
'config/**/*.js',
21+
'tests/dummy/config/**/*.js',
22+
'lib/**/*.js',
23+
'node-tests/**/*.js',
24+
],
25+
excludedFiles: ['app/**', 'addon/**', 'tests/dummy/app/**'],
26+
parserOptions: {
27+
sourceType: 'script',
28+
ecmaVersion: 2015,
29+
},
30+
env: {
31+
browser: false,
32+
node: true,
33+
},
34+
plugins: ['node'],
35+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
36+
// add your custom rules and overrides for node files here
37+
}),
38+
},
39+
40+
// test files
41+
{
42+
files: ['tests/**/*.js'],
43+
excludedFiles: ['tests/dummy/**/*.js'],
44+
env: {
45+
embertest: true,
46+
},
47+
},
48+
49+
// node test files
50+
{
51+
files: ['node-tests/**/*.js'],
52+
env: {
53+
mocha: true,
54+
},
55+
},
56+
],
1457
};

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ install:
3434
- yarn install --no-lockfile
3535

3636
script:
37+
- yarn lint:js
3738
# Usually, it's ok to finish the test scenario without reverting
3839
# to the addon's original dependency state, skipping "cleanup".
3940
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

blueprints/adapter/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/* eslint-env node */
1+
'use strict';
22

3-
var extendFromApplicationEntity = require('../../lib/utilities/extend-from-application-entity');
3+
const extendFromApplicationEntity = require('../../lib/utilities/extend-from-application-entity');
44

55
module.exports = {
66
description: 'Generates an ember-data adapter.',

blueprints/ember-cli-typescript/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/* eslint-env node */
1+
'use strict';
22

3-
const { existsSync } = require('fs');
43
const path = require('path');
54

65
module.exports = {

blueprints/model/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/* eslint-env node */
1+
'use strict';
22

3-
var inflection = require('inflection');
4-
var stringUtils = require('ember-cli-string-utils');
5-
var EOL = require('os').EOL;
3+
const inflection = require('inflection');
4+
const stringUtils = require('ember-cli-string-utils');
5+
const EOL = require('os').EOL;
66

77
module.exports = {
88
description: 'Generates an ember-data model.',

blueprints/serializer/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/* eslint-env node */
1+
'use strict';
22

3-
var extendFromApplicationEntity = require('../../lib/utilities/extend-from-application-entity');
3+
const extendFromApplicationEntity = require('../../lib/utilities/extend-from-application-entity');
44

55
module.exports = {
66
description: 'Generates an ember-data serializer.',

config/ember-try.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
useYarn: true,
43
scenarios: [

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, appConfig */) {

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 EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// @ts-check
2-
/* eslint-env node */
2+
'use strict';
33

44
const IncrementalTypescriptCompiler = require('./lib/incremental-typescript-compiler');
55

0 commit comments

Comments
 (0)