Skip to content

Update React rules #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
node_modules
packages/eslint-config-hudl/node_modules
**
12 changes: 3 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.12.0
FROM node:10.15.0

ARG HudlCiToolsTagName
ARG npmRegistryUrl
Expand All @@ -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}"
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions ci/local-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/run.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/teamcity-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -22,7 +22,7 @@
"author": "Harrison Shoff <[email protected]> (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"
}
6 changes: 6 additions & 0 deletions packages/eslint-config-hudl/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
352 changes: 208 additions & 144 deletions packages/eslint-config-hudl/docs/comparisons/with-airbnb-master.md

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion packages/eslint-config-hudl/legacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ module.exports = {
mocha: false,
jasmine: false,
},
ecmaFeatures: {},
globals: {},
rules: {},
};
29 changes: 18 additions & 11 deletions packages/eslint-config-hudl/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "eslint-config-hudl",
"version": "6.0.1",
"version": "7.0.0",
"description": "Hudl's ESLint config, following our styleguide",
"main": "index.js",
"scripts": {
"docs": "gulp docs",
"tests-only": "babel-tape-runner ./test/original/test-*.js",
"test": "gulp test && npm run tests-only",
"lint": "eslint --ignore 'node_modules' ."
Expand Down Expand Up @@ -47,7 +48,10 @@
},
"tasksConfig": {
"test": {
"src": ["lib/**/*.js", "!**/__specs__/**/*.js"],
"src": [
"lib/**/*.js",
"!**/__specs__/**/*.js"
],
"tests": "**/*-specs.js",
"setup": "./test/setup",
"coverageThresholds": {
Expand All @@ -64,32 +68,35 @@
"chalk": "^1.1.1",
"deep-diff": "^0.3.3",
"deep-property": "^1.1.0",
"dir-compare": "0.0.2",
"eslint": "^3.15.0",
"dir-compare": "1.7.1",
"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-teamcity": "^1.0.0",
"fs-extra": "^0.26.5",
"gulp": "^3.9.0",
"gulp-eslint": "^3.0.1",
"gulp": "^4.0.0",
"gulp-eslint": "^5.0.0",
"gulp-if": "^2.0.0",
"gulp-istanbul": "^0.10.3",
"gulp-mocha": "^2.2.0",
"handlebars": "^4.0.5",
"lodash": "^4.2.1",
"mocha-teamcity-reporter": "^1.0.0",
"react": "^0.13.3",
"react": "^16.8.0",
"request-promise": "^2.0.0",
"require-dir": "^0.3.0",
"shelljs": "^0.5.3",
"sinon": "^1.17.3",
"sinon-chai": "^2.8.0",
"slash": "^1.0.0",
"tape": "^4.2.2",
"tmp": "0.0.28"
"tmp": "0.0.33"
},
"dependencies": {
"eslint-plugin-react": "^7.11.1",
"eslint-plugin-react-hooks": "^1.3.0"
},
"peerDependencies": {
"eslint": "^3.0.0"
"eslint": "^4.19.1 || ^5.9.0"
}
}
Loading