eslint fixes and config validation improvements

Author: kybishop

.eslintignore

@@ -0,0 +1 @@
+**/*{.,-}min.js

.eslintrc.js

@@ -0,0 +1,21 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module'
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:ember-suave/recommended'
+  ],
+  env: {
+    browser: true,
+    es6: true
+  },
+  rules: {
+    'arrow-parens': ['error', 'as-needed'],
+    // Destructuring is not supported in node 4.8.0
+    'ember-suave/prefer-destructuring': 'off',
+    'operator-linebreak': ['error', 'before', { 'overrides': { '=': 'ignore'} } ]
+  }
+};

.jshintrc

@@ -1,5 +1,8 @@
-/* jshint node:true */
+/* eslint-env node */
+'use strict';
+
 module.exports = {
+  configVersion: '1.0.0',
 
   // breakpoints, order does not matter, they will be sorted by `begin`
   // `name` is used for layout names and booleans on the device/layout service

blueprints/.jshintrc

@@ -1,7 +1,10 @@
+/* eslint-env node */
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
+let fs = require('fs');
+let path = require('path');
+
+const GENERATE_CONFIG_COMMAND =  '`ember g flexi-config`';
 
 function assert(statement, test) {
   if (!test) {
@@ -10,23 +13,45 @@ function assert(statement, test) {
 }
 
 module.exports = function(projectRoot) {
-  var configPath = path.join(projectRoot, 'config', 'flexi.js');
-  var flexiConfig = {};
-
-  if (fs.existsSync(configPath)) {
-    flexiConfig = require(configPath);
-
-    assert('config/flexi.js is defined, but could not be imported', flexiConfig);
-    assert('config/flexi.js is defined, but did not contain property [array] breakpoints',
-           flexiConfig.breakpoints instanceof Array);
-    assert('config/flexi.js is defined, but did not contain property [number] columns',
-           typeof flexiConfig.columns === 'number');
-
-  } else {
-    assert(`You must define a config file for flexi at '${configPath}'.` +
-           ' To generate a new config file, run `ember g flexi-config`',
-           process.argv[2] === 'install' && process.argv[3].indexOf('flexi') !== -1);
+  if ((['g', 'generate'].indexOf(process.argv[2]) !== -1 && process.argv[3] === 'flexi-config')
+      || (process.argv[2] === 'install' && process.argv[3].indexOf('flexi') !== -1)) {
+    // A flexi-config is currently being generated,
+    // or flexi is being installed, ignore validation.
+    return {};
   }
 
+  let configPath = path.join(projectRoot, 'config', 'flexi.js');
+
+  assert(`You must define a config file for flexi at '${configPath}'.`
+         + ` To generate a new config file, run ${GENERATE_CONFIG_COMMAND}`,
+         fs.existsSync(configPath));
+
+  let flexiConfig = require(configPath);
+  let actualVersion = flexiConfig.configVersion;
+  let expectedVersion = require(path.join(projectRoot,
+                                          'node_modules',
+                                          '@html-next',
+                                          'flexi-config',
+                                          'blueprints',
+                                          'flexi-config',
+                                          'files',
+                                          'config',
+                                          'flexi.js')).configVersion;
+
+  assert('config/flexi.js is defined, but could not be imported', flexiConfig);
+  assert('config/flexi.js is defined, but does not contain property [array] breakpoints,'
+         + ` consider running ${GENERATE_CONFIG_COMMAND} to see the default config file.`,
+         flexiConfig.breakpoints instanceof Array);
+  assert('config/flexi.js is defined, but does not contain property [number] columns,'
+         + ` consider running ${GENERATE_CONFIG_COMMAND} to see the default config file.`,
+         typeof flexiConfig.columns === 'number');
+  assert('config/flexi.js is defined, but does not contain property [string] configVersion,'
+         + ` consider running ${GENERATE_CONFIG_COMMAND} to see the default config file.`,
+         actualVersion);
+  assert(`config/flexi.js version does not match the latest config file. Got '${actualVersion}',`
+         + ` expected '${expectedVersion}'. Consider running ${GENERATE_CONFIG_COMMAND} to see`
+         + ' what your config file is missing, then update the version number to match.',
+         actualVersion === expectedVersion);
+
   return flexiConfig;
 };

blueprints/flexi-config/files/config/flexi.js

@@ -26,10 +26,10 @@
     "ember-cli": "2.11.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-eslint": "3.0.2",
     "ember-cli-htmlbars": "^1.1.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.3",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-jshint": "^2.0.1",
     "ember-cli-qunit": "^3.0.1",
     "ember-cli-release": "^0.2.9",
     "ember-cli-shims": "^1.0.2",
@@ -43,6 +43,7 @@
     "ember-resolver": "^2.0.3",
     "ember-source": "^2.11.0",
     "ember-welcome-page": "^2.0.2",
+    "eslint-plugin-ember-suave": "^1.0.0",
     "loader.js": "^4.0.10"
   },
   "engines": {

lib/get-validated-flexi-config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  env: {
+    embertest: true
+  }
+};