Update React rules and Docker build

Author: Caleb Cassel

.dockerignore

@@ -1,2 +1 @@
-node_modules
-packages/eslint-config-hudl/node_modules
+**

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10.12.0
+FROM node:10.15.0
 
 ARG HudlCiToolsTagName
 ARG npmRegistryUrl
@@ -8,18 +8,12 @@ ARG npmPackageDir
 ARG teamCityNpmPassword
 ARG teamCityNpmAuthToken
 
-RUN npm i -g hudl-ci-tools@${HudlCiToolsTagName} --registry=${npmRegistryUrl}
-
-# install yarn 1.11.1
-RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.11.1
-
-
+# The 10.15.0 image includes Yarn 1.13.0
 RUN yarn config set registry "${npmRegistryUrl}"
+RUN yarn global add hudl-ci-tools@${HudlCiToolsTagName}
 
 ENTRYPOINT [ "/bin/bash", "/app/ci/run.sh" ]
 
-ENV HudlCiToolsTagName="${HudlCiToolsTagName}"
-ENV npmRegistryUrl="${npmRegistryUrl}"
 ENV teamcityBuildBranch="${teamcityBuildBranch}"
 ENV buildNumber="${buildNumber}"
 ENV teamCityNpmPassword="${teamCityNpmPassword}"

ci/docker-compose.teamcity.yml ci/docker-compose.yml

@@ -9,6 +9,6 @@ export teamcityBuildBranch="branch-name"
 export buildNumber="1234"
 export teamCityNpmPassword="hello"
 export teamCityNpmAuthToken="world"
-export service="eslint-config-hudl"
+export service="javascript"
 
- ./teamcity-build.sh
+./teamcity-build.sh

ci/local-build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -exuo pipefail
 
 cp -r /app /app-copy
 cd /app-copy/packages/eslint-config-hudl

ci/run.sh

@@ -3,5 +3,5 @@ set -ex
 
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
-docker-compose -f docker-compose.teamcity.yml build  $service-build
-docker-compose -f docker-compose.teamcity.yml run --rm  $service-build
+docker-compose -f docker-compose.yml build  $service-build
+docker-compose -f docker-compose.yml run --rm  $service-build

ci/teamcity-build.sh

@@ -194,7 +194,7 @@
     var fullName = 'Bob ' + this.lastName;
     ```
 
-  - Strings longer than 80 characters should be written across multiple lines using string concatenation.
+  - Strings longer than 100 characters should be written across multiple lines using string concatenation.
   - Note: If overused, long strings with concatenation could impact performance. [jsPerf](http://jsperf.com/ya-string-concat) & [Discussion](https://github.com/airbnb/javascript/issues/40).
 
     ```javascript
