Skip to content

Commit b483933

Browse files
author
Caleb Cassel
committed
Update React rules and Docker build
1 parent be347df commit b483933

File tree

21 files changed

+1560
-827
lines changed

21 files changed

+1560
-827
lines changed

.dockerignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
node_modules
2-
packages/eslint-config-hudl/node_modules
1+
**

Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:10.12.0
1+
FROM node:10.15.0
22

33
ARG HudlCiToolsTagName
44
ARG npmRegistryUrl
@@ -8,18 +8,12 @@ ARG npmPackageDir
88
ARG teamCityNpmPassword
99
ARG teamCityNpmAuthToken
1010

11-
RUN npm i -g hudl-ci-tools@${HudlCiToolsTagName} --registry=${npmRegistryUrl}
12-
13-
# install yarn 1.11.1
14-
RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.11.1
15-
16-
11+
# The 10.15.0 image includes Yarn 1.13.0
1712
RUN yarn config set registry "${npmRegistryUrl}"
13+
RUN yarn global add hudl-ci-tools@${HudlCiToolsTagName}
1814

1915
ENTRYPOINT [ "/bin/bash", "/app/ci/run.sh" ]
2016

21-
ENV HudlCiToolsTagName="${HudlCiToolsTagName}"
22-
ENV npmRegistryUrl="${npmRegistryUrl}"
2317
ENV teamcityBuildBranch="${teamcityBuildBranch}"
2418
ENV buildNumber="${buildNumber}"
2519
ENV teamCityNpmPassword="${teamCityNpmPassword}"
File renamed without changes.

ci/local-build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ export teamcityBuildBranch="branch-name"
99
export buildNumber="1234"
1010
export teamCityNpmPassword="hello"
1111
export teamCityNpmAuthToken="world"
12-
export service="eslint-config-hudl"
12+
export service="javascript"
1313

14-
./teamcity-build.sh
14+
./teamcity-build.sh

ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -ex
2+
set -exuo pipefail
33

44
cp -r /app /app-copy
55
cd /app-copy/packages/eslint-config-hudl

ci/teamcity-build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ set -ex
33

44
cd "$( dirname "${BASH_SOURCE[0]}" )"
55

6-
docker-compose -f docker-compose.teamcity.yml build $service-build
7-
docker-compose -f docker-compose.teamcity.yml run --rm $service-build
6+
docker-compose -f docker-compose.yml build $service-build
7+
docker-compose -f docker-compose.yml run --rm $service-build

es5/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
var fullName = 'Bob ' + this.lastName;
195195
```
196196

197-
- Strings longer than 80 characters should be written across multiple lines using string concatenation.
197+
- Strings longer than 100 characters should be written across multiple lines using string concatenation.
198198
- 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).
199199

200200
```javascript
@@ -1671,6 +1671,7 @@
16711671
- **SeekingAlpha**: [seekingalpha/javascript-style-guide](https://github.com/seekingalpha/javascript-style-guide)
16721672
- **Shutterfly**: [shutterfly/javascript](https://github.com/shutterfly/javascript)
16731673
- **StudentSphere**: [studentsphere/javascript](https://github.com/studentsphere/javascript)
1674+
- **Super**: [SuperJobs/javascript](https://github.com/SuperJobs/javascript)
16741675
- **Target**: [target/javascript](https://github.com/target/javascript)
16751676
- **TheLadders**: [TheLadders/javascript](https://github.com/TheLadders/javascript)
16761677
- **T4R Technology**: [T4R-Technology/javascript](https://github.com/T4R-Technology/javascript)

linters/.jshintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
// Prohibit use of a variable before it is defined.
3535
"latedef": true,
3636

37-
// Enforce line length to 120 characters
38-
"maxlen": 120,
37+
// Enforce line length to 100 characters
38+
"maxlen": 100,
3939

4040
// Require capitalized names for constructor functions.
4141
"newcap": true,

linters/SublimeLinter/SublimeLinter.sublime-settings

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363

6464
// Warn when variables are defined but never used.
6565
"unused": true,
66-
67-
// Enforce line length to 120 characters
68-
"maxlen": 120,
66+
67+
// Enforce line length to 80 characters
68+
"maxlen": 80,
6969

7070
// Enforce placing 'use strict' at the top function scope
7171
"strict": true

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"name": "airbnb-style",
2+
"name": "hudl-javascript",
33
"version": "2.0.0",
44
"description": "A mostly reasonable approach to JavaScript.",
55
"scripts": {
66
"test": "echo \"Error: no test specified\" && exit 1",
7-
"publish-all": "npm publish && cd ./packages/eslint-config-airbnb && npm publish"
7+
"publish-all": "npm publish && cd ./packages/eslint-config-hudl && npm publish"
88
},
99
"repository": {
1010
"type": "git",
11-
"url": "https://github.com/airbnb/javascript.git"
11+
"url": "https://github.com/hudl/javascript.git"
1212
},
1313
"keywords": [
1414
"style guide",
@@ -22,7 +22,7 @@
2222
"author": "Harrison Shoff <[email protected]> (https://twitter.com/hshoff)",
2323
"license": "MIT",
2424
"bugs": {
25-
"url": "https://github.com/airbnb/javascript/issues"
25+
"url": "https://github.com/hudl/javascript/issues"
2626
},
27-
"homepage": "https://github.com/airbnb/javascript"
27+
"homepage": "https://github.com/hudl/javascript"
2828
}

0 commit comments

Comments
 (0)