openmrs 5.7.3-pre.2139 → 5.7.3-pre.2142

package/dist/cli.js

@@ -164,6 +164,7 @@ yargs_1.default.command('build', 'Builds a new app shell.', (argv) => argv
     default: [],
     describe: 'The path to a frontend configuration file. Can be used multiple times. The file is copied directly into the build directory.',
     type: 'array',
+    coerce: (arg) => arg.map((p) => (0, path_1.resolve)(process.cwd(), p)),
 })
     .option('importmap', {
     default: undefined,
@@ -180,9 +181,9 @@ yargs_1.default.command('build', 'Builds a new app shell.', (argv) => argv
     describe: "The locale to use as a default for this build of the app shell. Should be a value that's valid to use in an HTML lang attribute, e.g., en or en_GB.",
     type: 'string',
 }), async (args) => runCommand('runBuild', {
-    configUrls: args['config-url'],
-    configPaths: args['config-path'].map((p) => (0, path_1.resolve)(process.cwd(), p)),
     ...args,
+    configUrls: args['config-url'],
+    configPaths: args['config-path'],
 }));
 yargs_1.default.command('assemble', 'Assembles an import map incl. all required resources.', (argv) => argv
     .option('target', {
@@ -200,13 +201,20 @@ yargs_1.default.command('assemble', 'Assembles an import map incl. all required
 })
     .option('config', {
     default: ['spa-build-config.json'],
-    description: 'Path to a SPA build config JSON.',
+    description: 'Path to a SPA assemble config JSON.',
+    type: 'array',
+    coerce: (arg) => arg.map((p) => (0, path_1.resolve)(process.cwd(), p)),
+})
+    .option('config-file', {
+    default: [],
+    describe: 'Reference to a frontend configuration file. Can be used multiple times. Configurations are merged in the order specified into openmrs-config.json.',
     type: 'array',
     coerce: (arg) => arg.map((p) => (0, path_1.resolve)(process.cwd(), p)),
 })
-    .option('hash-importmap', {
+    .option('hash-files', {
     default: false,
-    description: 'Determines whether to include a content-specific hash for the generated importmap. This is useful if you want to be able to cache the importmap.',
+    alias: ['hasn', 'hash-importmap'],
+    description: 'Determines whether to include a content-specific hash for the generated JSON files. This is useful if you want to be able to cache those files.',
     type: 'boolean',
 })
     .option('fresh', {
@@ -229,7 +237,7 @@ yargs_1.default.command('assemble', 'Assembles an import map incl. all required
     default: 'survey',
     description: 'The source of the frontend modules to assemble. `config` uses a configuration file specified via `--config`. `survey` starts an interactive command-line survey.',
     type: 'string',
-}), (args) => runCommand('runAssemble', args));
+}), (args) => runCommand('runAssemble', { ...args, configFiles: args['config-file'] }));
 yargs_1.default.command(['start', '$0'], 'Starts the app shell using the provided configuration. This uses express for serving static files with some proxy middleware.', (argv) => argv
     .number('port')
     .default('port', 8080)
@@ -249,7 +257,7 @@ yargs_1.default.command(['start', '$0'], 'Starts the app shell using the provide
     ...args,
 }));
 yargs_1.default
