Skip to content

Commit

Permalink
Fix Webpack config
Browse files Browse the repository at this point in the history
Tests on CI were failing due to Webpack config being broken somehow.
Did some JS library get updated somehow?

Anyway, updating webpack and the output path seems to make it happy again.
  • Loading branch information
Greg Lazarev committed Mar 23, 2017
1 parent 77beb23 commit 110a3a8
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 37 deletions.
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,27 @@
"react": "^15.3.0",
"react-addons-update": "^15.3.2",
"react-dom": "^15.3.0",
"webpack": "^2.1.0-beta.28"
"webpack": "^2.3.1"
},
"devDependencies": {
"babel-core": "^6.7.2",
"babel-eslint": "^7.1.0",
"babel-jest": "^17.0.2",
"babel-loader": "^6.2.4",
"babel-plugin-react-transform": "^2.0.0",
"babel-plugin-transform-class-properties": "^6.6.0",
"babel-plugin-transform-runtime": "^6.6.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.5.0",
"babel-preset-react-hmre": "^1.1.1",
"css-loader": "0.14.5",
"enzyme": "^2.6.0",
"enzyme-to-json": "^1.4.4",
"eslint": "^3.10.1",
"eslint-config-airbnb": "^13.0.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.7.1",
"file-loader": "^0.8.5",
"identity-obj-proxy": "^3.0.0",
"jest": "^17.0.3",
Expand All @@ -55,21 +69,7 @@
"sass-loader": "^3.1.2",
"sinon": "^1.17.6",
"style-loader": "^0.13.0",
"url-loader": "^0.5.7",
"babel-core": "^6.7.2",
"babel-eslint": "^7.1.0",
"babel-loader": "^6.2.4",
"babel-plugin-transform-class-properties": "^6.6.0",
"babel-plugin-transform-runtime": "^6.6.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.5.0",
"babel-preset-react-hmre": "^1.1.1",
"css-loader": "0.14.5",
"eslint": "^3.10.1",
"eslint-config-airbnb": "^13.0.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.7.1"
"url-loader": "^0.5.7"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ module.exports = {
},
output: {
filename: '[name]-bundle.js',
path: './app/assets/webpack',
path: __dirname + '/app/assets/webpack',
},
plugins,
module: {
Expand Down
48 changes: 28 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,14 @@ acorn-jsx@^3.0.0:
dependencies:
acorn "^3.0.4"

[email protected]:
[email protected], acorn@^4.0.3, acorn@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"

acorn@^3.0.4:
version "3.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"

acorn@^4.0.3, acorn@^4.0.4:
version "4.0.9"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.9.tgz#2d2eb458fe3f0e31062d56cf0b1839c5dc7bd288"

ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
Expand Down Expand Up @@ -4762,10 +4758,14 @@ sort-keys@^1.0.0:
dependencies:
is-plain-obj "^1.0.0"

source-list-map@^0.1.4, source-list-map@~0.1.7:
source-list-map@^0.1.4:
version "0.1.8"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"

source-list-map@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.0.1.tgz#cc1fc17122ae0a51978024c2cc0f8c35659026b8"

source-map-support@^0.4.2:
version "0.4.11"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322"
Expand Down Expand Up @@ -5065,7 +5065,7 @@ ua-parser-js@^0.7.9:
version "0.7.12"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"

uglify-js@^2.6, uglify-js@^2.7.5:
uglify-js@^2.6:
version "2.7.5"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
dependencies:
Expand All @@ -5074,6 +5074,14 @@ uglify-js@^2.6, uglify-js@^2.7.5:
uglify-to-browserify "~1.0.0"
yargs "~3.10.0"

uglify-js@^2.8.5:
version "2.8.14"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.14.tgz#25b15d1af39b21752ee33703adbf432e8bc8f77d"
dependencies:
source-map "~0.5.1"
uglify-to-browserify "~1.0.0"
yargs "~3.10.0"

uglify-to-browserify@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
Expand Down Expand Up @@ -5167,9 +5175,9 @@ watch@~0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"

watchpack@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.2.0.tgz#15d4620f1e7471f13fcb551d5c030d2c3eb42dbb"
watchpack@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
dependencies:
async "^2.1.2"
chokidar "^1.4.3"
Expand All @@ -5179,16 +5187,16 @@ webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

webpack-sources@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd"
webpack-sources@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.0.tgz#fea93ba840f16cdd3f246f0ee95f88a9492c69fb"
dependencies:
source-list-map "~0.1.7"
source-list-map "^1.0.1"
source-map "~0.5.3"

webpack@^2.1.0-beta.28:
version "2.2.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475"
webpack@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.1.tgz#55bce8baffe7c1f9dc3029adc048643b448318a8"
dependencies:
acorn "^4.0.4"
acorn-dynamic-import "^2.0.0"
Expand All @@ -5206,9 +5214,9 @@ webpack@^2.1.0-beta.28:
source-map "^0.5.3"
supports-color "^3.1.0"
tapable "~0.2.5"
uglify-js "^2.7.5"
watchpack "^1.2.0"
webpack-sources "^0.1.4"
uglify-js "^2.8.5"
watchpack "^1.3.1"
webpack-sources "^0.2.0"
yargs "^6.0.0"

whatwg-encoding@^1.0.1:
Expand Down

0 comments on commit 110a3a8

Please sign in to comment.