Merge branch 'master' into shared-runtime-master

millerds · millerds · commit 3d017687ffb5 · 2022-12-20T12:03:02.000-08:00
diff --git a/webpack.config.js b/webpack.config.js
@@ -86,7 +86,7 @@ module.exports = async (env, options) => {
               if (dev) {
                 return content;
               } else {
-                return content.toString().replace(new RegExp(urlDev, "g"), urlProd);
+                return content.toString().replace(new RegExp(urlDev + "(?:public/)?", "g"), urlProd);
               }
             },
           },

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ module.exports = async (env, options) => {`
`86`	`86`	`if (dev) {`
`87`	`87`	`return content;`
`88`	`88`	`} else {`
`89`		`- return content.toString().replace(new RegExp(urlDev, "g"), urlProd);`
	`89`	`+ return content.toString().replace(new RegExp(urlDev + "(?:public/)?", "g"), urlProd);`
`90`	`90`	`}`
`91`	`91`	`},`
`92`	`92`	`},`