fix: 修复publicPath

senwii · Dec 31, 2019 · c2f7bab · c2f7bab
1 parent a912fc9
commit c2f7bab
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/public/404.html b/public/404.html
@@ -23,16 +23,16 @@
       // https://username.github.io/repo-name/one/two?a=b&c=d#qwe becomes
       // https://username.github.io/repo-name/?p=/one/two&q=a=b~and~c=d#qwe
       // Otherwise, leave segmentCount as 0.
-      var segmentCount = 0;
+      var segmentCount = 0
 
-      var l = window.location;
+      var l = window.location
       l.replace(
         l.protocol + '//' + l.hostname + (l.port ? ':' + l.port : '') +
         l.pathname.split('/').slice(0, 1 + segmentCount).join('/') + '/?p=/' +
         l.pathname.slice(1).split('/').slice(segmentCount).join('/').replace(/&/g, '~and~') +
         (l.search ? '&q=' + l.search.slice(1).replace(/&/g, '~and~') : '') +
         l.hash
-      );
+      )
 
     </script>
   </head>

diff --git a/public/index.html b/public/index.html
@@ -20,18 +20,21 @@
 	// the single page app to route accordingly.
 	(function(l) {
 		if (l.search) {
-		var q = {};
-		l.search.slice(1).split('&').forEach(function(v) {
-			var a = v.split('=');
-			q[a[0]] = a.slice(1).join('=').replace(/~and~/g, '&');
-		});
-		if (q.p !== undefined) {
-			window.history.replaceState(null, null,
-			l.pathname.slice(0, -1) + (q.p || '') +
-			(q.q ? ('?' + q.q) : '') +
-			l.hash
-			);
-		}
+			var basename = '<%= process.env.PROJECT_NAME %>'
+			var q = {}
+			l.search
+				.slice(1)
+				.split('&')
+				.forEach(function(v) {
+					var a = v.split('=')
+					q[a[0]] = a.slice(1).join('=').replace(/~and~/g, '&')
+				})
+			if (q.p !== undefined) {
+				window.history.replaceState(
+					null,
+					null,
+					l.pathname.replace(`^\/${basename}\/`, '/').slice(0, -1) + (q.p || '') + (q.q ? ('?' + q.q) : '') + l.hash)
+			}
 		}
 	}(window.location))
 	  </script>

diff --git a/src/router.js b/src/router.js
@@ -11,7 +11,7 @@ const routes = [
   },
 ]
 
-const basename = '/react-template-project/'
+const basename = `/${process.env.PROJECT_NAME}/`
 
 export {
   basename,

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,4 +1,6 @@
+const webpack = require('webpack')
 const appDirName = process.cwd()
+const packageName = require(`${appDirName}/package.json`).name
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
@@ -31,6 +33,9 @@ const plugins = [
       flatten: true,
     },
   ]),
+  new webpack.DefinePlugin({
+    'process.env.PROJECT_NAME': JSON.stringify(packageName),
+  }),
 ]
 
 if (IS_PRODUCTION) {