openmrs 4.0.0-pre.0 → 4.0.1-pre.206

package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
-openmrs:build: cache hit, replaying output 993b6d9a8dbe6dab
+openmrs:build: cache hit, replaying output 7ce886572b36e4ff
 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/dist/commands/assemble.js

@@ -118,6 +118,7 @@ function extractFiles(sourceFile, targetDir) {
         const sourceDir = (0, path_1.dirname)(entryModule);
         Object.keys(files)
             .filter((m) => m.startsWith(`${packageRoot}/${sourceDir}`))
+            .filter((m) => !m.endsWith(".map"))
             .forEach((m) => {
             const content = files[m];
             const fileName = m.replace(`${packageRoot}/${sourceDir}/`, "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "4.0.0-pre.0",
+  "version": "4.0.1-pre.206",
   "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,8 +33,8 @@
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
     "@babel/preset-typescript": "^7.16.7",
-    "@openmrs/esm-app-shell": "^4.0.0-pre.0",
-    "@openmrs/webpack-config": "^4.0.0-pre.0",
+    "@openmrs/esm-app-shell": "4.0.1-pre.206",
+    "@openmrs/webpack-config": "4.0.1-pre.206",
     "autoprefixer": "^10.4.2",
     "axios": "^0.21.1",
     "browserslist-config-openmrs": "^1.0.1",
@@ -68,5 +68,5 @@
     "@types/systemjs": "^6.1.0",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "254a7226212aac82df4434639b2584e24ac240e4"
+  "gitHead": "7ac6e01b41238739cdf5d20efdff50062f46f500"
 }

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,
     })
 );

package/src/commands/assemble.ts

@@ -159,6 +159,7 @@ async function extractFiles(sourceFile: string, targetDir: string) {
 
   Object.keys(files)
     .filter((m) => m.startsWith(`${packageRoot}/${sourceDir}`))
+    .filter((m) => !m.endsWith(".map"))
     .forEach((m) => {
       const content = files[m];
       const fileName = m.replace(`${packageRoot}/${sourceDir}/`, "");

package/.turbo/turbo-lint.log

@@ -1,2 +0,0 @@
-openmrs:lint: cache hit, replaying output 6eb49c7482b0e512
-openmrs:lint: $ eslint src --ext ts,tsx

package/.turbo/turbo-test.log

@@ -1,3 +0,0 @@
-openmrs:test: cache hit, replaying output 2f645df933f52e8f
-openmrs:test: $ jest --passWithNoTests
-openmrs:test: No tests found, exiting with code 0

package/dist/commands/serve.js

@@ -1,24 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runServe = void 0;
-const path_1 = require("path");
-const webpackServer_1 = require("../utils/webpackServer");
-function runServe({ sourceDirectory, port }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log("run the traaap");
-        const baseDir = process.env.INIT_CWD || process.cwd();
-        const configPath = (0, path_1.resolve)(baseDir, sourceDirectory, "webpack.config.js");
-        console.log("config at", configPath);
-        (0, webpackServer_1.debug)(configPath, port);
-    });
-}
-exports.runServe = runServe;

package/dist/utils/webpackServer.js

@@ -1,43 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.debug = void 0;
-const path_1 = require("path");
-const logger_1 = require("./logger");
-function getWebpackEnv() {
-    return Object.assign(Object.assign({}, process.env), { analyze: process.env.BUNDLE_ANALYZE === "true", production: process.env.NODE_ENV === "production", development: process.env.NODE_ENV === "development" });
-}
-function loadConfig(configPath) {
-    const content = require(configPath);
-    if (typeof content === "function") {
-        return content(getWebpackEnv());
-    }
-    return content;
-}
-function debug(configPath, port) {
-    const webpack = require("webpack");
-    const WebpackDevServer = require("webpack-dev-server");
-    const config = loadConfig(configPath);
-    const options = Object.assign(Object.assign({}, config.devServer), { host: "localhost", port, static: (0, path_1.dirname)(configPath) });
-    console.log("debugger.ts: starting dev server with options", options);
-    console.log("  and config", config);
-    const server = new WebpackDevServer(webpack(config), options);
-    (() => __awaiter(this, void 0, void 0, function* () {
-        try {
-            yield server.start();
-        }
-        catch (err) {
-            (0, logger_1.logWarn)(`Error: ${err}`);
-        }
-        (0, logger_1.logInfo)(`Listening at http://localhost:${port}`);
-    }))();
-}
-exports.debug = debug;