Skip to content

Commit 710188c

Browse files
committed
Merge branch 'rebuild' into rebuild-hyperlink
2 parents 2438e5b + 21e40b2 commit 710188c

Some content is hidden

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

79 files changed

+1676
-908
lines changed

package.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
},
2626
"scripts": {
2727
"clean": "rimraf ./dist src/content/**/_*.md src/**/_*.json",
28-
"start": "NODE_ENV=development webpack-dev-server --config webpack.dev.js --env.dev",
28+
"start": "cross-env NODE_ENV=development webpack-dev-server --config webpack.dev.js --env.dev",
2929
"content": "node src/scripts/build-content-tree.js ./src/content ./src/_content.json",
3030
"build-test": "npm run build && http-server build/",
3131
"fetch": "sh src/scripts/fetch.sh",
3232
"prebuild": "npm run clean",
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",
@@ -44,9 +44,13 @@
4444
},
4545
"husky": {
4646
"hooks": {
47-
"pre-commit": "npm test"
47+
"pre-commit": "lint-staged"
4848
}
4949
},
50+
"lint-staged": {
51+
"*.{js,jsx,md}": ["npm run lint:js"],
52+
"*.md": ["npm run lint:markdown"]
53+
},
5054
"devDependencies": {
5155
"@octokit/rest": "^15.2.6",
5256
"alex": "^5.1.0",
@@ -60,6 +64,7 @@
6064
"babel-preset-env": "^1.6.0",
6165
"babel-preset-react": "^6.24.1",
6266
"copy-webpack-plugin": "^4.3.0",
67+
"cross-env": "5.2.0",
6368
"css-loader": "^0.28.5",
6469
"directory-tree": "2.1.0",
6570
"directory-tree-webpack-plugin": "^0.3.1",
@@ -78,6 +83,7 @@
7883
"http-server": "^0.10.0",
7984
"husky": "^1.0.0-rc.8",
8085
"hyperlink": "github:Munter/hyperlink#070916d",
86+
"lint-staged": "^7.2.0",
8187
"loader-utils": "^1.1.0",
8288
"lodash": "^4.17.4",
8389
"markdownlint": "^0.6.0",
@@ -98,6 +104,7 @@
98104
"remark-loader": "^0.3.0",
99105
"remark-mermaid": "^0.2.0",
100106
"remark-refractor": "1.0.0",
107+
"remark-responsive-tables": "1.0.0",
101108
"remark-slug": "^5.0.0",
102109
"request": "^2.81.0",
103110
"request-promise": "^4.2.2",
@@ -118,6 +125,9 @@
118125
"@rigor789/remark-autolink-headings": "^5.1.0",
119126
"docsearch.js": "^2.5.2",
120127
"gitter-sidecar": "^1.2.3",
128+
"ajv": "^5.5.2",
129+
"javascriptstuff-db": "^1.12.0",
130+
"lodash.throttle": "^4.1.1",
121131
"prop-types": "^15.5.10",
122132
"react": "^16.2.0",
123133
"react-banner": "^1.0.0-rc.0",
@@ -126,7 +136,7 @@
126136
"react-g-analytics": "0.4.2",
127137
"react-hot-loader": "^4.0.0-beta.12",
128138
"react-router-dom": "^4.2.2",
129-
"tool-list": "^0.12.0",
130-
"webpack.vote": "^0.1.2"
139+
"webpack.vote": "^0.1.2",
140+
"whatwg-fetch": "^2.0.3"
131141
}
132142
}

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

0 commit comments

Comments
 (0)