Merge pull request #98 from 10up/fix/dev-server-public-path

dev-server:Fix public path
10up · Aug 5, 2021 · 2270414 · 2270414
2 parents fc419e6 + 918a42c
commit 2270414
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack.config.js.snap
@@ -4,7 +4,7 @@ exports[`webpack.config.js adds devServer config when passing the --dev-server f
 Object {
   "devServer": Object {
     "compress": true,
-    "contentBase": "/config/webpack/public",
+    "contentBase": "public",
     "port": 3000,
   },
   "devtool": "source-map",

diff --git a/packages/toolkit/config/webpack/devServer.js b/packages/toolkit/config/webpack/devServer.js
@@ -1,12 +1,10 @@
-const path = require('path');
-
 module.exports = ({ isPackage, projectConfig: { devServer, devServerPort } }) => {
 	if (!devServer || !isPackage) {
 		return undefined;
 	}
 
 	return {
-		contentBase: path.join(__dirname, 'public'),
+		contentBase: 'public',
 		compress: true,
 		port: Number(devServerPort),
 	};