Commit d0d8ac6d by caoyanzhi

Merge branch 'feature/打包调整'

parents 3e78220c 04883fbe
...@@ -43,9 +43,9 @@ const devWebpackConfig = merge(baseWebpackConfig, { ...@@ -43,9 +43,9 @@ const devWebpackConfig = merge(baseWebpackConfig, {
watchOptions: { watchOptions: {
poll: config.dev.poll, poll: config.dev.poll,
}, },
before(app, server) { before(app) {
app.get(/^(?!\/share-config).*$/, (req, res) => { app.get('/', (req, res) => {
res.redirect('/share-config/'); res.redirect(config.dev.assetsPublicPath);
}) })
}, },
}, },
...@@ -88,7 +88,7 @@ module.exports = new Promise((resolve, reject) => { ...@@ -88,7 +88,7 @@ module.exports = new Promise((resolve, reject) => {
// Add FriendlyErrorsPlugin // Add FriendlyErrorsPlugin
devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
compilationSuccessInfo: { compilationSuccessInfo: {
messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}${config.dev.assetsPublicPath}`],
}, },
onErrors: config.dev.notifyOnErrors onErrors: config.dev.notifyOnErrors
? utils.createNotifierCallback() ? utils.createNotifierCallback()
......
...@@ -17,7 +17,7 @@ module.exports = { ...@@ -17,7 +17,7 @@ module.exports = {
// Paths // Paths
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/share-config', assetsPublicPath: '/share-config/',
proxyTable: proxyConfig.proxyList, proxyTable: proxyConfig.proxyList,
// Various Dev Server settings // Various Dev Server settings
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"@chenfengyuan/vue-qrcode": "^1.0.1", "@chenfengyuan/vue-qrcode": "^1.0.1",
"clipboard": "^2.0.4", "clipboard": "^2.0.4",
"echarts": "^4.4.0", "echarts": "^4.4.0",
"element-ui": "^2.12.0", "element-ui": "^2.15.6",
"file-saver": "^1.3.8", "file-saver": "^1.3.8",
"moment": "^2.29.1", "moment": "^2.29.1",
"sass": "^1.26.11", "sass": "^1.26.11",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment