diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-02-18 21:38:24 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-02-18 21:38:24 +0000 |
| commit | 07c32a0df5306082fe800de1ae6e2c51325f46ef (patch) | |
| tree | 2d810bcd76a993ac71224de5b5f0b6a7707127df /package.json | |
| parent | f1645c744fcf8677ae14714914c4c4ffb9d5b17e (diff) | |
| parent | fe10964a6884162b9272ec3a32a5736c2a997ab2 (diff) | |
| download | gitlab-ce-07c32a0df5306082fe800de1ae6e2c51325f46ef.tar.gz | |
Merge branch 'master' into 'template-improvements-for-documentation'
# Conflicts:
# .gitlab/merge_request_templates/Documentation.md
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/package.json b/package.json index c88ade87af6..21edd0dcf41 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "prettier-staged-save": "node ./scripts/frontend/prettier.js save", "prettier-all": "node ./scripts/frontend/prettier.js check-all", "prettier-all-save": "node ./scripts/frontend/prettier.js save-all", + "stylelint": "node node_modules/stylelint/bin/stylelint.js app/assets/stylesheets/**/*.*", "webpack": "webpack --config config/webpack.config.js", "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, @@ -28,7 +29,7 @@ "@babel/plugin-syntax-import-meta": "^7.2.0", "@babel/preset-env": "^7.3.1", "@gitlab/csslab": "^1.8.0", - "@gitlab/svgs": "^1.51.0", + "@gitlab/svgs": "^1.52.0", "@gitlab/ui": "^2.0.2", "apollo-boost": "^0.1.20", "apollo-client": "^2.4.5", @@ -168,7 +169,11 @@ "karma-webpack": "^4.0.0-beta.0", "nodemon": "^1.18.9", "pixelmatch": "^4.0.2", + "postcss": "^7.0.14", "prettier": "1.16.1", + "stylelint": "^9.10.1", + "stylelint-config-recommended": "^2.1.0", + "stylelint-scss": "^3.5.3", "vue-jest": "^3.0.2", "webpack-dev-server": "^3.1.14", "yarn-deduplicate": "^1.1.0" |