openmrs 4.0.1 → 4.0.2-pre.259

package/.turbo/turbo-build.log

@@ -1 +1 @@
-openmrs:build: cache hit, replaying output 99151aa99c5fb526
+openmrs:build: cache hit, replaying output 398c2e0c3f7ffa98

package/README.md

@@ -4,7 +4,7 @@ The one stop CLI for using the OpenMRS 3.0 Frontend app.
 
 ## Prerequisites
 
-You need Node.js with NPM. We recommend using version 10.18 (LTS) or later.
+You need Node.js with NPM. We recommend using version 16.17 (LTS) or later.
 
 ## Installation
 

package/dist/commands/develop.js

@@ -14,7 +14,7 @@ function runDevelop(args) {
     const apiUrl = (0, utils_1.removeTrailingSlash)(args.apiUrl);
     const spaPath = (0, utils_1.removeTrailingSlash)(args.spaPath);
     const app = (0, express_1.default)();
-    const source = (0, path_1.resolve)(require.resolve("@openmrs/esm-app-shell/package.json"), "..", "lib");
+    const source = (0, path_1.resolve)(require.resolve("@openmrs/esm-app-shell/package.json"), "..", "dist");
     const index = (0, path_1.resolve)(source, "index.html");
     const indexContent = (0, fs_1.readFileSync)(index, "utf8")
         .replace(RegExp("<script>[\\s\\S]+</script>"), `

package/dist/utils/debugger.js

@@ -13,18 +13,14 @@ function loadConfig(configPath) {
     return content;
 }
 function debug(configPath, port) {
-    const webpack = require("webpack");
+    const Webpack = require("webpack");
     const WebpackDevServer = require("webpack-dev-server");
     const config = loadConfig(configPath);
-    const options = Object.assign(Object.assign({}, config.devServer), { port, static: (0, path_1.dirname)(configPath) });
-    const server = new WebpackDevServer(webpack(config), options);
-    server.listen(port, "localhost", (err) => {
-        if (err) {
-            (0, logger_1.logWarn)(`Error: ${err}`);
-        }
-        else {
-            (0, logger_1.logInfo)(`Listening at http://localhost:${port}`);
-        }
+    const compiler = Webpack(config);
+    const devServerOptions = Object.assign(Object.assign({}, config.devServer), { port, static: (0, path_1.dirname)(configPath) });
+    const server = new WebpackDevServer(devServerOptions, compiler);
+    server.startCallback(() => {
+        (0, logger_1.logInfo)(`Listening at http://localhost:${port}`);
     });
 }
 process.on("message", ({ source, port }) => debug(source, port));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "4.0.1",
+  "version": "4.0.2-pre.259",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",
@@ -30,15 +30,14 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@babel/preset-typescript": "^7.16.7",
-    "@openmrs/esm-app-shell": "*",
-    "@openmrs/webpack-config": "*",
+    "@openmrs/esm-app-shell": "4.0.2-pre.259",
+    "@openmrs/webpack-config": "4.0.2-pre.259",
     "autoprefixer": "^10.4.2",
     "axios": "^0.21.1",
     "browserslist-config-openmrs": "^1.0.1",
     "copy-webpack-plugin": "^10.0.0",
     "cssnano": "^5.0.16",
-    "ejs": "^2.6.2",
+    "ejs": "^3.1.8",
     "glob": "^7.1.3",
     "html-webpack-plugin": "^5.5.0",
     "inquirer": "^7.3.3",
@@ -49,9 +48,9 @@
     "tar": "^6.0.5",
     "ts-loader": "^9.2.6",
     "typescript": "~4.5.2",
-    "webpack": "^5.64.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.6.0",
+    "webpack": "^5.74.0",
+    "webpack-cli": "^4.10.0",
+    "webpack-dev-server": "^4.10.1",
     "webpack-pwa-manifest": "^4.3.0",
     "workbox-webpack-plugin": "^6.4.1",
     "yargs": "16.0.3"
@@ -66,5 +65,5 @@
     "@types/systemjs": "^6.1.0",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "1bb3ee4d7988fe53aa09cf6b59e5fce712ff9c8a"
+  "gitHead": "3eea90227e75ec2c366e8c5f1ba9dbd5b070375b"
 }

package/src/commands/develop.ts

@@ -31,7 +31,7 @@ export function runDevelop(args: DevelopArgs) {
   const source = resolve(
     require.resolve("@openmrs/esm-app-shell/package.json"),
     "..",
-    "lib"
+    "dist"
   );
   const index = resolve(source, "index.html");
   const indexContent = readFileSync(index, "utf8")

package/src/utils/debugger.ts

@@ -19,24 +19,21 @@ function loadConfig(configPath: string) {
 }
 
 function debug(configPath: string, port: number) {
-  const webpack = require("webpack");
+  const Webpack = require("webpack");
   const WebpackDevServer = require("webpack-dev-server");
   const config = loadConfig(configPath);
 
-  const options = {
+  const compiler = Webpack(config);
+  const devServerOptions = {
     ...config.devServer,
     port,
     static: dirname(configPath),
   };
 
-  const server = new WebpackDevServer(webpack(config), options);
+  const server = new WebpackDevServer(devServerOptions, compiler);
 
-  server.listen(port, "localhost", (err?: Error) => {
-    if (err) {
-      logWarn(`Error: ${err}`);
-    } else {
-      logInfo(`Listening at http://localhost:${port}`);
-    }
+  server.startCallback(() => {
+    logInfo(`Listening at http://localhost:${port}`);
   });
 }