diff options
author | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
---|---|---|
committer | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
commit | ddafde942ca53816c19b0ea0cb40bb1b46cf5668 (patch) | |
tree | c0ac2138fe994c4c2a15c23b47d4155f75148945 /package.json | |
parent | e6300de1421d28d173658e61601b9e016c3d0a6d (diff) | |
parent | da42bfadb58888e3a18afd66395f0f3edc2fa622 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/package.json b/package.json index 8cbcea92b..60f9af1e9 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,10 @@ "license": "AGPL-3.0", "scripts": { "postversion": "git push --tags", - "build:development": "cross-env RAILS_ENV=development ASSET_HOST=http://0.0.0.0:8080 ./bin/webpack", + "build:development": "cross-env RAILS_ENV=development ./bin/webpack", "build:production": "cross-env RAILS_ENV=production ./bin/webpack", "manage:translations": "node ./config/webpack/translationRunner.js", - "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js", + "start": "node ./streaming/index.js", "storybook": "cross-env NODE_ENV=test start-storybook -s ./public -p 9001 -c storybook", "test": "npm run test:lint && npm run test:mocha", "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ storybook/ streaming/", @@ -24,7 +24,7 @@ "axios": "^0.16.2", "babel-cli": "^6.24.1", "babel-core": "^6.25.0", - "babel-loader": "^7.0.0", + "babel-loader": "^7.1.0", "babel-plugin-lodash": "^3.2.11", "babel-plugin-react-intl": "^2.3.1", "babel-plugin-react-transform": "^2.0.2", @@ -35,7 +35,7 @@ "babel-plugin-transform-object-rest-spread": "^6.23.0", "babel-plugin-transform-react-jsx-self": "^6.22.0", "babel-plugin-transform-react-jsx-source": "^6.22.0", - "babel-plugin-transform-react-remove-prop-types": "^0.4.5", + "babel-plugin-transform-react-remove-prop-types": "^0.4.6", "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-env": "^1.5.2", "babel-preset-react": "^6.24.1", @@ -55,7 +55,7 @@ "glob": "^7.1.1", "http-link-header": "^0.8.0", "immutable": "^3.8.1", - "intersection-observer": "^0.3.0", + "intersection-observer": "^0.3.2", "intl": "^1.2.5", "intl-relativeformat": "^1.3.0", "is-nan": "^1.2.1", @@ -65,71 +65,71 @@ "marky": "^1.2.0", "mkdirp": "^0.5.1", "node-sass": "^4.5.2", - "npmlog": "^4.1.0", + "npmlog": "^4.1.2", "object-assign": "^4.1.1", "path-complete-extname": "^0.1.0", - "pg": "^6.2.4", - "postcss-loader": "^2.0.5", + "pg": "^6.4.0", + "postcss-loader": "^2.0.6", "postcss-smart-import": "^0.7.4", "precss": "^1.4.0", "prop-types": "^15.5.10", "punycode": "^2.1.0", - "rails-ujs": "^5.1.1", - "react": "^15.6.0", + "rails-ujs": "^5.1.2", + "react": "^15.6.1", "react-addons-perf": "^15.4.2", - "react-addons-shallow-compare": "^15.5.2", - "react-dom": "^15.6.0", + "react-addons-shallow-compare": "^15.6.0", + "react-dom": "^15.6.1", "react-immutable-proptypes": "^2.1.0", "react-immutable-pure-component": "^1.0.0", "react-intl": "^2.3.0", "react-motion": "^0.5.0", - "react-notification": "^6.7.0", + "react-notification": "^6.7.1", "react-redux": "^5.0.4", "react-redux-loading-bar": "^2.9.2", "react-router-dom": "^4.1.1", "react-router-scroll": "ytase/react-router-scroll#build", "react-simple-dropdown": "^3.0.0", "react-swipeable": "^4.0.1", - "react-textarea-autosize": "^5.0.6", + "react-textarea-autosize": "^5.0.7", "react-toggle": "^4.0.1", "redis": "^2.7.1", - "redux": "^3.6.0", + "redux": "^3.7.1", "redux-immutable": "^4.0.0", "redux-thunk": "^2.2.0", "requestidlecallback": "^0.3.0", "reselect": "^3.0.1", - "resolve-url-loader": "^2.0.2", + "resolve-url-loader": "^2.1.0", "rimraf": "^2.6.1", - "sass-loader": "^6.0.5", - "stringz": "^0.2.1", + "sass-loader": "^6.0.6", + "stringz": "^0.2.2", "style-loader": "^0.18.2", "throng": "^4.0.0", "tiny-queue": "^0.2.1", - "uuid": "^3.0.1", + "uuid": "^3.1.0", "uws": "^0.14.5", "webpack": "^3.0.0", "webpack-bundle-analyzer": "^2.8.2", "webpack-manifest-plugin": "^1.1.0", "webpack-merge": "^4.1.0", - "websocket.js": "^0.1.10" + "websocket.js": "^0.1.12" }, "devDependencies": { - "@storybook/addon-actions": "^3.1.2", - "@storybook/react": "^3.1.3", + "@storybook/addon-actions": "^3.1.6", + "@storybook/react": "^3.1.6", "babel-eslint": "^7.2.3", "chai": "^4.0.1", "chai-enzyme": "^0.7.1", - "enzyme": "^2.8.2", + "enzyme": "^2.9.1", "eslint": "^3.19.0", "eslint-plugin-jsx-a11y": "^4.0.0", "eslint-plugin-react": "^6.10.3", "jsdom": "^10.1.0", "mocha": "^3.4.1", "react-intl-translations-manager": "^5.0.0", - "react-test-renderer": "^15.5.4", - "sinon": "^2.3.4", + "react-test-renderer": "^15.6.1", + "sinon": "^2.3.5", "webpack-dev-server": "lencioni/webpack-dev-server#patch-1", - "yargs": "^8.0.1" + "yargs": "^8.0.2" }, "optionalDependencies": { "fsevents": "*" |