Merge branch 'master' into yo-office-prerelease

millerds · millerds · commit 50c5932b462b · 2022-12-20T11:37:25.000-08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -46,7 +46,7 @@
       "name": "Excel Desktop (Custom Functions)",
       "type": "node",
       "request": "attach",
-      "port": 9229,
+      "port": 9223,
       "timeout": 600000,
       "preLaunchTask": "Debug: Excel Desktop",
       "postDebugTask": "Stop Debug",
diff --git a/webpack.config.js b/webpack.config.js
@@ -91,7 +91,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
`@@ -91,7 +91,7 @@ module.exports = async (env, options) => {`
`91`	`91`	`if (dev) {`
`92`	`92`	`return content;`
`93`	`93`	`} else {`
`94`		`- return content.toString().replace(new RegExp(urlDev, "g"), urlProd);`
	`94`	`+ return content.toString().replace(new RegExp(urlDev + "(?:public/)?", "g"), urlProd);`
`95`	`95`	`}`
`96`	`96`	`},`
`97`	`97`	`},`