From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
web_src/build/webpack.dev.conf.js | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/web_src/build/webpack.dev.conf.js b/web_src/build/webpack.dev.conf.js
index c12be3e..55efd30 100755
--- a/web_src/build/webpack.dev.conf.js
+++ b/web_src/build/webpack.dev.conf.js
@@ -32,6 +32,7 @@
contentBase: false, // since we use CopyWebpackPlugin.
compress: true,
host: HOST || config.dev.host,
+ // host:'127.0.0.1',
port: PORT || config.dev.port,
open: config.dev.autoOpenBrowser,
overlay: config.dev.errorOverlay
@@ -63,10 +64,7 @@
from: path.resolve(__dirname, '../static'),
to: config.dev.assetsSubDirectory,
ignore: ['.*']
- },
- { 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: 'js/'}
+ }
])
]
})
--
Gitblit v1.8.0