openmrs 4.0.2-pre.336 → 4.0.2

package/.turbo/turbo-build.log

@@ -1 +1 @@
-openmrs:build: cache hit, replaying output 1d7a55aae66b0844
+openmrs:build: cache hit, replaying output 58c23897be9965e7

package/dist/cli.js

@@ -121,7 +121,7 @@ yargs.command("develop", "Starts a new frontend module development session with
     .default("importmap", "importmap.json")
     .describe("importmap", "The import map to use. Can be a path to a valid import map to be taken literally, an URL, or a fixed JSON object."), (args) => __awaiter(void 0, void 0, void 0, function* () {
     return runCommand("runDevelop", Object.assign(Object.assign({ configUrls: args["config-url"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), args.sources[0] !== false &&
-            (yield (0, utils_1.runProject)(args.port, args["shared-dependencies"], args.sources))), args.backend, args.host, args.port) }));
+            (yield (0, utils_1.runProject)(args.port, args["shared-dependencies"], args.sources)), args.backend, args.spaPath), args.backend, args.host, args.port) }));
 }));
 yargs.command("build", "Builds a new app shell.", (argv) => argv
     .string("target")

package/dist/utils/importmap.js

@@ -22,33 +22,43 @@ const webpack_1 = require("./webpack");
 const dependencies_1 = require("./dependencies");
 const axios_1 = __importDefault(require("axios"));
 const glob = require("glob");
-function readImportmap(path) {
+function readImportmap(path, backend, spaPath) {
     return __awaiter(this, void 0, void 0, function* () {
         if (path.startsWith("http://") || path.startsWith("https://")) {
-            return yield axios_1.default
-                .get(path)
-                .then((res) => res.data)
-                .then((m) => (typeof m === "string" ? JSON.parse(m) : m))
-                .then((m) => {
-                if (typeof m === "object" && "imports" in m) {
-                    Object.keys(m.imports).forEach((key) => {
-                        const url = m.imports[key];
-                        if (typeof url === "string") {
-                            m.imports[key] = new url_1.URL(url, path).href;
-                        }
-                    });
-                }
-                return m;
-            })
-                .then((m) => JSON.stringify(m));
+            return fetchRemoteImportmap(path);
         }
         else if (path === "importmap.json") {
-            const path = require.resolve("@openmrs/esm-app-shell/src/assets/importmap.json");
-            return (0, fs_1.readFileSync)(path, "utf8");
+            if (backend && spaPath) {
+                try {
+                    return yield fetchRemoteImportmap(`${backend}/${spaPath}/importmap.json`);
+                }
+                catch (_a) { }
+            }
+            return fetchRemoteImportmap("https://dev3.openmrs.org/openmrs/spa/importmap.json");
         }
         return '{"imports":{}}';
     });
 }
+function fetchRemoteImportmap(fetchUrl) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield axios_1.default
+            .get(fetchUrl)
+            .then((res) => res.data)
+            .then((m) => (typeof m === "string" ? JSON.parse(m) : m))
+            .then((m) => {
+            if (typeof m === "object" && "imports" in m) {
+                Object.keys(m.imports).forEach((key) => {
+                    const url = m.imports[key];
+                    if (typeof url === "string") {
+                        m.imports[key] = new url_1.URL(url, fetchUrl).href;
+                    }
+                });
+            }
+            return m;
+        })
+            .then((m) => JSON.stringify(m));
+    });
+}
 function checkImportmapJson(value) {
     try {
         const content = JSON.parse(value);
@@ -137,12 +147,12 @@ exports.runProject = runProject;
  *   there are new imports to add, and if the original import map declaration
  *   had type "url", it is downloaded and resolved to one of type "inline".
  */
-function mergeImportmap(decl, additionalImports) {
+function mergeImportmap(decl, additionalImports, backend, spaPath) {
     return __awaiter(this, void 0, void 0, function* () {
         if (additionalImports && Object.keys(additionalImports).length > 0) {
             if (decl.type === "url") {
                 decl.type = "inline";
-                decl.value = yield readImportmap(decl.value);
+                decl.value = yield readImportmap(decl.value, backend, spaPath);
             }
             const map = JSON.parse(decl.value);
             decl.value = JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "4.0.2-pre.336",
+  "version": "4.0.2",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",
@@ -30,8 +30,8 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@openmrs/esm-app-shell": "4.0.2-pre.336",
-    "@openmrs/webpack-config": "4.0.2-pre.336",
+    "@openmrs/esm-app-shell": "4.0.2",
+    "@openmrs/webpack-config": "4.0.2",
     "autoprefixer": "^10.4.2",
     "axios": "^0.21.1",
     "browserslist-config-openmrs": "^1.0.1",
@@ -65,5 +65,5 @@
     "@types/systemjs": "^6.1.0",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "214eea9966cddd5723d48c80b6aaac0a26c6d7c3"
+  "gitHead": "cfd4f3a1a3746bff9ef8bc369033b77a0587be5c"
 }

package/src/cli.ts

@@ -187,7 +187,9 @@ yargs.command(
               args.port,
               args["shared-dependencies"],
               args.sources
-            ))
+            )),
+          args.backend,
+          args.spaPath
         ),
         args.backend,
         args.host,

package/src/utils/importmap.ts

@@ -9,35 +9,46 @@ import axios from "axios";
 
 import glob = require("glob");
 
-async function readImportmap(path: string) {
+async function readImportmap(path: string, backend?: string, spaPath?: string) {
   if (path.startsWith("http://") || path.startsWith("https://")) {
-    return await axios
-      .get(path)
-      .then((res) => res.data)
-      .then((m) => (typeof m === "string" ? JSON.parse(m) : m))
-      .then((m) => {
-        if (typeof m === "object" && "imports" in m) {
-          Object.keys(m.imports).forEach((key) => {
-            const url = m.imports[key];
-
-            if (typeof url === "string") {
-              m.imports[key] = new URL(url, path).href;
-            }
-          });
-        }
-        return m;
-      })
-      .then((m) => JSON.stringify(m));
+    return fetchRemoteImportmap(path);
   } else if (path === "importmap.json") {
-    const path = require.resolve(
-      "@openmrs/esm-app-shell/src/assets/importmap.json"
+    if (backend && spaPath) {
+      try {
+        return await fetchRemoteImportmap(
+          `${backend}/${spaPath}/importmap.json`
+        );
+      } catch {}
+    }
+
+    return fetchRemoteImportmap(
+      "https://dev3.openmrs.org/openmrs/spa/importmap.json"
     );
-    return readFileSync(path, "utf8");
   }
 
   return '{"imports":{}}';
 }
 
+async function fetchRemoteImportmap(fetchUrl: string) {
+  return await axios
+    .get(fetchUrl)
+    .then((res) => res.data)
+    .then((m) => (typeof m === "string" ? JSON.parse(m) : m))
+    .then((m) => {
+      if (typeof m === "object" && "imports" in m) {
+        Object.keys(m.imports).forEach((key) => {
+          const url = m.imports[key];
+
+          if (typeof url === "string") {
+            m.imports[key] = new URL(url, fetchUrl).href;
+          }
+        });
+      }
+      return m;
+    })
+    .then((m) => JSON.stringify(m));
+}
+
 export interface ImportmapDeclaration {
   type: "inline" | "url";
   value: string;
@@ -173,12 +184,14 @@ export async function runProject(
  */
 export async function mergeImportmap(
   decl: ImportmapDeclaration,
-  additionalImports: Record<string, string> | false
+  additionalImports: Record<string, string> | false,
+  backend?: string,
+  spaPath?: string
 ) {
   if (additionalImports && Object.keys(additionalImports).length > 0) {
     if (decl.type === "url") {
       decl.type = "inline";
-      decl.value = await readImportmap(decl.value);
+      decl.value = await readImportmap(decl.value, backend, spaPath);
     }
 
     const map = JSON.parse(decl.value);