From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Thu, 2 Apr 2020 13:42:54 +0000 (+0200)
Subject: ci: fix serving
X-Git-Tag: v4.0.0-alpha.5~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecf5120df6ade5863b8b2107525f58a26ce7eebf;p=thirdparty%2Fvuejs%2Frouter.git

ci: fix serving
---

diff --git a/e2e/devServer.js b/e2e/devServer.js
index 5a3bfad9..0552e30b 100644
--- a/e2e/devServer.js
+++ b/e2e/devServer.js
@@ -2,11 +2,11 @@ const webpack = require('webpack')
 const WebpackDevServer = require('webpack-dev-server')
 const webpackConfig = require('./webpack.config')
 
-const compiler = webpack(webpackConfig)
+const config = webpackConfig({ prod: false })
 
-const app = new WebpackDevServer(compiler, webpackConfig.devServer)
+const compiler = webpack(config)
+
+const app = new WebpackDevServer(compiler, config.devServer)
 
 const port = process.env.PORT || 8080
-module.exports = app.listen(port, () => {
-  console.log(`Server listening on http://localhost:${port}, Ctrl+C to stop`)
-})
+module.exports = app.listen(port)
diff --git a/e2e/staticServer.js b/e2e/staticServer.js
index 0f9ba228..46f9542b 100644
--- a/e2e/staticServer.js
+++ b/e2e/staticServer.js
@@ -17,11 +17,10 @@ fs.readdirSync(buildDir).forEach(file => {
 
 const server = http.createServer((request, response) => {
   return handler(request, response, {
-    public: '__build__',
+    public: path.join(__dirname, '__build__'),
     cleanUrls: true,
     rewrites: examples.map(name => ({
       source: `${name}/**`,
-      trailingSlash: true,
       destination: `${name}.html`,
     })),
   })