Revamp eslint configuration.

.eslintignore

@@ -0,0 +1,6 @@
+tmp
+dist
+node-tests/fixtures/
+blueprints/*/mocha-files/
+blueprints/*/qunit-files/
+blueprints/*/files/

.eslintrc.js

@@ -1,19 +1,14 @@
-/* global module */
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module',
   },
-  extends: 'eslint:recommended',
-  env: {
-    'browser': true,
-  },
-  globals: {
-    'heimdall': true,
-    'Map': false,
-  },
+  extends: ['eslint:recommended', 'prettier'],
+  plugins: ['prettier'],
   rules: {
+    'prettier/prettier': 'error',
+
     'no-unused-vars': ['error', {
       'args': 'none',
     }],
@@ -29,35 +24,83 @@ module.exports = {
     'no-irregular-whitespace': 'error',
     'no-undef': 'error',
     'no-eq-null': 'error',
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'ember-cli-build.js',
+        'index.js',
+        'testem.js',
+        'lib/**/*.js',
+        'blueprints/*/index.js',
+        'blueprints/*.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js',
+        'node-tests/**',
+        'bin/**',
+      ],
+      excludedFiles: [
+        'addon/**',
+        'addon-test-support/**',
+        'app/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true,
+        es6: true,
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+      })
+    },
 
-    // from JSCS
-    'array-bracket-spacing': ['error', 'never'],
-    'comma-style': ['error', 'last'],
-    'brace-style': ['error', '1tbs', {
-      'allowSingleLine': true,
-    }],
-    'no-spaced-func': 'error',
-    'no-empty': 'error',
-    'curly': ['error', 'all'],
-    'eol-last': 'error',
-    'no-trailing-spaces': 'error',
-    'comma-dangle': ['error', 'never'],
-    'space-before-blocks': ['error', 'always'],
-    'indent': ['error', 2, {
-      'SwitchCase': 1,
-    }],
-    'keyword-spacing': ['error', {
-      'overrides': {
-        'else': {
-          'before': true,
-        },
-        'while': {
-          'before': true,
-        },
-        'catch': {
-          'before': true,
-        },
+    // browser files
+    {
+      files: [
+        'addon/**',
+        'app/**',
+        'tests/**',
+      ],
+      excludedFiles: [
+        'tests/dummy/config/**'
+      ],
+      env: {
+        browser: true,
+        node: false,
       },
-    }],
-  },
+      globals: {
+        heimdall: true,
+        Map: false,
+      }
+    },
+
+    // browser tests
+    {
+      files: [
+        'tests/**'
+      ],
+
+      rules: {
+        'no-console': 0
+      }
+    },
+
+    // node tests
+    {
+      files: [
+        'node-tests/**'
+      ],
+
+      env: {
+        mocha: true,
+      }
+    }
+  ],
 };

.npmignore

@@ -25,3 +25,5 @@ testem.js
 *.gemspec
 **/*.rb
 node-tests/
+lib/yuidoc.js
+lib/version-replace.js

.prettierrc.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+  trailingComma: 'es5',
+  printWidth: 100,
+};

.travis.yml

@@ -35,6 +35,7 @@ jobs:
       env: NAME=test                  # used only to make Travis UI show description
       script:
         - ./bin/lint-features
+        - yarn lint:js
         - yarn test
 
     - stage: additional tests

bin/publish-builds

@@ -4,5 +4,5 @@ echo -e "CURRENT_BRANCH: ${TRAVIS_BRANCH}\n"
 echo -e "PULL_REQUEST: ${TRAVIS_PULL_REQUEST}\n"
 
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-  ./bin/publish-to-s3.js
+  node ./bin/publish-to-s3.js
 fi

bin/publish-to-s3.js

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 // This publish script remains in order to publish the yui-docs to S3, builds no
 //   longer need to be published to S3.
 //

blueprints/adapter-test/index.js

@@ -1,5 +1,3 @@
-/* eslint-env node */
-
 var testInfo = require('ember-cli-test-info');
 var useTestFrameworkDetector = require('../test-framework-detector');
 

blueprints/adapter/index.js

