openmrs 5.1.1-pre.999 → 5.2.0

package/.turbo/turbo-build.log

@@ -1 +1 @@
-openmrs:build: cache hit, replaying output b95c9aa46df817f8
+openmrs:build: cache hit, replaying output 295134e241a6b9b7

package/dist/cli.js

@@ -109,7 +109,10 @@ yargs_1.default.command("develop", "Starts a new frontend module development ses
     .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.")
     .string("routes")
     .default("routes", "routes.registry.json")
-    .describe("routes", "The routes.registry.json file to use."), (args) => __awaiter(void 0, void 0, void 0, function* () {
+    .describe("routes", "The routes.registry.json file to use.")
+    .boolean("support-offline")
+    .default("support-offline", false)
+    .describe("support-offline", "Determines if a service worker should be installed for offline support."), (args) => __awaiter(void 0, void 0, void 0, function* () {
     return runCommand("runDevelop", Object.assign(Object.assign({ configUrls: args["config-url"] }, args), (0, utils_1.proxyImportmapAndRoutes)(yield (0, utils_1.mergeImportmapAndRoutes)(yield (0, utils_1.getImportmapAndRoutes)(args.importmap, args.routes, args.port), args.sources[0] !== false &&
         (yield (0, utils_1.runProject)(args.port, args.sources)), args.backend, args.spaPath), args.backend, args.host, args.port)));
 }));

package/dist/commands/build.js

@@ -85,8 +85,8 @@ function runBuild(args) {
         const compiler = webpack(Object.assign(Object.assign({}, config), { output: Object.assign(Object.assign({}, config.output), { path: args.target }) }));
         return yield new Promise((resolve, reject) => {
             compiler.run((err, stats) => {
-                if (err) {
-                    reject(err);
+                if (err || (stats === null || stats === void 0 ? void 0 : stats.hasErrors())) {
+                    reject(err !== null && err !== void 0 ? err : stats === null || stats === void 0 ? void 0 : stats.compilation.errors);
                 }
                 else {
                     stats &&

package/dist/commands/develop.js

@@ -10,7 +10,7 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 const utils_1 = require("../utils");
 function runDevelop(args) {
-    const { backend, host, port, open, importmap, configUrls, addCookie } = args;
+    const { backend, host, port, open, importmap, configUrls, addCookie, supportOffline, } = args;
     const apiUrl = (0, utils_1.removeTrailingSlash)(args.apiUrl);
     const spaPath = (0, utils_1.removeTrailingSlash)(args.spaPath);
     const app = (0, express_1.default)();
@@ -23,7 +23,7 @@ function runDevelop(args) {
           apiUrl: ${JSON.stringify(apiUrl)},
           spaPath: ${JSON.stringify(spaPath)},
           env: "development",
-          offline: true,
+          offline: ${supportOffline},
           configUrls: ${JSON.stringify(configUrls)},
         });
     </script>
@@ -59,9 +59,11 @@ function runDevelop(args) {
         });
     }
     // Route for custom `service-worker.js` before most things
-    app.get(`${spaPath}/service-worker.js`, (_, res) => {
-        res.contentType("js").send(swContent);
-    });
+    if (supportOffline) {
+        app.get(`${spaPath}/service-worker.js`, (_, res) => {
+            res.contentType("js").send(swContent);
+        });
+    }
     // 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": "5.1.1-pre.999",
+  "version": "5.2.0",
   "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": "5.1.1-pre.999",
-    "@openmrs/webpack-config": "5.1.1-pre.999",
+    "@openmrs/esm-app-shell": "5.2.0",
+    "@openmrs/webpack-config": "5.2.0",
     "@pnpm/npm-conf": "^2.1.0",
     "@swc/core": "^1.3.58",
     "autoprefixer": "^10.4.2",
@@ -69,5 +69,5 @@
     "@types/rimraf": "^2.0.2",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "a216f155e09508cf5bdc3d244fb7a154d1e74325"
+  "gitHead": "f46cd16443cae13069a55067ca317ac995eef570"
 }

package/src/cli.ts

@@ -176,7 +176,13 @@ yargs.command(
       )
       .string("routes")
       .default("routes", "routes.registry.json")
-      .describe("routes", "The routes.registry.json file to use."),
+      .describe("routes", "The routes.registry.json file to use.")
+      .boolean("support-offline")
+      .default("support-offline", false)
+      .describe(
+        "support-offline",
+        "Determines if a service worker should be installed for offline support."
+      ),
   async (args) =>
     runCommand("runDevelop", {
       configUrls: args["config-url"],

package/src/commands/build.ts

@@ -155,8 +155,8 @@ export async function runBuild(args: BuildArgs) {
 
   return await new Promise<void>((resolve, reject) => {
     compiler.run((err, stats) => {
-      if (err) {
-        reject(err);
+      if (err || stats?.hasErrors()) {
+        reject(err ?? stats?.compilation.errors);
       } else {
         stats &&
           console.log(

package/src/commands/develop.ts

@@ -22,10 +22,20 @@ export interface DevelopArgs {
   apiUrl: string;
   configUrls: Array<string>;
   addCookie: string;
+  supportOffline: boolean;
 }
 
 export function runDevelop(args: DevelopArgs) {
-  const { backend, host, port, open, importmap, configUrls, addCookie } = args;
+  const {
+    backend,
+    host,
+    port,
+    open,
+    importmap,
+    configUrls,
+    addCookie,
+    supportOffline,
+  } = args;
   const apiUrl = removeTrailingSlash(args.apiUrl);
   const spaPath = removeTrailingSlash(args.spaPath);
   const app = express();
@@ -44,7 +54,7 @@ export function runDevelop(args: DevelopArgs) {
           apiUrl: ${JSON.stringify(apiUrl)},
           spaPath: ${JSON.stringify(spaPath)},
           env: "development",
-          offline: true,
+          offline: ${supportOffline},
           configUrls: ${JSON.stringify(configUrls)},
         });
     </script>
@@ -96,9 +106,11 @@ export function runDevelop(args: DevelopArgs) {
   }
 
   // Route for custom `service-worker.js` before most things
-  app.get(`${spaPath}/service-worker.js`, (_, res) => {
-    res.contentType("js").send(swContent);
-  });
+  if (supportOffline) {
+    app.get(`${spaPath}/service-worker.js`, (_, res) => {
+      res.contentType("js").send(swContent);
+    });
+  }
 
   // Route for custom `index.html` goes above static assets
   app.get(indexHtmlPathMatcher, (_, res) =>