openmrs 3.2.1-pre.933 → 3.2.1-pre.940

package/default-webpack-config.js

@@ -1,210 +1,3 @@
-const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
-const { resolve, dirname, basename } = require("path");
-const { CleanWebpackPlugin } = require("clean-webpack-plugin");
-const { DefinePlugin, container } = require("webpack");
-const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
-const { StatsWriterPlugin } = require("webpack-stats-plugin");
-const { merge, mergeWith, isArray } = require("lodash");
+const { default: extendConfig, ...rest } = require("@openmrs/webpack-config");
 
-const production = "production";
-const { ModuleFederationPlugin } = container;
-
-function getFrameworkVersion() {
-  try {
-    const { version } = require("@openmrs/esm-framework/package.json");
-    return `^${version}`;
-  } catch {
-    return "3.x";
-  }
-}
-
-function makeIdent(name) {
-  if (name.indexOf("/") !== -1) {
-    name = name.substr(name.indexOf("/"));
-  }
-
-  if (name.endsWith("-app")) {
-    name = name.substr(0, name.length - 4);
-  }
-
-  return name;
-}
-
-const overrides = {};
-const additionalConfig = {};
-const scriptRuleConfig = {};
-const cssRuleConfig = {};
-const scssRuleConfig = {};
-const assetRuleConfig = {};
-
-module.exports = (env, argv = {}) => {
-  const root = process.cwd();
-  const { name, peerDependencies, browser, main, types } = require(resolve(
-    root,
-    "package.json"
-  ));
-  const mode = argv.mode || process.env.NODE_ENV || "development";
-  const filename = basename(browser || main);
-  const outDir = dirname(browser || main);
-  const srcFile = resolve(root, browser ? main : types);
-  const ident = makeIdent(name);
-  const frameworkVersion = getFrameworkVersion();
-
-  const cssLoader = {
-    loader: "css-loader",
-    options: {
-      modules: {
-        localIdentName: `${ident}__[name]__[local]___[hash:base64:5]`,
-      },
-    },
-  };
-
-  const baseConfig = {
-    entry: {
-      [name]: "systemjs-webpack-interop/auto-public-path",
-    },
-    output: {
-      libraryTarget: "system",
-      publicPath: "",
-      path: resolve(root, outDir),
-    },
-    target: "web",
-    module: {
-      rules: [
-        merge(
-          {
-            test: /\.m?(js|ts|tsx)$/,
-            exclude: /(node_modules|bower_components)/,
-            use: {
-              loader: require.resolve("babel-loader"),
-            },
-          },
-          scriptRuleConfig
-        ),
-        merge(
-          {
-            test: /\.css$/,
-            use: [require.resolve("style-loader"), cssLoader],
-          },
-          cssRuleConfig
-        ),
-        merge(
-          {
-            test: /\.s[ac]ss$/i,
-            use: [
-              require.resolve("style-loader"),
-              cssLoader,
-              { loader: require.resolve("sass-loader") },
-            ],
-          },
-          scssRuleConfig
-        ),
-        merge(
-          {
-            test: /\.(png|jpe?g|gif|svg)$/i,
-            type: "asset/resource",
-          },
-          assetRuleConfig
-        ),
-      ],
-    },
-    mode,
-    devtool: mode === production ? "source-map" : "inline-source-map",
-    devServer: {
-      headers: {
-        "Access-Control-Allow-Origin": "*",
-      },
-    },
-    performance: {
-      hints: mode === production && "warning",
-    },
-    plugins: [
-      new ForkTsCheckerWebpackPlugin(),
-      new CleanWebpackPlugin(),
-      new BundleAnalyzerPlugin({
-        analyzerMode: env && env.analyze ? "server" : "disabled",
-      }),
-      new DefinePlugin({
-        "process.env.FRAMEWORK_VERSION": JSON.stringify(frameworkVersion),
-      }),
-      new ModuleFederationPlugin({
-        name,
-        library: { type: "system", name },
-        filename,
-        exposes: {
-          app: srcFile,
-        },
-        shared: Object.keys(peerDependencies).reduce((obj, depName) => {
-          obj[depName] = {
-            requiredVersion: peerDependencies[depName],
-            singleton: true,
-            import: depName,
-            shareKey: depName,
-            shareScope: "default",
-          };
-          return obj;
-        }, {}),
-      }),
-      new StatsWriterPlugin({
-        filename: `${filename}.buildmanifest.json`,
-        stats: {
-          all: false,
-          chunks: true,
-        },
-      }),
-    ],
-    resolve: {
-      extensions: [".tsx", ".ts", ".jsx", ".js", ".scss"],
-    },
-    ...overrides,
-  };
-  return mergeWith(baseConfig, additionalConfig, mergeFunction);
-};
-
-function mergeFunction(objValue, srcValue) {
-  if (isArray(objValue)) {
-    return objValue.concat(srcValue);
-  }
-}
-
-/**
- * This object will be merged into the webpack config.
- * Array values will be concatenated with the existing array.
- * Make sure to modify this object and not reassign it.
- */
-module.exports.additionalConfig = additionalConfig;
-
-/**
- * The keys of this object will override the top-level keys
- * of the webpack config.
- * Make sure to modify this object and not reassign it.
- */
-module.exports.overrides = overrides;
-
-/**
- * This object will be merged into the webpack rule governing
- * the loading of JS, JSX, TS, etc. files.
- * Make sure to modify this object and not reassign it.
- */
-module.exports.scriptRuleConfig = scriptRuleConfig;
-
-/**
- * This object will be merged into the webpack rule governing
- * the loading of CSS files.
- * Make sure to modify this object and not reassign it.
- */
-module.exports.cssRuleConfig = cssRuleConfig;
-
-/**
- * This object will be merged into the webpack rule governing
- * the loading of SCSS files.
- * Make sure to modify this object and not reassign it.
- */
-module.exports.scssRuleConfig = scssRuleConfig;
-
-/**
- * This object will be merged into the webpack rule governing
- * the loading of static asset files.
- * Make sure to modify this object and not reassign it.
- */
-module.exports.assetRuleConfig = assetRuleConfig;
+module.exports = Object.assign(extendConfig, rest);