@@ -1,5 +1,3 @@
-/* eslint-env node */
-
 var extendFromApplicationEntity = require('../../lib/utilities/extend-from-application-entity');
 
 module.exports = {

blueprints/model-test/index.js

@@ -1,5 +1,3 @@
-/* eslint-env node */
-
 var ModelBlueprint = require('../model');
 var testInfo = require('ember-cli-test-info');
 var useTestFrameworkDetector = require('../test-framework-detector');

blueprints/model/index.js

@@ -1,5 +1,3 @@
-/* eslint-env node */
-
 var inflection  = require('inflection');
 var stringUtils = require('ember-cli-string-utils');
 var EOL         = require('os').EOL;

blueprints/serializer-test/index.js

@@ -1,5 +1,3 @@
-/* eslint-env node */
-
 var testInfo = require('ember-cli-test-info');
 var useTestFrameworkDetector = require('../test-framework-detector');
 

blueprints/serializer/index.js

@@ -1,5 +1,3 @@
-/* eslint-env node */
-
 var extendFromApplicationEntity = require('../../lib/utilities/extend-from-application-entity');
 
 module.exports = {

blueprints/transform-test/index.js

@@ -1,5 +1,3 @@
-/* eslint-env node */
-
 var testInfo = require('ember-cli-test-info');
 var useTestFrameworkDetector = require('../test-framework-detector');
 

blueprints/transform/index.js

@@ -1,5 +1,3 @@
-/* eslint-env node */
-
 module.exports = {
   description: 'Generates an ember-data value transform.'
 };

config/ember-try.js

@@ -1,4 +1,4 @@
-/* eslint-env node, es6 */
+'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
 

ember-cli-build.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint-env node */
+
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 const merge    = require('broccoli-merge-trees');
 const yuidoc   = require('./lib/yuidoc');

index.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 const path = require('path');
@@ -60,6 +59,7 @@ module.exports = {
     } else if (this.ui) {
       this.ui.writeLine(warning);
     } else {
+      // eslint-disable-next-line no-console
       console.log(warning);
     }
   },

lib/babel-build.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var babel = require('broccoli-babel-transpiler');
-var path  = require('path');
 var moduleResolve = require('amd-name-resolver').moduleResolve;
 
 function getDebugMacroPlugins() {

lib/calculate-version.js

@@ -9,15 +9,16 @@ module.exports = function() {
   var packageVersion = package.version;
   var suffix = '';
 
+  var info;
   if (fs.existsSync(gitPath)) {
-    var info = gitRepoInfo(gitPath);
+    info = gitRepoInfo(gitPath);
     if (info.tag) {
       return info.tag.replace(/^v/, '');
     }
 
     suffix = '+' + info.sha.slice(0, 10);
   } else {
-    var info = npmGitInfo(package);
+    info = npmGitInfo(package);
     if (info.isInstalledAsNpmPackage() && !info.hasVersionInRef()) {
       suffix = '+' + info.abbreviatedSha;
     }

lib/enable-optional-features-via-url/index.js

@@ -1,4 +1,3 @@
-/* eslint-env node */
 module.exports = {
   name: 'enable-optional-features-via-url',
 

lib/stripped-build-plugins.js

@@ -70,6 +70,7 @@ module.exports = function(environment) {
     plugins.push([StripHeimdall]);
     uniqueAdd(filteredImports, 'ember-data/-debug', ['instrument']);
   } else {
+    // eslint-disable-next-line no-console
     console.warn('NOT STRIPPING HEIMDALL');
   }
 

lib/stripped-build.js

@@ -1,7 +1,3 @@
-var fs            = require('fs');
-var path          = require('path');
-var filterImports = require('babel-plugin-filter-imports');
-var featureFlags  = require('babel-plugin-feature-flags');
 var babelBuild    = require('./babel-build');
 var strippedBuildPlugins = require('./stripped-build-plugins');
 

lib/utilities/extend-from-application-entity.js

@@ -26,7 +26,7 @@ module.exports = function(type, baseClass, options) {
   var importStatement = 'import DS from \'ember-data\';';
 
   if (options.baseClass) {
-    baseClass = stringUtil.classify(options.baseClass.replace('\/', '-'));
+    baseClass = stringUtil.classify(options.baseClass.replace('/', '-'));
     baseClass = baseClass + stringUtil.classify(type);
     importStatement = 'import ' + baseClass + ' from \'' + relativePath + options.baseClass + '\';';
   }

lib/yuidoc.js

@@ -1,6 +1,5 @@
 var YUIDoc  = require('broccoli-yuidoc');
 var calculateVersion = require('./calculate-version');
-var path    = require('path');
 
 module.exports = function yui() {
   return new YUIDoc(['addon', 'node_modules/ember-inflector/addon'], {

node-tests/nodetest-runner.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/* eslint-disable no-console, no-process-exit */
+
 if (/^win/.test(require('os').platform())){
   // don't run these tests in windows right now, they don't work
   process.exit(0);

package.json

@@ -10,6 +10,7 @@
   "scripts": {
     "build": "ember build",
     "build:production": "ember build --environment=production",
+    "lint:js": "eslint .",
     "start": "ember server",
     "test": "ember test && ember test --record-data-rfc-build",
     "test:all": "ember try:each",
@@ -22,6 +23,7 @@
   "dependencies": {
     "@ember/ordered-set": "^1.0.0",
     "amd-name-resolver": "0.0.7",
+    "babel-plugin-debug-macros": "^0.1.11",
     "babel-plugin-ember-modules-api-polyfill": "^1.4.2",
     "babel-plugin-feature-flags": "^0.3.1",
     "babel-plugin-filter-imports": "^0.3.1",
@@ -52,7 +54,6 @@
     "silent-error": "^1.0.0"
   },
   "devDependencies": {
-    "babel-plugin-debug-macros": "^0.1.7",
     "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
     "babel-plugin-transform-es2015-classes": "^6.23.0",
     "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
@@ -76,13 +77,12 @@
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-blueprint-test-helpers": "^0.18.3",
     "ember-cli-dependency-checker": "^2.1.0",
-    "ember-cli-eslint": "1.3.0",
+    "ember-cli-eslint": "^4.2.3",
     "ember-cli-htmlbars": "^2.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.4.3",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-internal-test-helpers": "^0.8.1",
     "ember-cli-pretender": "^1.0.1",
-    "ember-qunit": "^3.4.0",
     "ember-cli-release": "^0.2.9",
     "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
@@ -93,17 +93,22 @@
     "ember-export-application-global": "^1.0.5",
     "ember-load-initializers": "^0.6.0",
     "ember-publisher": "0.0.7",
+    "ember-qunit": "^3.4.0",
     "ember-qunit-assert-helpers": "^0.2.1",
     "ember-resolver": "^4.1.0",
     "ember-source": "~3.0.0",
     "ember-source-channel-url": "^1.0.1",
     "ember-try": "^0.2.23",
     "ember-watson": "^0.7.0",
+    "eslint-config-prettier": "^2.9.0",
+    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-prettier": "^2.6.0",
     "github": "^1.1.1",
     "glob": "^5.0.13",
     "loader.js": "^4.5.0",
     "mocha": "^2.4.5",
     "mocha-only-detector": "0.0.2",
+    "prettier": "^1.12.1",
     "rimraf": "2.5.2",
     "rsvp": "4.8.0",
     "testdouble": "^3.2.6",