openmrs 6.3.1-pre.3207 → 6.3.1-pre.3211

package/dist/commands/develop.js

@@ -53,15 +53,14 @@ async function runDevelop(args) {
     const source = (0, node_path_1.resolve)(require.resolve('@openmrs/esm-app-shell/package.json'), '..', 'dist');
     const index = (0, node_path_1.resolve)(source, 'index.html');
     const indexContent = (0, node_fs_1.readFileSync)(index, 'utf8')
-        .replace(RegExp('<script>[\\s\\S]+</script>'), `
-    <script>
-        initializeSpa({
-          apiUrl: ${JSON.stringify(apiUrl)},
-          spaPath: ${JSON.stringify(spaPath)},
-          env: "development",
-          offline: ${supportOffline},
-          configUrls: ${JSON.stringify([...configUrls, ...localConfigUrls])},
-        });
+        .replace(/<script>initializeSpa\([\s\S\n]*<\/script>/m, `<script>
+      initializeSpa({
+        apiUrl: ${JSON.stringify(apiUrl)},
+        spaPath: ${JSON.stringify(spaPath)},
+        env: "development",
+        offline: ${supportOffline},
+        configUrls: ${JSON.stringify([...configUrls, ...localConfigUrls])},
+      });
     </script>
   `)
         .replace(/href="\/openmrs\/spa/g, `href="${spaPath}`)
@@ -78,10 +77,6 @@ async function runDevelop(args) {
     // explicitly exclude routes that we want to use other handlers for.
     //
     // express.static respects normal route declaration order.
-    // Return our custom `index.html` for all requests beginning with spaPath
-    // and not ending in `.js`, `.woff`, `.woff2`, `.json`, or any three-character
-    // extension.
-    const indexHtmlPathMatcher = new RegExp(`^${spaPath}/(?!.*\\.js$)(?!.*\\.woff2?$)(?!.*\\.json$)(?!.*\\....$).*$`);
     // Route for custom `importmap.json` goes above static assets
     if (importmap.type === 'inline') {
         app.get(`${spaPath}/importmap.json`, (_, res) => {
@@ -128,6 +123,10 @@ async function runDevelop(args) {
             res.contentType('application/json').send((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(process.cwd(), file)));
         });
     });
+    // Return our custom `index.html` for all requests beginning with spaPath
+    // and not ending in `.js`, `.woff`, `.woff2`, `.json`, or any two- or three-character
+    // extension.
+    const indexHtmlPathMatcher = /\/openmrs\/spa\/(?!.*\.(js|woff2?|json|.{2,3}$)).*$/;
     // Route for custom `index.html` goes above static assets
     app.get(indexHtmlPathMatcher, (_, res) => res.contentType('text/html').send(indexContent));
     // Return static assets for any request for which we have one, except importmap.json and index.html

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "6.3.1-pre.3207",
+  "version": "6.3.1-pre.3211",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",
@@ -29,9 +29,9 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@openmrs/esm-app-shell": "6.3.1-pre.3207",
-    "@openmrs/rspack-config": "6.3.1-pre.3207",
-    "@openmrs/webpack-config": "6.3.1-pre.3207",
+    "@openmrs/esm-app-shell": "6.3.1-pre.3211",
+    "@openmrs/rspack-config": "6.3.1-pre.3211",
+    "@openmrs/webpack-config": "6.3.1-pre.3211",
     "@pnpm/npm-conf": "^2.1.0",
     "@rspack/cli": "^1.3.11",
     "@rspack/core": "^1.3.11",

package/src/commands/develop.ts

@@ -48,16 +48,15 @@ export async function runDevelop(args: DevelopArgs) {
   const index = resolve(source, 'index.html');
   const indexContent = readFileSync(index, 'utf8')
     .replace(
-      RegExp('<script>[\\s\\S]+</script>'),
-      `
-    <script>
-        initializeSpa({
-          apiUrl: ${JSON.stringify(apiUrl)},
-          spaPath: ${JSON.stringify(spaPath)},
-          env: "development",
-          offline: ${supportOffline},
-          configUrls: ${JSON.stringify([...configUrls, ...localConfigUrls])},
-        });
+      /<script>initializeSpa\([\s\S\n]*<\/script>/m,
+      `<script>
+      initializeSpa({
+        apiUrl: ${JSON.stringify(apiUrl)},
+        spaPath: ${JSON.stringify(spaPath)},
+        env: "development",
+        offline: ${supportOffline},
+        configUrls: ${JSON.stringify([...configUrls, ...localConfigUrls])},
+      });
     </script>
   `,
     )
@@ -79,11 +78,6 @@ export async function runDevelop(args: DevelopArgs) {
   //
   // express.static respects normal route declaration order.
 
-  // Return our custom `index.html` for all requests beginning with spaPath
-  // and not ending in `.js`, `.woff`, `.woff2`, `.json`, or any three-character
-  // extension.
-  const indexHtmlPathMatcher = new RegExp(`^${spaPath}/(?!.*\\.js$)(?!.*\\.woff2?$)(?!.*\\.json$)(?!.*\\....$).*$`);
-
   // Route for custom `importmap.json` goes above static assets
   if (importmap.type === 'inline') {
     app.get(`${spaPath}/importmap.json`, (_, res) => {
@@ -136,6 +130,11 @@ export async function runDevelop(args: DevelopArgs) {
     });
   });
 
+  // Return our custom `index.html` for all requests beginning with spaPath
+  // and not ending in `.js`, `.woff`, `.woff2`, `.json`, or any two- or three-character
+  // extension.
+  const indexHtmlPathMatcher = /\/openmrs\/spa\/(?!.*\.(js|woff2?|json|.{2,3}$)).*$/;
+
   // Route for custom `index.html` goes above static assets
   app.get(indexHtmlPathMatcher, (_, res) => res.contentType('text/html').send(indexContent));