package/dist/utils/dependencies.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDependentModules = exports.getMainBundle = exports.getSharedDependencies = void 0;
+exports.getMainBundle = exports.getSharedDependencies = void 0;
 const path_1 = require("path");
 function getSharedDependencies() {
     return require("@openmrs/esm-app-shell/dependencies.json");
@@ -15,15 +15,3 @@ function getMainBundle(project) {
     };
 }
 exports.getMainBundle = getMainBundle;
-function getDependentModules(root, host, peerDependencies = {}, sharedDependencies = []) {
-    const appShellShared = [...getSharedDependencies(), ...sharedDependencies];
-    const mifeExpected = Object.keys(peerDependencies);
-    const mifeRequired = mifeExpected.filter((name) => !appShellShared.includes(name));
-    return mifeRequired.reduce((deps, moduleName) => {
-        const project = require(`${root}/node_modules/${moduleName}/package.json`);
-        const bundle = getMainBundle(project);
-        deps[moduleName] = `${host}/node_modules/${moduleName}/${bundle.path}`;
-        return deps;
-    }, {});
-}
-exports.getDependentModules = getDependentModules;

package/dist/utils/importmap.js

@@ -79,12 +79,10 @@ function matchAny(baseDir, patterns) {
     });
 }
 const defaultConfigPath = (0, path_1.resolve)(__dirname, "..", "..", "default-webpack-config.js");
