openmrs 3.4.1-pre.98 → 4.0.1-pre.204

package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
-openmrs:build: cache hit, replaying output fa08163802173462
+openmrs:build: cache hit, replaying output 43df3c85e3e2bee8
 openmrs:build: $ tsc

package/dist/cli.js

@@ -83,7 +83,7 @@ yargs.command("debug", "Starts a new debugging session of the OpenMRS app shell.
     .string("importmap")
     .default("importmap", "importmap.json")
     .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."), (args) => __awaiter(void 0, void 0, void 0, function* () {
-    return runCommand("runDebug", Object.assign(Object.assign({ apiUrl: args["api-url"], spaPath: args["spa-path"], configUrls: args["config-url"], pageTitle: args["page-title"], supportOffline: args["support-offline"], addCookie: args["add-cookie"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), (args["run-project"] || args.runProject) &&
+    return runCommand("runDebug", Object.assign(Object.assign({ configUrls: args["config-url"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), (args["run-project"] || args.runProject) &&
             (yield (0, utils_1.runProject)(args.port, args["shared-dependencies"], args.sources))), args.backend, args.host, args.port) }));
 }));
 yargs.command("develop", "Starts a new frontend module development session with the OpenMRS app shell.", (argv) => argv
@@ -120,7 +120,7 @@ yargs.command("develop", "Starts a new frontend module development session with
     .string("importmap")
     .default("importmap", "importmap.json")
     .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."), (args) => __awaiter(void 0, void 0, void 0, function* () {
-    return runCommand("runDevelop", Object.assign(Object.assign({ apiUrl: args["api-url"], spaPath: args["spa-path"], configUrls: args["config-url"], addCookie: args["add-cookie"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), args.sources[0] !== false &&
+    return runCommand("runDevelop", Object.assign(Object.assign({ configUrls: args["config-url"] }, args), { importmap: (0, utils_1.proxyImportmap)(yield (0, utils_1.mergeImportmap)(yield (0, utils_1.getImportmap)(args.importmap, args.port), args.sources[0] !== false &&
             (yield (0, utils_1.runProject)(args.port, args["shared-dependencies"], args.sources))), args.backend, args.host, args.port) }));
 }));
 yargs.command("build", "Builds a new app shell.", (argv) => argv
@@ -158,7 +158,7 @@ yargs.command("build", "Builds a new app shell.", (argv) => argv
     .boolean("download-coreapps")
     .default("download-coreapps", false)
     .describe("download-coreapps", "Downloads and bundles the core apps. For cases where the core apps are not in the import map."), (args) => __awaiter(void 0, void 0, void 0, function* () {
-    return runCommand("runBuild", Object.assign(Object.assign({ apiUrl: args["api-url"], spaPath: args["spa-path"], configUrls: args["config-url"], configPaths: args["config-path"].map((p) => (0, path_1.resolve)(process.cwd(), p)), pageTitle: args["page-title"], supportOffline: args["support-offline"], downloadCoreapps: args["download-coreapps"] }, args), { importmap: args.importmap, buildConfig: args["build-config"] && (0, path_1.resolve)(process.cwd(), args["build-config"]), target: (0, path_1.resolve)(process.cwd(), args.target) }));
+    return runCommand("runBuild", Object.assign(Object.assign({ configUrls: args["config-url"], configPaths: args["config-path"].map((p) => (0, path_1.resolve)(process.cwd(), p)) }, args), { importmap: args.importmap, buildConfig: args["build-config"] && (0, path_1.resolve)(process.cwd(), args["build-config"]), target: (0, path_1.resolve)(process.cwd(), args.target) }));
 }));
 yargs.command("assemble", "Assembles an import map incl. all required resources.", (argv) => argv
     .string("target")
@@ -191,7 +191,7 @@ yargs.command(["start", "$0"], "Starts the app shell using the provided configur
     .describe("add-cookie", "Additional cookies to provide when proxying.")
     .boolean("open")
     .default("open", false)
-    .describe("open", "Immediately opens the SPA page URL in the browser."), (args) => runCommand("runStart", Object.assign({ addCookie: args["add-cookie"] }, args)));
+    .describe("open", "Immediately opens the SPA page URL in the browser."), (args) => runCommand("runStart", Object.assign({}, args)));
 yargs
     .epilog("The SPA build 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" +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "3.4.1-pre.98",
+  "version": "4.0.1-pre.204",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": {
@@ -15,7 +15,7 @@
     "test": "jest --passWithNoTests",
     "build": "tsc",
     "lint": "eslint src --ext ts,tsx",
-    "postversion": "yarn add @openmrs/esm-app-shell@$npm_package_version @openmrs/esm-webpack-config@$npm_package_version --exact"
+    "version": "yarn add @openmrs/esm-app-shell@$npm_package_version @openmrs/webpack-config@$npm_package_version --exact"
   },
   "repository": {
     "type": "git",
@@ -33,10 +33,8 @@
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
     "@babel/preset-typescript": "^7.16.7",
-    "@openmrs/esm-app-shell": "^3.4.1-pre.98",
-    "@openmrs/webpack-config": "^3.4.1-pre.98",
-    "@types/react": "^16.9.46",
-    "@types/systemjs": "^6.1.0",
+    "@openmrs/esm-app-shell": "4.0.1-pre.204",
+    "@openmrs/webpack-config": "4.0.1-pre.204",
     "autoprefixer": "^10.4.2",
     "axios": "^0.21.1",
     "browserslist-config-openmrs": "^1.0.1",
@@ -65,8 +63,10 @@
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^6.5.0",
     "@types/node": "12.12.2",
+    "@types/react": "^18.0.9",
     "@types/rimraf": "^2.0.2",
+    "@types/systemjs": "^6.1.0",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "7cea45f5f1a9b9c6c3a9f6a151022f7d6e0da315"
+  "gitHead": "4ba2589b61d90c81eef0a21b87332b9f799f8dac"
 }

package/src/cli.ts

@@ -103,12 +103,7 @@ yargs.command(
       ),
   async (args) =>
     runCommand("runDebug", {
-      apiUrl: args["api-url"],
-      spaPath: args["spa-path"],
       configUrls: args["config-url"],
-      pageTitle: args["page-title"],
-      supportOffline: args["support-offline"],
-      addCookie: args["add-cookie"],
       ...args,
       importmap: proxyImportmap(
         await mergeImportmap(
@@ -182,10 +177,7 @@ yargs.command(
       ),
   async (args) =>
     runCommand("runDevelop", {
-      apiUrl: args["api-url"],
-      spaPath: args["spa-path"],
       configUrls: args["config-url"],
-      addCookie: args["add-cookie"],
       ...args,
       importmap: proxyImportmap(
         await mergeImportmap(
@@ -272,13 +264,8 @@ yargs.command(
       ),
   async (args) =>
     runCommand("runBuild", {
-      apiUrl: args["api-url"],
-      spaPath: args["spa-path"],
       configUrls: args["config-url"],
       configPaths: args["config-path"].map((p) => resolve(process.cwd(), p)),
-      pageTitle: args["page-title"],
-      supportOffline: args["support-offline"],
-      downloadCoreapps: args["download-coreapps"],
       ...args,
       importmap: args.importmap,
       buildConfig:
@@ -347,7 +334,6 @@ yargs.command(
       .describe("open", "Immediately opens the SPA page URL in the browser."),
   (args) =>
     runCommand("runStart", {
-      addCookie: args["add-cookie"],
       ...args,
     })
 );