Browse Source

Поправки сборки webpack

Book Pauk 2 years ago
parent
commit
2e057f5c96
2 changed files with 4 additions and 5 deletions
  1. 3 3
      build/webpack.dev.config.js
  2. 1 2
      build/webpack.prod.config.js

+ 3 - 3
build/webpack.dev.config.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const path = require('path');
 const webpack = require('webpack');
 const webpack = require('webpack');
+const pckg = require('../package.json');
 
 
 const { merge } = require('webpack-merge');
 const { merge } = require('webpack-merge');
 const baseWpConfig = require('./webpack.base.config');
 const baseWpConfig = require('./webpack.base.config');
@@ -8,16 +9,15 @@ baseWpConfig.entry.unshift('webpack-hot-middleware/client');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 
-const publicDir = path.resolve(__dirname, '../server/public');
+const publicDir = path.resolve(__dirname, `../server/.${pckg.name}/public`);
 const clientDir = path.resolve(__dirname, '../client');
 const clientDir = path.resolve(__dirname, '../client');
 
 
 module.exports = merge(baseWpConfig, {
 module.exports = merge(baseWpConfig, {
     mode: 'development',
     mode: 'development',
     devtool: 'inline-source-map',
     devtool: 'inline-source-map',
     output: {
     output: {
-        path: `${publicDir}/app`,
+        path: `${publicDir}${baseWpConfig.output.publicPath}`,
         filename: 'bundle.js',
         filename: 'bundle.js',
-        clean: true
     },
     },
 
 
     module: {
     module: {

+ 1 - 2
build/webpack.prod.config.js

@@ -17,9 +17,8 @@ const clientDir = path.resolve(__dirname, '../client');
 module.exports = merge(baseWpConfig, {
 module.exports = merge(baseWpConfig, {
     mode: 'production',
     mode: 'production',
     output: {
     output: {
-        path: `${publicDir}/app_new`,
+        path: `${publicDir}${baseWpConfig.output.publicPath}`,
         filename: 'bundle.[contenthash].js',
         filename: 'bundle.[contenthash].js',
-        clean: true        
     },
     },
     module: {
     module: {
         rules: [
         rules: [