Skip to content

Commit 21e40b2

Browse files
committed
Merge branch 'master' into rebuild
2 parents f2227af + 130eb91 commit 21e40b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1568
-800
lines changed

package.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"build": "npm run fetch && npm run content && NODE_ENV=production webpack --config webpack.prod.js && npm run sitemap && echo webpack.js.org > dist/CNAME",
3434
"test": "npm run lint",
3535
"lint": "run-s lint:*",
36-
"lint:js": "eslint . --ext .js,.jsx,.md",
36+
"lint:js": "eslint src --ext .js,.jsx,.md",
3737
"lint:markdown": "markdownlint --config ./.markdownlint.json *.md ./src/content/**/*.md --ignore './src/content/**/_*.md'",
3838
"lint:social": "alex . -q",
3939
"lint:prose": "cp .proselintrc ~/ && proselint src/content",
@@ -43,9 +43,13 @@
4343
},
4444
"husky": {
4545
"hooks": {
46-
"pre-commit": "npm test"
46+
"pre-commit": "lint-staged"
4747
}
4848
},
49+
"lint-staged": {
50+
"*.{js,jsx,md}": ["npm run lint:js"],
51+
"*.md": ["npm run lint:markdown"]
52+
},
4953
"devDependencies": {
5054
"@octokit/rest": "^15.2.6",
5155
"alex": "^5.1.0",
@@ -78,6 +82,7 @@
7882
"http-server": "^0.10.0",
7983
"husky": "^1.0.0-rc.8",
8084
"hyperlink": "^3.0.1",
85+
"lint-staged": "^7.2.0",
8186
"loader-utils": "^1.1.0",
8287
"lodash": "^4.17.4",
8388
"markdownlint": "^0.6.0",
@@ -119,6 +124,9 @@
119124
"@rigor789/remark-autolink-headings": "^5.1.0",
120125
"docsearch.js": "^2.5.2",
121126
"gitter-sidecar": "^1.2.3",
127+
"ajv": "^5.5.2",
128+
"javascriptstuff-db": "^1.12.0",
129+
"lodash.throttle": "^4.1.1",
122130
"prop-types": "^15.5.10",
123131
"react": "^16.2.0",
124132
"react-banner": "^1.0.0-rc.0",
@@ -127,7 +135,7 @@
127135
"react-g-analytics": "0.4.2",
128136
"react-hot-loader": "^4.0.0-beta.12",
129137
"react-router-dom": "^4.2.2",
130-
"tool-list": "^0.11.0",
131-
"webpack.vote": "^0.1.2"
138+
"webpack.vote": "^0.1.2",
139+
"whatwg-fetch": "^2.0.3"
132140
}
133141
}

src/assets/by.svg

Lines changed: 1 addition & 3 deletions
Loading

src/assets/cc.svg

Lines changed: 1 addition & 3 deletions
Loading

src/assets/github-logo.svg

Lines changed: 1 addition & 38 deletions
Loading

src/assets/icon-square-big.svg

Lines changed: 1 addition & 1 deletion
Loading

src/assets/icon-square-small.svg

Lines changed: 1 addition & 1 deletion
Loading

src/assets/language-icon.svg

Lines changed: 1 addition & 47 deletions
Loading

0 commit comments

Comments
 (0)