openmrs 6.3.1-pre.2965 → 6.3.1-pre.2986

package/default-rspack-config.js

@@ -0,0 +1,3 @@
+const { default: extendConfig, ...rest } = require('@openmrs/rspack-config');
+
+module.exports = Object.assign(extendConfig, rest);

package/dist/cli.js

@@ -165,11 +165,16 @@ yargs_1.default.command('develop', 'Starts a new frontend module development ses
     default: false,
     describe: 'Determines if a service worker should be installed for offline support.',
     type: 'boolean',
+})
+    .option('use-rspack', {
+    default: undefined,
+    describe: "Set this flag to force the CLI to attempt to use the Rspack Dev Server. Note that this will fail if the project you are using it in doesn't use Rspack.",
+    type: 'boolean',
 }), async (args) => runCommand('runDevelop', {
     configUrls: args['config-url'],
     configFiles: args['config-file'],
     ...args,
-    ...(0, utils_1.proxyImportmapAndRoutes)(await (0, utils_1.mergeImportmapAndRoutes)(await (0, utils_1.getImportmapAndRoutes)(args.importmap, args.routes, args.port), await (0, utils_1.runProject)(args.port, args.sources), args.backend, args.spaPath), args.backend, args.spaPath),
+    ...(0, utils_1.proxyImportmapAndRoutes)(await (0, utils_1.mergeImportmapAndRoutes)(await (0, utils_1.getImportmapAndRoutes)(args.importmap, args.routes, args.port), await (0, utils_1.runProject)(args.port, args.sources, args['use-rspack']), args.backend, args.spaPath), args.backend, args.spaPath),
 }));
 yargs_1.default.command('build', 'Builds a new app shell.', (argv) => argv
     .option('target', {

package/dist/commands/assemble.js

@@ -9,7 +9,7 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const node_stream_1 = require("node:stream");
 const inquirer_1 = require("inquirer");
-const rimraf_1 = __importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const axios_1 = __importDefault(require("axios"));
 const npm_registry_fetch_1 = __importDefault(require("npm-registry-fetch"));
 const pacote_1 = __importDefault(require("pacote"));
@@ -174,7 +174,7 @@ async function runAssemble(args) {
     (0, utils_1.logInfo)(`Assembling dependencies and building import map and routes registry...`);
     const { frontendModules = {}, publicUrl = '.' } = config;
     if (args.fresh && (0, node_fs_1.existsSync)(args.target)) {
-        await new Promise((resolve) => (0, rimraf_1.default)(args.target, resolve));
+        await (0, rimraf_1.rimraf)(args.target);
     }
     await (0, promises_1.mkdir)(args.target, { recursive: true });
     await Promise.all(Object.keys(frontendModules).map(async (esmName) => {

package/dist/commands/develop.js

@@ -142,10 +142,11 @@ async function runDevelop(args) {
         (0, utils_1.logInfo)(`Listening at http://${host}:${port}`);
         (0, utils_1.logInfo)(`SPA available at ${pageUrl}`);
         if (open) {
-            const open = require('open');
-            setTimeout(() => open(pageUrl, { wait: false }).catch(() => {
-                (0, utils_1.logWarn)(`Unable to open "${pageUrl}" in browser. If you are running in a headless environment, please do not use the --open flag.`);
-            }), 2000);
+            Promise.resolve().then(() => __importStar(require('open'))).then(({ default: open }) => {
+                setTimeout(() => open(pageUrl, { wait: false }).catch(() => {
+                    (0, utils_1.logWarn)(`Unable to open "${pageUrl}" in browser. If you are running in a headless environment, please do not use the --open flag.`);
+                }), 2000);
+            });
         }
     });
     return new Promise(() => { });

package/dist/utils/debugger.js

@@ -1,6 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@rspack/core");
+const dev_server_1 = require("@rspack/dev-server");
 const node_path_1 = require("node:path");
+const webpack_1 = __importDefault(require("webpack"));
+const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const logger_1 = require("./logger");
 function getWebpackEnv() {
     return {
@@ -17,20 +24,24 @@ function loadConfig(configPath) {
     }
     return content;
 }
-function debug(configPath, port) {
-    const Webpack = require('webpack');
-    // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-    const WebpackDevServer = require('webpack-dev-server');
+function startDevServer(configPath, port, useRspack = false) {
     const config = loadConfig(configPath);
-    const compiler = Webpack(config);
     const devServerOptions = {
         ...config.devServer,
         port,
         static: (0, node_path_1.dirname)(configPath),
     };
-    const server = new WebpackDevServer(devServerOptions, compiler);
+    let server;
+    if (!useRspack) {
+        const compiler = (0, webpack_1.default)(config);
+        server = new webpack_dev_server_1.default(devServerOptions, compiler);
+    }
+    else {
+        const compiler = (0, core_1.rspack)(config);
+        server = new dev_server_1.RspackDevServer(devServerOptions, compiler);
+    }
     server.startCallback(() => {
         (0, logger_1.logInfo)(`Listening at http://localhost:${port}`);
     });
 }
-process.on('message', ({ source, port }) => debug(source, port));
+process.on('message', ({ source, port, useRspack }) => startDevServer(source, port, useRspack));

package/dist/utils/{webpack.js → devserver.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startWebpack = void 0;
+exports.startDevServer = void 0;
 const path_1 = require("path");
 const child_process_1 = require("child_process");
-function startWebpack(source, port, cwd = process.cwd()) {
+function startDevServer(source, port, cwd = process.cwd(), useRspack = false) {
     const runner = (0, path_1.resolve)(__dirname, 'debugger.js');
     const ps = (0, child_process_1.fork)(runner, [], { cwd });
-    ps.send({ source, port });
+    ps.send({ source, port, useRspack });
     return ps;
 }
-exports.startWebpack = startWebpack;
+exports.startDevServer = startDevServer;

package/dist/utils/importmap.js

@@ -11,7 +11,7 @@ const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const child_process_1 = require("child_process");
 const logger_1 = require("./logger");
-const webpack_1 = require("./webpack");
+const devserver_1 = require("./devserver");
 const dependencies_1 = require("./dependencies");
 async function readImportmap(path, backend, spaPath) {
     if (path.startsWith('http://') || path.startsWith('https://')) {
@@ -111,14 +111,14 @@ async function matchAny(baseDir, patterns) {
     return matches;
 }
 const defaultConfigPath = (0, node_path_1.resolve)(__dirname, '..', '..', 'default-webpack-config.js');
-function runProjectWebpack(configPath, port, project, sourceDirectory, importMap, routes) {
+function runProjectDevServer(configPath, port, project, sourceDirectory, importMap, routes, useRspack = false) {
     const bundle = (0, dependencies_1.getMainBundle)(project);
     const host = `http://localhost:${port}`;
-    (0, webpack_1.startWebpack)(configPath, port, sourceDirectory);
+    (0, devserver_1.startDevServer)(configPath, port, sourceDirectory, useRspack);
     importMap[project.name] = `${host}/${bundle.name}`;
     routes[project.name] = (0, dependencies_1.getAppRoutes)(sourceDirectory, project);
 }
-async function runProject(basePort, sourceDirectoryPatterns) {
+async function runProject(basePort, sourceDirectoryPatterns, useRspack) {
     const baseDir = process.cwd();
     const sourceDirectories = await matchAny(baseDir, sourceDirectoryPatterns);
     const importMap = {};
@@ -128,8 +128,11 @@ async function runProject(basePort, sourceDirectoryPatterns) {
     for (let i = 0; i < sourceDirectories.length; i++) {
         const sourceDirectory = (0, node_path_1.resolve)(baseDir, sourceDirectories[i]);
         const projectFile = (0, node_path_1.resolve)(sourceDirectory, 'package.json');
-        const configPath = (0, node_path_1.resolve)(sourceDirectory, 'webpack.config.js');
         const routesFile = (0, node_path_1.resolve)(sourceDirectory, 'src', 'routes.json');
+        const configPath = (0, node_path_1.resolve)(sourceDirectory, 'webpack.config.js');
+        const rspackConfigPath = (0, node_path_1.resolve)(sourceDirectory, 'rspack.config.js');
+        const hasConfig = typeof useRspack !== 'undefined' ? !useRspack : (0, node_fs_1.existsSync)(configPath);
+        const hasRspackConfig = typeof useRspack !== 'undefined' ? useRspack : (0, node_fs_1.existsSync)(rspackConfigPath);
         const port = basePort + i + 1;
         (0, logger_1.logInfo)(`Looking in directory "${sourceDirectory}" ...`);
         if (!(0, node_fs_1.existsSync)(projectFile)) {
@@ -151,14 +154,19 @@ async function runProject(basePort, sourceDirectoryPatterns) {
             // connect to either startup.url or a computed value based on startup.host
             importMap[project.name] = startup.url || `${startup.host}/${(0, node_path_1.basename)(project.browser)}`;
         }
-        else if (!(0, node_fs_1.existsSync)(configPath)) {
+        else if (!hasConfig && !hasRspackConfig) {
             // try to locate and run via default webpack
             (0, logger_1.logWarn)(`No "webpack.config.js" found in directory "${sourceDirectory}". Trying to use default config ...`);
-            runProjectWebpack(defaultConfigPath, port, project, sourceDirectory, importMap, routes);
+            runProjectDevServer(defaultConfigPath, port, project, sourceDirectory, importMap, routes);
         }
         else {
-            // run via specialized webpack.config.js
-            runProjectWebpack(configPath, port, project, sourceDirectory, importMap, routes);
+            if (hasConfig) {
+                // run via specialized webpack.config.js
+                runProjectDevServer(configPath, port, project, sourceDirectory, importMap, routes);
+            }
+            else {
+                runProjectDevServer(rspackConfigPath, port, project, sourceDirectory, importMap, routes, true);
+            }
         }
     }
     (0, logger_1.logInfo)(`Assembled dynamic import map and routes for packages (${Object.keys(importMap).join(', ')}).`);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "openmrs",
-  "version": "6.3.1-pre.2965",
+  "version": "6.3.1-pre.2986",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",
-  "types": "src/index.ts",
+  "types": "dist/index.d.ts",
   "engines": {
     "node": ">= 12.0.0"
   },
@@ -29,10 +29,14 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@openmrs/esm-app-shell": "6.3.1-pre.2965",
-    "@openmrs/webpack-config": "6.3.1-pre.2965",
+    "@openmrs/esm-app-shell": "6.3.1-pre.2986",
+    "@openmrs/rspack-config": "6.3.1-pre.2986",
+    "@openmrs/webpack-config": "6.3.1-pre.2986",
     "@pnpm/npm-conf": "^2.1.0",
-    "@swc/core": "^1.3.58",
+    "@rspack/cli": "^1.3.11",
+    "@rspack/core": "^1.3.11",
+    "@rspack/dev-server": "^1.1.2",
+    "@swc/core": "^1.11.29",
     "autoprefixer": "^10.4.20",
     "axios": "^0.21.4",
     "browserslist-config-openmrs": "^1.0.1",
@@ -49,34 +53,34 @@
     "mini-css-extract-plugin": "^2.9.1",
     "node-watch": "^0.7.4",
     "npm-registry-fetch": "^14.0.5",
+    "open": "^10.1.1",
     "pacote": "^15.0.0",
     "postcss": "^8.4.41",
     "postcss-loader": "^6.2.1",
-    "rimraf": "^3.0.2",
-    "sass-loader": "^12.3.0",
+    "rimraf": "^6.0.1",
+    "sass-embedded": "^1.89.0",
+    "sass-loader": "^16.0.5",
     "semver": "^7.3.4",
     "style-loader": "^3.3.4",
     "swc-loader": "^0.2.6",
     "tar": "^6.0.5",
-    "typescript": "^4.9.5",
-    "webpack": "^5.88.0",
-    "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.15.2",
+    "typescript": "^4.7.0",
+    "webpack": "^5.99.9",
+    "webpack-bundle-analyzer": "^4.10.2",
+    "webpack-cli": "^6.0.1",
+    "webpack-dev-server": "^5.2.1",
     "webpack-pwa-manifest": "^4.3.0",
-    "webpack-stats-plugin": "^1.0.3",
+    "webpack-stats-plugin": "^1.1.3",
     "workbox-webpack-plugin": "^6.4.1",
     "yargs": "^17.6.2"
   },
   "devDependencies": {
     "@types/express": "^4.11.1",
     "@types/glob": "^7.1.1",
-    "@types/inquirer": "^6.5.0",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^18.11.11",
     "@types/pacote": "^11.1.8",
-    "@types/react": "^18.0.9",
-    "@types/rimraf": "^2.0.5",
+    "@types/react": "^18",
     "@types/semver": "^7",
     "@types/tar": "^4.0.3"
   },

package/src/cli.ts

@@ -194,6 +194,12 @@ yargs.command(
         default: false,
         describe: 'Determines if a service worker should be installed for offline support.',
         type: 'boolean',
+      })
+      .option('use-rspack', {
+        default: undefined,
+        describe:
+          "Set this flag to force the CLI to attempt to use the Rspack Dev Server. Note that this will fail if the project you are using it in doesn't use Rspack.",
+        type: 'boolean',
       }),
   async (args) =>
     runCommand('runDevelop', {
@@ -203,7 +209,7 @@ yargs.command(
       ...proxyImportmapAndRoutes(
         await mergeImportmapAndRoutes(
           await getImportmapAndRoutes(args.importmap, args.routes, args.port),
-          await runProject(args.port, args.sources),
+          await runProject(args.port, args.sources, args['use-rspack']),
           args.backend,
           args.spaPath,
         ),

package/src/commands/assemble.ts

@@ -3,7 +3,7 @@ import { existsSync } from 'node:fs';
 import { resolve, dirname, basename } from 'node:path';
 import { Readable } from 'node:stream';
 import { prompt, type Question } from 'inquirer';
-import rimraf from 'rimraf';
+import { rimraf } from 'rimraf';
 import axios from 'axios';
 import npmRegistryFetch from 'npm-registry-fetch';
 import pacote from 'pacote';
@@ -250,7 +250,7 @@ export async function runAssemble(args: AssembleArgs) {
   const { frontendModules = {}, publicUrl = '.' } = config;
 
   if (args.fresh && existsSync(args.target)) {
-    await new Promise((resolve) => rimraf(args.target, resolve));
+    await rimraf(args.target);
   }
 
   await mkdir(args.target, { recursive: true });

package/src/commands/develop.ts

@@ -170,17 +170,17 @@ export async function runDevelop(args: DevelopArgs) {
     logInfo(`SPA available at ${pageUrl}`);
 
     if (open) {
-      const open = require('open');
-
-      setTimeout(
-        () =>
-          open(pageUrl, { wait: false }).catch(() => {
-            logWarn(
-              `Unable to open "${pageUrl}" in browser. If you are running in a headless environment, please do not use the --open flag.`,
-            );
-          }),
-        2000,
-      );
+      import('open').then(({ default: open }) => {
+        setTimeout(
+          () =>
+            open(pageUrl, { wait: false }).catch(() => {
+              logWarn(
+                `Unable to open "${pageUrl}" in browser. If you are running in a headless environment, please do not use the --open flag.`,
+              );
+            }),
+          2000,
+        );
+      });
     }
   });
 

package/src/utils/debugger.ts

@@ -1,6 +1,13 @@
+import {
+  rspack,
+  type Configuration as RspackConfiguration,
+  type DevServer as RspackDevServerConfiguration,
+} from '@rspack/core';
+import { RspackDevServer } from '@rspack/dev-server';
 import { dirname } from 'node:path';
+import webpack, { type Configuration as WebpackConfiguration } from 'webpack';
+import WebpackDevServer from 'webpack-dev-server';
 import { logInfo } from './logger';
-import type { Configuration } from 'webpack';
 
 function getWebpackEnv() {
   return {
@@ -11,32 +18,42 @@ function getWebpackEnv() {
   };
 }
 
-function loadConfig(configPath: string) {
-  const content: Configuration | ((env: unknown) => Configuration) = require(configPath);
+function loadConfig(configPath: string): WebpackConfiguration | RspackConfiguration {
+  const content:
+    | WebpackConfiguration
+    | RspackConfiguration
+    | ((env: Record<string, unknown>) => WebpackConfiguration | RspackConfiguration) = require(configPath);
   if (typeof content === 'function') {
     return content(getWebpackEnv());
   }
   return content;
 }
 
-function debug(configPath: string, port: number) {
-  const Webpack = require('webpack');
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-  const WebpackDevServer: typeof import('webpack-dev-server') = require('webpack-dev-server');
+function startDevServer(configPath: string, port: number, useRspack: boolean = false) {
   const config = loadConfig(configPath);
 
-  const compiler = Webpack(config);
   const devServerOptions = {
     ...config.devServer,
     port,
     static: dirname(configPath),
   };
 
-  const server = new WebpackDevServer(devServerOptions, compiler);
+  let server: WebpackDevServer | RspackDevServer;
+  if (!useRspack) {
+    const compiler = webpack(config as WebpackConfiguration);
+
+    server = new WebpackDevServer(devServerOptions as WebpackDevServer.Configuration, compiler);
+  } else {
+    const compiler = rspack(config as RspackConfiguration);
+
+    server = new RspackDevServer(devServerOptions as RspackDevServerConfiguration, compiler);
+  }
 
   server.startCallback(() => {
     logInfo(`Listening at http://localhost:${port}`);
   });
 }
 
-process.on('message', ({ source, port }: { source: string; port: number }) => debug(source, port));
+process.on('message', ({ source, port, useRspack }: { source: string; port: number; useRspack: boolean }) =>
+  startDevServer(source, port, useRspack),
+);

package/src/utils/{webpack.ts → devserver.ts}

@@ -1,11 +1,11 @@
 import { resolve } from 'path';
 import { fork } from 'child_process';
 
-export function startWebpack(source: string, port: number, cwd = process.cwd()) {
+export function startDevServer(source: string, port: number, cwd = process.cwd(), useRspack: boolean = false) {
   const runner = resolve(__dirname, 'debugger.js');
   const ps = fork(runner, [], { cwd });
 
-  ps.send({ source, port });
+  ps.send({ source, port, useRspack });
 
   return ps;
 }

package/src/utils/importmap.ts

@@ -5,7 +5,7 @@ import { basename, resolve } from 'node:path';
 import { existsSync, readFileSync } from 'node:fs';
 import { exec } from 'child_process';
 import { logFail, logInfo, logWarn } from './logger';
-import { startWebpack } from './webpack';
+import { startDevServer } from './devserver';
 import { getMainBundle, getAppRoutes } from './dependencies';
 
 async function readImportmap(path: string, backend?: string, spaPath?: string) {
@@ -146,18 +146,19 @@ async function matchAny(baseDir: string, patterns: Array<string>) {
 
 const defaultConfigPath = resolve(__dirname, '..', '..', 'default-webpack-config.js');
 
-function runProjectWebpack(
+function runProjectDevServer(
   configPath: string,
   port: number,
   project: any,
   sourceDirectory: string,
   importMap: Record<string, string>,
   routes: Record<string, unknown>,
+  useRspack: boolean = false,
 ) {
   const bundle = getMainBundle(project);
   const host = `http://localhost:${port}`;
 
-  startWebpack(configPath, port, sourceDirectory);
+  startDevServer(configPath, port, sourceDirectory, useRspack);
   importMap[project.name] = `${host}/${bundle.name}`;
   routes[project.name] = getAppRoutes(sourceDirectory, project);
 }
@@ -165,6 +166,7 @@ function runProjectWebpack(
 export async function runProject(
   basePort: number,
   sourceDirectoryPatterns: Array<string>,
+  useRspack?: boolean,
 ): Promise<{
   importMap: Record<string, string>;
   routes: Record<string, unknown>;
@@ -181,9 +183,13 @@ export async function runProject(
   for (let i = 0; i < sourceDirectories.length; i++) {
     const sourceDirectory = resolve(baseDir, sourceDirectories[i]);
     const projectFile = resolve(sourceDirectory, 'package.json');
-    const configPath = resolve(sourceDirectory, 'webpack.config.js');
     const routesFile = resolve(sourceDirectory, 'src', 'routes.json');
 
+    const configPath = resolve(sourceDirectory, 'webpack.config.js');
+    const rspackConfigPath = resolve(sourceDirectory, 'rspack.config.js');
+    const hasConfig = typeof useRspack !== 'undefined' ? !useRspack : existsSync(configPath);
+    const hasRspackConfig = typeof useRspack !== 'undefined' ? useRspack : existsSync(rspackConfigPath);
+
     const port = basePort + i + 1;
 
     logInfo(`Looking in directory "${sourceDirectory}" ...`);
@@ -209,14 +215,18 @@ export async function runProject(
       cp.stderr?.pipe(process.stderr);
       // connect to either startup.url or a computed value based on startup.host
       importMap[project.name] = startup.url || `${startup.host}/${basename(project.browser)}`;
-    } else if (!existsSync(configPath)) {
+    } else if (!hasConfig && !hasRspackConfig) {
       // try to locate and run via default webpack
       logWarn(`No "webpack.config.js" found in directory "${sourceDirectory}". Trying to use default config ...`);
 
-      runProjectWebpack(defaultConfigPath, port, project, sourceDirectory, importMap, routes);
+      runProjectDevServer(defaultConfigPath, port, project, sourceDirectory, importMap, routes);
     } else {
-      // run via specialized webpack.config.js
-      runProjectWebpack(configPath, port, project, sourceDirectory, importMap, routes);
+      if (hasConfig) {
+        // run via specialized webpack.config.js
+        runProjectDevServer(configPath, port, project, sourceDirectory, importMap, routes);
+      } else {
+        runProjectDevServer(rspackConfigPath, port, project, sourceDirectory, importMap, routes, true);
+      }
     }
   }