@@ -1671,6 +1671,7 @@
   - **SeekingAlpha**: [seekingalpha/javascript-style-guide](https://github.com/seekingalpha/javascript-style-guide)
   - **Shutterfly**: [shutterfly/javascript](https://github.com/shutterfly/javascript)
   - **StudentSphere**: [studentsphere/javascript](https://github.com/studentsphere/javascript)
+  - **Super**: [SuperJobs/javascript](https://github.com/SuperJobs/javascript)
   - **Target**: [target/javascript](https://github.com/target/javascript)
   - **TheLadders**: [TheLadders/javascript](https://github.com/TheLadders/javascript)
   - **T4R Technology**: [T4R-Technology/javascript](https://github.com/T4R-Technology/javascript)

es5/README.md

@@ -34,8 +34,8 @@
   // Prohibit use of a variable before it is defined.
   "latedef": true,
 
-  // Enforce line length to 120 characters
-  "maxlen": 120,
+  // Enforce line length to 100 characters
+  "maxlen": 100,
 
   // Require capitalized names for constructor functions.
   "newcap": true,

linters/.jshintrc

@@ -63,9 +63,9 @@
 
       // Warn when variables are defined but never used.
       "unused": true,
-      
-      // Enforce line length to 120 characters
-      "maxlen": 120,
+
+      // Enforce line length to 80 characters
+      "maxlen": 80,
 
       // Enforce placing 'use strict' at the top function scope
       "strict": true

linters/SublimeLinter/SublimeLinter.sublime-settings

@@ -1,14 +1,14 @@
 {
-  "name": "airbnb-style",
+  "name": "hudl-javascript",
   "version": "2.0.0",
   "description": "A mostly reasonable approach to JavaScript.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "publish-all": "npm publish && cd ./packages/eslint-config-airbnb && npm publish"
+    "publish-all": "npm publish && cd ./packages/eslint-config-hudl && npm publish"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/airbnb/javascript.git"
+    "url": "https://github.com/hudl/javascript.git"
   },
   "keywords": [
     "style guide",
@@ -22,7 +22,7 @@
   "author": "Harrison Shoff <hi@hshoff.com> (https://twitter.com/hshoff)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/airbnb/javascript/issues"
+    "url": "https://github.com/hudl/javascript/issues"
   },
-  "homepage": "https://github.com/airbnb/javascript"
+  "homepage": "https://github.com/hudl/javascript"
 }

package.json

@@ -1,3 +1,9 @@
+### 7.0.0
+
+* [breaking] Require ESLint 4 or 5
+* [minor] Add and update several React rules
+* [minor] Build with Docker
+
 ### 6.0.1 / 2018-02-23
 
 * [bug] Remove react/wrap-multilines

packages/eslint-config-hudl/CHANGELOG.md

@@ -14,7 +14,6 @@ module.exports = {
     mocha: false,
     jasmine: false,
   },
-  ecmaFeatures: {},
   globals: {},
   rules: {},
 };

packages/eslint-config-hudl/docs/comparisons/with-airbnb-master.md

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-hudl",
-  "version": "6.0.1",
+  "version": "7.0.0",
   "description": "Hudl's ESLint config, following our styleguide",
   "main": "index.js",
   "scripts": {
@@ -47,7 +47,10 @@
   },
   "tasksConfig": {
     "test": {
-      "src": ["lib/**/*.js", "!**/__specs__/**/*.js"],
+      "src": [
+        "lib/**/*.js",
+        "!**/__specs__/**/*.js"
+      ],
       "tests": "**/*-specs.js",
       "setup": "./test/setup",
       "coverageThresholds": {
@@ -65,14 +68,14 @@
     "deep-diff": "^0.3.3",
     "deep-property": "^1.1.0",
     "dir-compare": "0.0.2",
-    "eslint": "^3.15.0",
+    "eslint": "^4.19.1 || ^5.6.1",
     "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-react": "^6.9.0",
+    "eslint-plugin-jsx-a11y": "^6.1.1",
+    "eslint-plugin-react": "^7.11.1",
     "eslint-teamcity": "^1.0.0",
     "fs-extra": "^0.26.5",
     "gulp": "^3.9.0",
-    "gulp-eslint": "^3.0.1",
+    "gulp-eslint": "^5.0.0",
     "gulp-if": "^2.0.0",
     "gulp-istanbul": "^0.10.3",
     "gulp-mocha": "^2.2.0",
@@ -90,6 +93,6 @@
     "tmp": "0.0.28"
   },
   "peerDependencies": {
-    "eslint": "^3.0.0"
+    "eslint": "^4.19.1 || ^5.9.0"
   }
 }

packages/eslint-config-hudl/legacy.js

@@ -5,6 +5,7 @@ const fs = require('fs-extra');
 const _ = require('lodash');
 const tmp = require('tmp');
 const Config = require('eslint/lib/config');
+const Linter = require('eslint/lib/linter');
 const diff = require('deep-diff').diff;
 const deepProperty = require('deep-property');
 const slash = require('slash');
@@ -334,7 +335,7 @@ ConfigDiff.prototype._loadConfig = function(configFilePath) {
   const config = new Config({
     configFile: configFilePath,
     useEslintrc: false,
-  }).getConfig();
+  }, new Linter()).getConfig();
 
   // eslint resolves the parser option into an absolute file path. This isn't very helpful
   // to us. So we have to manually 'unresolve' it back to a module name if its a file path.

packages/eslint-config-hudl/package.json

@@ -2,10 +2,10 @@ module.exports = [
   {
     // 'https://raw.githubusercontent.com/hudl/javascript/master/linters/.eslintrc',
 
-    title: 'vs Airbnb v14.1.0',
+    title: 'vs Airbnb v17.1.0',
     outputName: 'with-airbnb-master',
     base: require.resolve('../../../index.js'),
-    comparison: 'eslint-config-airbnb@14.1.0',
+    comparison: 'eslint-config-airbnb@17.1.0',
     knownDifferences: {
       // Known rule differences
       rules: {

packages/eslint-config-hudl/rules/react.js

@@ -15,6 +15,10 @@ import Feedback from '../Feedback';
 import Footer from '../Footer';
 
 class App extends Component {
+  static defaultProps = {
+    context: undefined,
+    error: undefined,
+  }
 
   static propTypes = {
     context: PropTypes.shape({
@@ -60,9 +64,8 @@ class App extends Component {
         <Feedback />
         <Footer />
       </div>
-      ) : this.props.children;
+    ) : this.props.children;
   }
-
 }
 
 export default App;

packages/eslint-config-hudl/tasks/docs/diffs/ConfigDiff.js

@@ -9,7 +9,8 @@ const cli = new CLIEngine({
 
   // This rule fails when executing on text.
   rules: {
-    indent: 0,
+    'indent': 0,
+    'padded-blocks': 0,
   },
 });