Skip to content

Commit f5abb33

Browse files
author
MICHAEL JACKSON
committed
Move website webpack config to default location
1 parent bdcfec6 commit f5abb33

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

website/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"name": "react-router-website",
44
"version": "4.2.0",
55
"scripts": {
6-
"build": "NODE_ENV=production webpack --config webpack/config.js -p",
6+
"build": "NODE_ENV=production webpack -p",
77
"clean": "git clean -fdX .",
8-
"start": "webpack-dev-server --config webpack/config.js --inline --host 0.0.0.0"
8+
"start": "webpack-dev-server --inline --host 0.0.0.0"
99
},
1010
"devDependencies": {
1111
"babel-core": "^6.21.0",

website/webpack/config.js renamed to website/webpack.config.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ module.exports = {
88
devtool: "source-map",
99

1010
entry: {
11-
app: path.resolve(__dirname, "../modules/index.js"),
11+
app: path.resolve(__dirname, "modules/index.js"),
1212
vendor: ["react", "react-dom"]
1313
},
1414

1515
output: {
16-
path: path.resolve(__dirname, "../build"),
16+
path: path.resolve(__dirname, "build"),
1717
filename: `bundle-[chunkHash].js`,
1818
chunkFilename: `[name]-[chunkHash].js`,
1919
publicPath: "/"
@@ -32,7 +32,7 @@ module.exports = {
3232
new HTMLWebpackPlugin({
3333
template: "index.html.ejs"
3434
}),
35-
new CopyWebpackPlugin([{ from: path.resolve(__dirname, "../static") }])
35+
new CopyWebpackPlugin([{ from: path.resolve(__dirname, "static") }])
3636
].concat(
3737
process.env.NODE_ENV === "production"
3838
? [
@@ -46,20 +46,20 @@ module.exports = {
4646

4747
resolve: {
4848
modules: [
49-
path.resolve(__dirname, "../../"),
50-
path.resolve(__dirname, "../../node_modules")
49+
path.resolve(__dirname, "../"),
50+
path.resolve(__dirname, "../node_modules")
5151
],
5252
alias: {
53-
"react-router": path.resolve(__dirname, "../../packages/react-router"),
54-
"react-router-dom": path.resolve(
55-
__dirname,
56-
"../modules/ReactRouterDOMShim"
57-
)
53+
"react-router": path.resolve(__dirname, "../packages/react-router"),
54+
"react-router-dom": path.resolve(__dirname, "modules/ReactRouterDOMShim")
5855
}
5956
},
6057

6158
resolveLoader: {
62-
modules: [path.resolve(__dirname, "../../node_modules"), __dirname]
59+
modules: [
60+
path.resolve(__dirname, "../node_modules"),
61+
path.resolve(__dirname, "webpack")
62+
]
6363
},
6464

6565
module: {

0 commit comments

Comments
 (0)