-    .epilog('The SPA build config JSON is a JSON file, typically `frontend.json`, which defines parameters for the `build` and `assemble` ' +
+    .epilog('The SPA assemble config JSON is a JSON file, typically `frontend.json`, which defines parameters for the `build` and `assemble` ' +
     'commands. The keys used by `build` are:\n' +
     '  `apiUrl`, `spaPath`, `configPaths`, `configUrls`, `importmap`, `pageTitle`, and `supportOffline`;\n' +
     'each of which is equivalent to the corresponding command line argument (see `openmrs build --help`). ' +

package/dist/commands/assemble.js

@@ -14,6 +14,7 @@ const axios_1 = __importDefault(require("axios"));
 const npm_registry_fetch_1 = __importDefault(require("npm-registry-fetch"));
 const pacote_1 = __importDefault(require("pacote"));
 const semver_1 = __importDefault(require("semver"));
+const lodash_es_1 = require("lodash-es");
 const utils_1 = require("../utils");
 const npmConfig_1 = require("../utils/npmConfig");
 async function readConfig(mode, configs, fetchOptions) {
@@ -185,7 +186,7 @@ async function runAssemble(args) {
         const appRoutes = (0, path_1.resolve)(args.target, dirName, 'routes.json');
         if ((0, fs_1.existsSync)(appRoutes)) {
             try {
-                routes[esmName] = JSON.parse((await (0, promises_1.readFile)(appRoutes)).toString());
+                routes[esmName] = JSON.parse(await (0, promises_1.readFile)(appRoutes, 'utf8'));
                 routes[esmName]['version'] = version;
             }
             catch (e) {
@@ -201,9 +202,22 @@ async function runAssemble(args) {
         importmap.imports[esmName] = `${publicUrl}/${dirName}/${fileName}`;
         versionManifest.frontendModules[esmName] = version;
     }));
-    await (0, promises_1.writeFile)((0, path_1.resolve)(args.target, `importmap${args.hashImportmap ? '.' + (0, utils_1.contentHash)(importmap) : ''}.json`), JSON.stringify(importmap), 'utf8');
+    await (0, promises_1.writeFile)((0, path_1.resolve)(args.target, `importmap${args.hashFiles ? '.' + (0, utils_1.contentHash)(importmap) : ''}.json`), JSON.stringify(importmap), 'utf8');
     if (args.buildRoutes) {
-        await (0, promises_1.writeFile)((0, path_1.resolve)(args.target, `routes.registry${args.hashImportmap ? '.' + (0, utils_1.contentHash)(routes) : ''}.json`), JSON.stringify(routes), 'utf-8');
+        await (0, promises_1.writeFile)((0, path_1.resolve)(args.target, `routes.registry${args.hashFiles ? '.' + (0, utils_1.contentHash)(routes) : ''}.json`), JSON.stringify(routes), 'utf-8');
+    }
+    if (args.configFiles && args.configFiles.length > 0) {
+        const assembledConfig = args.configFiles.reduce(async (merged, file) => {
+            try {
+                const config = JSON.parse((await (0, promises_1.readFile)(file), 'utf8'));
+                return (0, lodash_es_1.merge)(merged, config);
+            }
+            catch (e) {
+                (0, utils_1.logWarn)(`Error while processing config file ${file}: ${e}`);
+            }
+            return merged;
+        }, {});
+        await (0, promises_1.writeFile)((0, path_1.resolve)(args.target, `openmrs-config${args.hashFiles ? '.' + (0, utils_1.contentHash)(assembledConfig) : ''}.json`), JSON.stringify(assembledConfig), 'utf8');
     }
     if (args.manifest) {
         await (0, promises_1.writeFile)((0, path_1.resolve)(args.target, 'spa-assemble-config.json'), JSON.stringify(versionManifest), 'utf8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "5.7.3-pre.2139",
+  "version": "5.7.3-pre.2142",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",
@@ -29,8 +29,8 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@openmrs/esm-app-shell": "5.7.3-pre.2139",
-    "@openmrs/webpack-config": "5.7.3-pre.2139",
+    "@openmrs/esm-app-shell": "5.7.3-pre.2142",
+    "@openmrs/webpack-config": "5.7.3-pre.2142",
     "@pnpm/npm-conf": "^2.1.0",
     "@swc/core": "^1.3.58",
     "autoprefixer": "^10.4.2",

package/src/cli.ts

@@ -216,6 +216,7 @@ yargs.command(
         describe:
           'The path to a frontend configuration file. Can be used multiple times. The file is copied directly into the build directory.',
         type: 'array',
+        coerce: (arg: Array<string>) => arg.map((p) => resolve(process.cwd(), p)),
       })
       .option('importmap', {
         default: undefined,
@@ -237,9 +238,9 @@ yargs.command(
       }),
   async (args) =>
     runCommand('runBuild', {
-      configUrls: args['config-url'],
-      configPaths: args['config-path'].map((p) => resolve(process.cwd(), p)),
       ...args,
+      configUrls: args['config-url'],
+      configPaths: args['config-path'],
     }),
 );
 
@@ -263,14 +264,22 @@ yargs.command(
       })
       .option('config', {
         default: ['spa-build-config.json'],
-        description: 'Path to a SPA build config JSON.',
+        description: 'Path to a SPA assemble config JSON.',
+        type: 'array',
+        coerce: (arg: Array<string>) => arg.map((p) => resolve(process.cwd(), p)),
+      })
+      .option('config-file', {
+        default: [],
+        describe:
+          'Reference to a frontend configuration file. Can be used multiple times. Configurations are merged in the order specified into openmrs-config.json.',
         type: 'array',
         coerce: (arg: Array<string>) => arg.map((p) => resolve(process.cwd(), p)),
       })
-      .option('hash-importmap', {
+      .option('hash-files', {
         default: false,
+        alias: ['hasn', 'hash-importmap'],
         description:
-          'Determines whether to include a content-specific hash for the generated importmap. This is useful if you want to be able to cache the importmap.',
+          'Determines whether to include a content-specific hash for the generated JSON files. This is useful if you want to be able to cache those files.',
         type: 'boolean',
       })
       .option('fresh', {
@@ -295,7 +304,7 @@ yargs.command(
           'The source of the frontend modules to assemble. `config` uses a configuration file specified via `--config`. `survey` starts an interactive command-line survey.',
         type: 'string',
       }),
-  (args) => runCommand('runAssemble', args),
+  (args) => runCommand('runAssemble', { ...args, configFiles: args['config-file'] }),
 );
 
 yargs.command(
@@ -326,7 +335,7 @@ yargs.command(
 
 yargs
   .epilog(
-    'The SPA build config JSON is a JSON file, typically `frontend.json`, which defines parameters for the `build` and `assemble` ' +
+    'The SPA assemble config JSON is a JSON file, typically `frontend.json`, which defines parameters for the `build` and `assemble` ' +
       'commands. The keys used by `build` are:\n' +
       '  `apiUrl`, `spaPath`, `configPaths`, `configUrls`, `importmap`, `pageTitle`, and `supportOffline`;\n' +
       'each of which is equivalent to the corresponding command line argument (see `openmrs build --help`). ' +

package/src/commands/assemble.ts

@@ -8,6 +8,7 @@ import axios from 'axios';
 import npmRegistryFetch from 'npm-registry-fetch';
 import pacote from 'pacote';
 import semver from 'semver';
+import { merge } from 'lodash-es';
 import { contentHash, logInfo, logWarn, untar } from '../utils';
 import { getNpmRegistryConfiguration } from '../utils/npmConfig';
 
@@ -18,7 +19,8 @@ export interface AssembleArgs {
   mode: string;
   config: Array<string>;
   registry?: string;
-  hashImportmap: boolean;
+  configFiles: Array<string>;
+  hashFiles: boolean;
   fresh: boolean;
   buildRoutes: boolean;
   manifest: boolean;
@@ -265,7 +267,7 @@ export async function runAssemble(args: AssembleArgs) {
       const appRoutes = resolve(args.target, dirName, 'routes.json');
       if (existsSync(appRoutes)) {
         try {
-          routes[esmName] = JSON.parse((await readFile(appRoutes)).toString());
+          routes[esmName] = JSON.parse(await readFile(appRoutes, 'utf8'));
           routes[esmName]['version'] = version;
         } catch (e) {
           logWarn(`Error while processing routes for ${esmName} using ${appRoutes}: ${e}`);
@@ -286,19 +288,38 @@ export async function runAssemble(args: AssembleArgs) {
   );
 
   await writeFile(
-    resolve(args.target, `importmap${args.hashImportmap ? '.' + contentHash(importmap) : ''}.json`),
+    resolve(args.target, `importmap${args.hashFiles ? '.' + contentHash(importmap) : ''}.json`),
     JSON.stringify(importmap),
     'utf8',
   );
 
   if (args.buildRoutes) {
     await writeFile(
-      resolve(args.target, `routes.registry${args.hashImportmap ? '.' + contentHash(routes) : ''}.json`),
+      resolve(args.target, `routes.registry${args.hashFiles ? '.' + contentHash(routes) : ''}.json`),
       JSON.stringify(routes),
       'utf-8',
     );
   }
 
+  if (args.configFiles && args.configFiles.length > 0) {
+    const assembledConfig = args.configFiles.reduce(async (merged, file) => {
+      try {
+        const config = JSON.parse((await readFile(file), 'utf8'));
+        return merge(merged, config);
+      } catch (e) {
+        logWarn(`Error while processing config file ${file}: ${e}`);
+      }
+
+      return merged;
+    }, {});
+
+    await writeFile(
+      resolve(args.target, `openmrs-config${args.hashFiles ? '.' + contentHash(assembledConfig) : ''}.json`),
+      JSON.stringify(assembledConfig),
+      'utf8',
+    );
+  }
+
   if (args.manifest) {
     await writeFile(resolve(args.target, 'spa-assemble-config.json'), JSON.stringify(versionManifest), 'utf8');
   }