diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-12 08:46:45 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-12 08:46:45 +0000 |
| commit | 6d2db33de43f20c314bee558919c1859e6f54d4a (patch) | |
| tree | 5ec10887f80085e8cd00217d33e18d48caee25e9 /package.json | |
| parent | ccba2f445dc0efd670a492cef954169a117eb166 (diff) | |
| parent | d59f48987baceb25aa87dc6d87551f68af4bb1ed (diff) | |
| download | gitlab-ce-6d2db33de43f20c314bee558919c1859e6f54d4a.tar.gz | |
Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
# app/models/blob.rb
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/package.json b/package.json index eb680b0d76c..20a02c18789 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "private": true, "scripts": { - "dev-server": "webpack-dev-server --config config/webpack.config.js", - "eslint": "eslint --max-warnings 0 --ext .js .", - "eslint-fix": "eslint --max-warnings 0 --ext .js --fix .", - "eslint-report": "eslint --max-warnings 0 --ext .js --format html --output-file ./eslint-report.html .", + "dev-server": "nodemon --watch config/webpack.config.js -- ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js", + "eslint": "eslint --max-warnings 0 --ext .js,.vue .", + "eslint-fix": "eslint --max-warnings 0 --ext .js,.vue --fix .", + "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html .", "karma": "karma start config/karma.config.js --single-run", "karma-coverage": "BABEL_ENV=coverage karma start config/karma.config.js --single-run", "karma-start": "karma start config/karma.config.js", @@ -20,10 +20,12 @@ "bootstrap-sass": "^3.3.6", "compression-webpack-plugin": "^0.3.2", "core-js": "^2.4.1", + "css-loader": "^0.28.0", "d3": "^3.5.11", "document-register-element": "^1.3.0", "dropzone": "^4.2.0", "emoji-unicode-version": "^0.2.1", + "eslint-plugin-html": "^2.0.1", "file-loader": "^0.11.1", "jquery": "^2.2.1", "jquery-ujs": "^1.2.1", @@ -34,6 +36,7 @@ "pikaday": "^1.5.1", "raphael": "^2.2.7", "raw-loader": "^0.5.1", + "react-dev-utils": "^0.5.2", "select2": "3.5.2-browserify", "sql.js": "^0.4.0", "stats-webpack-plugin": "^0.4.3", @@ -43,8 +46,10 @@ "timeago.js": "^2.0.5", "underscore": "^1.8.3", "visibilityjs": "^1.2.4", - "vue": "^2.2.4", + "vue": "^2.2.6", + "vue-loader": "^11.3.4", "vue-resource": "^0.9.3", + "vue-template-compiler": "^2.2.6", "webpack": "^2.3.3", "webpack-bundle-analyzer": "^2.3.0" }, @@ -66,6 +71,7 @@ "karma-phantomjs-launcher": "^1.0.2", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^2.0.2", + "nodemon": "^1.11.0", "webpack-dev-server": "^2.4.2" } } |