Skip to content

Commit 861de3e

Browse files
committed
Merge branch 'pr/4'
2 parents 933e602 + f944836 commit 861de3e

File tree

6 files changed

+1257
-142
lines changed

6 files changed

+1257
-142
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ trim_trailing_whitespace = true
1717
[*.md]
1818
trim_trailing_whitespace = false
1919

20+
[*.{css,less,scss}]
21+
indent_style = space
22+
indent_size = 2
23+
2024
[*.yml]
2125
indent_style = space
2226
indent_size = 2

.stylelintrc.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"extends": "stylelint-config-recommended-scss",
3+
"plugins": [
4+
"stylelint-order",
5+
"stylelint-scss"
6+
],
7+
"rules": {
8+
"indentation": 2,
9+
"order/order": [
10+
"custom-properties",
11+
"dollar-variables",
12+
"declarations",
13+
"rules",
14+
"at-rules"
15+
]
16+
}
17+
}

package.json

Lines changed: 51 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,53 @@
11
{
2-
"engines": {
3-
"node": ">=6.9.1"
4-
},
5-
"scripts": {
6-
"start": "webpack --config resources/build/webpack.js",
7-
"dev": "cross-env NODE_ENV=development npm run start --",
8-
"build": "cross-env NODE_ENV=production npm run start --",
9-
"lint": "eslint ./resources/scripts/**"
10-
},
11-
"dependencies": {
12-
"airbnb-browser-shims": "^2.1.0"
13-
},
14-
"devDependencies": {
15-
"autoprefixer": "^8.4.1",
16-
"babel-core": "^6.26.3",
17-
"babel-loader": "^7.1.4",
18-
"babel-preset-env": "^1.6.1",
19-
"babel-preset-stage-2": "^6.24.1",
20-
"browser-sync": "^2.23.7",
21-
"browser-sync-webpack-plugin": "^2.2.2",
22-
"cross-env": "^5.1.4",
23-
"css-loader": "^0.28.11",
24-
"eslint": "^4.19.1",
25-
"eslint-config-airbnb": "^16.1.0",
26-
"eslint-plugin-import": "^2.12.0",
27-
"eslint-plugin-jsx-a11y": "^6.0.3",
28-
"eslint-plugin-react": "^7.8.2",
29-
"extract-text-webpack-plugin": "^4.0.0-beta.0",
30-
"file-loader": "^1.1.11",
31-
"imagemin-mozjpeg": "^7.0.0",
32-
"imagemin-webpack-plugin": "^2.1.1",
33-
"import-glob": "^1.5.0",
34-
"node-sass": "^4.9.0",
35-
"postcss-loader": "^2.1.4",
36-
"sass-loader": "^7.0.1",
37-
"style-loader": "^0.21.0",
38-
"webpack": "^4.6.0",
39-
"webpack-cli": "^2.0.15",
40-
"webpack-spritesmith": "^0.4.1",
41-
"yargs": "^11.0.0"
42-
}
2+
"engines": {
3+
"node": ">=6.9.1"
4+
},
5+
"scripts": {
6+
"start": "webpack --config resources/build/webpack.js",
7+
"dev": "cross-env NODE_ENV=development npm run start --",
8+
"build": "cross-env NODE_ENV=production npm run start --",
9+
"lint": "run-s -cl lint:scripts lint:styles",
10+
"lint-fix": "run-s -cl lint-fix:scripts lint-fix:styles",
11+
"lint:scripts": "eslint ./resources/scripts/**",
12+
"lint:styles": "stylelint ./resources/styles/**",
13+
"lint-fix:scripts": "eslint --fix ./resources/scripts/**",
14+
"lint-fix:styles": "stylelint --fix ./resources/styles/**"
15+
},
16+
"dependencies": {
17+
"airbnb-browser-shims": "^2.1.0"
18+
},
19+
"devDependencies": {
20+
"autoprefixer": "^8.4.1",
21+
"babel-core": "^6.26.3",
22+
"babel-loader": "^7.1.4",
23+
"babel-preset-env": "^1.6.1",
24+
"babel-preset-stage-2": "^6.24.1",
25+
"browser-sync": "^2.23.7",
26+
"browser-sync-webpack-plugin": "^2.2.2",
27+
"cross-env": "^5.1.4",
28+
"css-loader": "^0.28.11",
29+
"eslint": "^4.19.1",
30+
"eslint-config-airbnb": "^16.1.0",
31+
"eslint-plugin-import": "^2.12.0",
32+
"eslint-plugin-jsx-a11y": "^6.0.3",
33+
"eslint-plugin-react": "^7.8.2",
34+
"extract-text-webpack-plugin": "^4.0.0-beta.0",
35+
"file-loader": "^1.1.11",
36+
"imagemin-mozjpeg": "^7.0.0",
37+
"imagemin-webpack-plugin": "^2.1.1",
38+
"import-glob": "^1.5.0",
39+
"node-sass": "^4.9.0",
40+
"npm-run-all": "^4.1.3",
41+
"postcss-loader": "^2.1.4",
42+
"sass-loader": "^7.0.1",
43+
"style-loader": "^0.21.0",
44+
"stylelint": "^9.2.1",
45+
"stylelint-config-recommended-scss": "^3.2.0",
46+
"stylelint-order": "^0.8.1",
47+
"stylelint-scss": "^3.1.0",
48+
"webpack": "^4.6.0",
49+
"webpack-cli": "^2.0.15",
50+
"webpack-spritesmith": "^0.4.1",
51+
"yargs": "^11.0.0"
52+
}
4353
}

0 commit comments

Comments
 (0)