openmrs 7.0.0 → 7.0.1-pre.3258

package/dist/cli.js

@@ -248,10 +248,17 @@ yargs_1.default.command('build', 'Builds a new app shell.', (argv) => argv
     default: 'production',
     describe: 'The environment to build for. e.g., development, production.',
     type: 'string',
+})
+    .option('asset', {
+    default: [],
+    describe: "The path to CSS or JS assets to copy into 'assets/' in the build directory, and include as <link> and <script> tags in the generated HTML. Can be used multiple times.",
+    type: 'array',
+    coerce: (arg) => arg.map((p) => (0, node_path_1.resolve)(process.cwd(), p)),
 }), async (args) => runCommand('runBuild', {
     ...args,
     configUrls: args['config-url'],
     configPaths: args['config-path'],
+    assets: args['asset'],
 }));
 yargs_1.default.command('assemble', 'Assembles an import map incl. all required resources.', (argv) => argv
     .option('target', {

package/dist/commands/build.js

@@ -70,6 +70,7 @@ async function runBuild(args) {
         supportOffline: buildConfig.supportOffline ?? args.supportOffline,
         spaPath: buildConfig.spaPath || args.spaPath,
         fresh: args.fresh ?? false,
+        assets: args.assets || buildConfig.assets || [],
     });
     (0, utils_1.logInfo)(`Running build process ...`);
     const compiler = webpack({

package/dist/utils/config.js

@@ -58,6 +58,9 @@ function loadWebpackConfig(options = {}) {
     if (typeof options.fresh === 'boolean') {
         variables.OMRS_CLEAN_BEFORE_BUILD = options.fresh;
     }
+    if (Array.isArray(options.assets)) {
+        variables.OMRS_JS_CSS_ASSETS = options.assets.join(';');
+    }
     (0, variables_1.setEnvVariables)(variables);
     const config = require('@openmrs/esm-app-shell/webpack.config.js');
     if (typeof config === 'function') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "7.0.0",
+  "version": "7.0.1-pre.3258",
   "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": "7.0.0",
-    "@openmrs/rspack-config": "7.0.0",
-    "@openmrs/webpack-config": "7.0.0",
+    "@openmrs/esm-app-shell": "7.0.1-pre.3258",
+    "@openmrs/rspack-config": "7.0.1-pre.3258",
+    "@openmrs/webpack-config": "7.0.1-pre.3258",
     "@pnpm/npm-conf": "^2.1.0",
     "@rspack/cli": "^1.3.11",
     "@rspack/core": "^1.3.11",
@@ -47,6 +47,7 @@
     "ejs": "^3.1.8",
     "glob": "^7.1.3",
     "html-webpack-plugin": "^5.5.0",
+    "html-webpack-tags-plugin": "^3.0.2",
     "inquirer": "^7.3.3",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
@@ -83,5 +84,6 @@
     "@types/react": "^18",
     "@types/semver": "^7",
     "@types/tar": "^4.0.3"
-  }
+  },
+  "stableVersion": "7.0.0"
 }

package/src/cli.ts

@@ -300,12 +300,20 @@ yargs.command(
         default: 'production',
         describe: 'The environment to build for. e.g., development, production.',
         type: 'string',
+      })
+      .option('asset', {
+        default: [],
+        describe:
+          "The path to CSS or JS assets to copy into 'assets/' in the build directory, and include as <link> and <script> tags in the generated HTML. Can be used multiple times.",
+        type: 'array',
+        coerce: (arg: Array<string>) => arg.map((p) => resolve(process.cwd(), p)),
       }),
   async (args) =>
     runCommand('runBuild', {
       ...args,
       configUrls: args['config-url'],
       configPaths: args['config-path'],
+      assets: args['asset'],
     }),
 );
 

package/src/commands/build.ts

@@ -22,6 +22,7 @@ export interface BuildArgs {
   configPaths: Array<string>;
   buildConfig?: string;
   env: string;
+  assets: Array<string>;
 }
 
 export type BuildConfig = Partial<{
@@ -35,6 +36,7 @@ export type BuildConfig = Partial<{
   routes: string;
   spaPath: string;
   env: string;
+  assets: Array<string>;
 }>;
 
 function loadBuildConfig(buildConfigPath?: string): BuildConfig {
@@ -119,6 +121,7 @@ export async function runBuild(args: BuildArgs) {
     supportOffline: buildConfig.supportOffline ?? args.supportOffline,
     spaPath: buildConfig.spaPath || args.spaPath,
     fresh: args.fresh ?? false,
+    assets: args.assets || buildConfig.assets || [],
   });
 
   logInfo(`Running build process ...`);

package/src/utils/config.ts

@@ -16,6 +16,7 @@ export interface WebpackOptions {
   coreAppsDir?: string;
   addCookie?: string;
   fresh?: boolean;
+  assets?: Array<string>;
 }
 
 export function loadWebpackConfig(options: WebpackOptions = {}) {
@@ -88,6 +89,10 @@ export function loadWebpackConfig(options: WebpackOptions = {}) {
     variables.OMRS_CLEAN_BEFORE_BUILD = options.fresh;
   }
 
+  if (Array.isArray(options.assets)) {
+    variables.OMRS_JS_CSS_ASSETS = options.assets.join(';');
+  }
+
   setEnvVariables(variables);
 
   const config: