Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-04 64b6a3560399cfe742d998209c3ff315c4856b9e

 web_src/build/webpack.dev.conf.js

@@ -10,7 +10,6 @@
const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
const portfinder = require('portfinder')

const HOST = process.env.HOST
const PORT = process.env.PORT && Number(process.env.PORT)

const devWebpackConfig = merge(baseWebpackConfig, {
@@ -31,8 +30,8 @@
    hot: true,
    contentBase: false, // since we use CopyWebpackPlugin.
    compress: true,
    host: HOST || config.dev.host,
    port: PORT || config.dev.port,
    host: config.dev.host,
    port: config.dev.port,
    open: config.dev.autoOpenBrowser,
    overlay: config.dev.errorOverlay
      ? { warnings: false, errors: true }
@@ -64,6 +63,11 @@
        to: config.dev.assetsSubDirectory,
        ignore: ['.*']
      }
    ]),
    new CopyWebpackPlugin([
      { from: 'node_modules/@liveqing/liveplayer/dist/component/crossdomain.xml'},
      { from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer.swf'},
      { from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer-lib.min.js', to: config.build.assetsSubDirectory + '/js/'},
    ])
  ]
})