(fix) Address some minor issues with regexes in development code

openmrs · Nov 21, 2023 · 9e35d61 · 9e35d61
1 parent 52fcfc3
commit 9e35d61
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/shell/esm-app-shell/webpack.config.js b/packages/shell/esm-app-shell/webpack.config.js
@@ -95,6 +95,12 @@ function checkDirectoryHasContents(dirName) {
   }
 }
 
+// taken from: https://stackoverflow.com/a/6969486
+// this function is CC BY-SA 4.0
+function escapeRegExp(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 /**
  * @param {*} env
  * @param {*} argv
@@ -160,7 +166,9 @@ module.exports = (env, argv = {}) => {
       historyApiFallback: {
         rewrites: [
           {
-            from: new RegExp(`^${openmrsPublicPath}/.*(?!\.(?!html).+$)`),
+            from: new RegExp(
+              `^${escapeRegExp(openmrsPublicPath)}/.*(?!\\.(?!html).+$)`
+            ),
             to: `${openmrsPublicPath}/index.html`,
           },
         ],

diff --git a/packages/tooling/openmrs/src/commands/develop.ts b/packages/tooling/openmrs/src/commands/develop.ts
@@ -63,14 +63,14 @@ export function runDevelop(args: DevelopArgs) {
     .replace(/href="\/openmrs\/spa/g, `href="${spaPath}`)
     .replace(/src="\/openmrs\/spa/g, `src="${spaPath}`)
     .replace(
-      /https:\/\/dev3.openmrs.org\/openmrs\/spa\/importmap\.json/g,
+      /https:\/\/dev3\.openmrs\.org\/openmrs\/spa\/importmap\.json/g,
       `http://${host}:${port}${spaPath}/importmap.json`
     );
 
   const sw = resolve(source, "service-worker.js");
   // remove any full references to dev3.openmrs.org
   const swContent = readFileSync(sw, "utf-8").replace(
-    /https:\/\/dev3.openmrs.org\/openmrs\/spa\//g,
+    /https:\/\/dev3\.openmrs\.org\/openmrs\/spa\//g,
     ``
   );