-function runProjectWebpack(configPath, port, project, sharedDependencies, sourceDirectory, importMap) {
+function runProjectWebpack(configPath, port, project, sourceDirectory, importMap) {
     const bundle = (0, dependencies_1.getMainBundle)(project);
     const host = `http://localhost:${port}`;
-    const dependencies = (0, dependencies_1.getDependentModules)(process.cwd(), host, project.peerDependencies, sharedDependencies);
     (0, webpack_1.startWebpack)(configPath, port, sourceDirectory);
-    Object.assign(importMap, dependencies);
     importMap[project.name] = `${host}/${bundle.name}`;
 }
 function runProject(basePort, sharedDependencies, sourceDirectoryPatterns) {
@@ -120,11 +118,11 @@ function runProject(basePort, sharedDependencies, sourceDirectoryPatterns) {
             else if (!(0, fs_1.existsSync)(configPath)) {
                 // try to locate and run via default webpack
                 (0, logger_1.logWarn)(`No "webpack.config.json" found in directory "${sourceDirectory}". Trying to use default config ...`);
-                runProjectWebpack(defaultConfigPath, port, project, sharedDependencies, sourceDirectory, importMap);
+                runProjectWebpack(defaultConfigPath, port, project, sourceDirectory, importMap);
             }
             else {
                 // run via specialized webpack.config.js
-                runProjectWebpack(configPath, port, project, sharedDependencies, sourceDirectory, importMap);
+                runProjectWebpack(configPath, port, project, sourceDirectory, importMap);
             }
         }
         (0, logger_1.logInfo)(`Assembled dynamic import map (${Object.keys(importMap).join(", ")}).`);

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "openmrs",
-  "version": "3.2.1-pre.933",
+  "version": "3.2.1-pre.940",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": {
     "openmrs": "./dist/cli.js"
   },
+  "types": "src/index.ts",
   "engines": {
     "node": ">= 12.0.0"
   },
@@ -31,23 +32,16 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@babel/core": "^7.11.4",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/preset-typescript": "^7.10.4",
-    "@openmrs/esm-app-shell": "3.2.1-pre.933",
+    "@openmrs/esm-app-shell": "3.2.1-pre.940",
+    "@openmrs/webpack-config": "^3.2.1-pre.940",
     "@types/react": "^16.9.46",
     "@types/systemjs": "^6.1.0",
     "autoprefixer": "^10.4.2",
     "axios": "^0.21.1",
-    "babel-loader": "^8.2.2",
     "browserslist-config-openmrs": "^1.0.1",
-    "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^10.0.0",
-    "css-loader": "^5.2.4",
     "cssnano": "^5.0.16",
     "ejs": "^2.6.2",
-    "fork-ts-checker-webpack-plugin": "^6.5.0",
     "glob": "^7.1.3",
     "html-webpack-plugin": "^5.5.0",
     "inquirer": "^7.3.3",
@@ -55,19 +49,13 @@
     "postcss": "^8.4.6",
     "postcss-loader": "^6.2.1",
     "rimraf": "^3.0.2",
-    "sass": "^1.44.0",
-    "sass-loader": "^12.3.0",
-    "style-loader": "^3.3.1",
-    "systemjs-webpack-interop": "^2.3.7",
     "tar": "^6.0.5",
     "ts-loader": "^9.2.6",
     "typescript": "~4.5.2",
     "webpack": "^5.64.0",
-    "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.6.0",
     "webpack-pwa-manifest": "^4.3.0",
-    "webpack-stats-plugin": "^1.0.3",
     "workbox-webpack-plugin": "^6.4.1",
     "yargs": "16.0.3"
   },
@@ -79,5 +67,5 @@
     "@types/rimraf": "^2.0.2",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "1b80ed23aaf71ecd7744adaee5e0a885ed643683"
+  "gitHead": "91a29fc9adab5602ee21e570d9df4f98955c7811"
 }

package/src/utils/dependencies.ts

@@ -12,23 +12,3 @@ export function getMainBundle(project: any) {
     dir: dirname(file),
   };
 }
-
-export function getDependentModules(
-  root: string,
-  host: string,
-  peerDependencies: Record<string, string> = {},
-  sharedDependencies: Array<string> = []
-) {
-  const appShellShared = [...getSharedDependencies(), ...sharedDependencies];
-  const mifeExpected = Object.keys(peerDependencies);
-  const mifeRequired = mifeExpected.filter(
-    (name) => !appShellShared.includes(name)
-  );
-
-  return mifeRequired.reduce((deps, moduleName) => {
-    const project = require(`${root}/node_modules/${moduleName}/package.json`);
-    const bundle = getMainBundle(project);
-    deps[moduleName] = `${host}/node_modules/${moduleName}/${bundle.path}`;
-    return deps;
-  }, {});
-}

package/src/utils/importmap.ts

@@ -4,7 +4,7 @@ import { existsSync, readFileSync } from "fs";
 import { exec } from "child_process";
 import { logFail, logInfo, logWarn } from "./logger";
 import { startWebpack } from "./webpack";
-import { getDependentModules, getMainBundle } from "./dependencies";
+import { getMainBundle } from "./dependencies";
 import axios from "axios";
 
 import glob = require("glob");
@@ -89,21 +89,13 @@ function runProjectWebpack(
   configPath: string,
   port: number,
   project: any,
-  sharedDependencies: Array<string>,
   sourceDirectory: string,
   importMap: Record<string, string>
 ) {
   const bundle = getMainBundle(project);
   const host = `http://localhost:${port}`;
-  const dependencies = getDependentModules(
-    process.cwd(),
-    host,
-    project.peerDependencies,
-    sharedDependencies
-  );
 
   startWebpack(configPath, port, sourceDirectory);
-  Object.assign(importMap, dependencies);
   importMap[project.name] = `${host}/${bundle.name}`;
 }
 
@@ -156,20 +148,12 @@ export async function runProject(
         defaultConfigPath,
         port,
         project,
-        sharedDependencies,
         sourceDirectory,
         importMap
       );
     } else {
       // run via specialized webpack.config.js
-      runProjectWebpack(
-        configPath,
-        port,
-        project,
-        sharedDependencies,
-        sourceDirectory,
-        importMap
-      );
+      runProjectWebpack(configPath, port, project, sourceDirectory, importMap);
     }
   }