Skip to content

Commit

Permalink
Merge pull request storybookjs#6259 from storybooks/tech/widen-requir…
Browse files Browse the repository at this point in the history
…ed-webpack-version

FIX storybook having a incompatible version of webpack with vue-cli
  • Loading branch information
ndelangen authored Mar 25, 2019
2 parents 187c559 + e6f7439 commit 0f44caf
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion app/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"sass-loader": "^7.1.0",
"ts-loader": "^5.3.3",
"tsconfig-paths-webpack-plugin": "^3.2.0",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
},
"devDependencies": {
"zone.js": "^0.8.29"
Expand Down
2 changes: 1 addition & 1 deletion app/polymer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"core-js": "^2.6.5",
"global": "^4.3.2",
"regenerator-runtime": "^0.12.1",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
},
"devDependencies": {
"lit-html": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"react-dev-utils": "^8.0.0",
"regenerator-runtime": "^0.12.1",
"semver": "^5.6.0",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
},
"peerDependencies": {
"babel-loader": "^7.0.0 || ^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/ember-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"ember-resolver": "^5.1.3",
"ember-source": "~3.8.0",
"loader.js": "^4.2.3",
"webpack": "^4.29.6",
"webpack": "^4.28.0",
"webpack-cli": "^3.3.0"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion examples/marko-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"@storybook/addons": "5.1.0-alpha.14",
"@storybook/marko": "5.1.0-alpha.14",
"prettier": "^1.16.4",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
}
}
2 changes: 1 addition & 1 deletion examples/mithril-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"@storybook/addon-viewport": "5.1.0-alpha.14",
"@storybook/addons": "5.1.0-alpha.14",
"@storybook/mithril": "5.1.0-alpha.14",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
}
}
2 changes: 1 addition & 1 deletion examples/official-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
"storybook-chromatic": "^1.2.6",
"ts-loader": "^5.3.3",
"uuid": "^3.3.2",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
}
}
2 changes: 1 addition & 1 deletion examples/polymer-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"global": "^4.3.2",
"lit-html": "^1.0.0",
"polymer-webpack-loader": "^2.0.3",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
},
"devDependencies": {
"copy-webpack-plugin": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/preact-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"preact-render-to-json": "^3.6.6",
"raw-loader": "^1.0.0",
"svg-url-loader": "^2.3.2",
"webpack": "^4.29.6",
"webpack": "^4.28.0",
"webpack-dev-server": "^3.2.1"
}
}
2 changes: 1 addition & 1 deletion examples/riot-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"raw-loader": "^1.0.0",
"riot-tag-loader": "^2.1.0",
"svg-url-loader": "^2.3.2",
"webpack": "^4.29.6",
"webpack": "^4.28.0",
"webpack-dev-server": "^3.2.0"
}
}
2 changes: 1 addition & 1 deletion examples/vue-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"file-loader": "^3.0.1",
"svg-url-loader": "^2.3.2",
"vue-loader": "^15.7.0",
"webpack": "^4.29.6",
"webpack": "^4.28.0",
"webpack-dev-server": "^3.2.0"
}
}
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/riot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"riot-compiler": "^3.6.0",
"riot-hot-reload": "^1.0.0",
"style-loader": "^0.23.1",
"webpack": "^4.29.6",
"webpack": "^4.28.0",
"webpack-bundle-analyzer": "^3.1.0",
"webpack-cli": "^3.2.3"
}
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/sfc_vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"vue-loader": "15.7.0",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.8",
"webpack": "^4.29.6",
"webpack": "^4.28.0",
"webpack-bundle-analyzer": "^3.1.0",
"webpack-dev-middleware": "^3.6.0",
"webpack-hot-middleware": "^2.24.3",
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/fixtures/webpack_react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"@babel/preset-react": "7.0.0",
"babel-core": "^7.0.0-bridge.0",
"babel-loader": "^8.0.5",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
}
}
2 changes: 1 addition & 1 deletion lib/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"terser-webpack-plugin": "^1.2.2",
"url-loader": "^1.1.2",
"util-deprecate": "^1.0.2",
"webpack": "^4.29.6",
"webpack": "^4.28.0",
"webpack-dev-middleware": "^3.6.0",
"webpack-hot-middleware": "^2.24.3"
},
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"devDependencies": {
"flush-promises": "^1.0.2",
"terser-webpack-plugin": "^1.2.2",
"webpack": "^4.29.6"
"webpack": "^4.28.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/root",
"version": "5.1.0-alpha.11",
"version": "5.1.0-alpha.14",
"private": true,
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26963,7 +26963,7 @@ webpack@^4.23.1:
watchpack "^1.5.0"
webpack-sources "^1.3.0"

webpack@^4.29.6:
webpack@^4.28.0:
version "4.29.6"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
Expand Down

0 comments on commit 0f44caf

Please sign in to comment.