fix webpack config

foxhound87 · Dec 8, 2016 · 1ef7da8 · 1ef7da8
1 parent b173d7b
commit 1ef7da8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/src/web/views/index.ejs b/src/web/views/index.ejs
@@ -8,7 +8,7 @@
     <%-head.meta%>
     <%-head.link%>
     <% if (build) { %>
-      <link href="<%-build%>/style.css" rel="stylesheet" type="text/css">
+      <link href="<%-build%>/web.style.css" rel="stylesheet" type="text/css">
     <% } %>
     <script>
       <%- 'window.__STATE = ' + state + ';' %>

diff --git a/webpack/config.client.build.js b/webpack/config.client.build.js
@@ -73,7 +73,7 @@ export function config(entry) {
         filename: [entry, 'vendor', 'bundle', 'js'].join('.'),
       }),
       new ExtractTextPlugin({
-        filename: 'style.css',
+        filename: [entry, 'style', 'css'].join('.'),
         allChunks: true,
       }),
     ],

diff --git a/webpack/config.server.build.js b/webpack/config.server.build.js
@@ -50,13 +50,12 @@ export function config(entry) {
     ],
     output: {
       path: Dir.nodeBuild,
-      filename: [entry, 'bundle.js'].join('.'),
+      filename: [entry, 'bundle', 'js'].join('.'),
     },
     externals: [nodeExternalModules()],
     plugins: [
       new ProgressBarPlugin(),
       new ExtractTextPlugin({
-        filename: 'style.css',
         disable: true,
       }),
       new webpack.optimize.UglifyJsPlugin({

diff --git a/webpack/config.server.dev.js b/webpack/config.server.dev.js
@@ -51,7 +51,7 @@ export function config(entry) {
     ],
     output: {
       path: Dir.nodeBuild,
-      filename: [entry, 'dev.bundle.js'].join('.'),
+      filename: [entry, 'dev', 'bundle', 'js'].join('.'),
       chunkFilename: '[id].[hash:5]-[chunkhash:7].js',
       devtoolModuleFilenameTemplate: '[absolute-resource-path]',
       libraryTarget: 'commonjs2',
@@ -62,7 +62,6 @@ export function config(entry) {
     // })],
     plugins: [
       new ExtractTextPlugin({
-        filename: 'style.css',
         disable: true,
       }),
       new StartServerPlugin(),