@openmrs/webpack-config 4.5.1-pre.804 → 5.0.0

package/.turbo/turbo-build.log

@@ -1 +1 @@
-@openmrs/webpack-config:build: cache hit, replaying output fba85ea1a567cc43
+@openmrs/webpack-config:build: cache hit, replaying output c164cc055b2a0549

package/dist/index.js

@@ -45,12 +45,13 @@ exports.watchConfig = exports.assetRuleConfig = exports.scssRuleConfig = exports
 const fork_ts_checker_webpack_plugin_1 = __importDefault(require("fork-ts-checker-webpack-plugin"));
 const path_1 = require("path");
 const clean_webpack_plugin_1 = require("clean-webpack-plugin");
+const copy_webpack_plugin_1 = __importDefault(require("copy-webpack-plugin"));
 const webpack_1 = require("webpack");
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const webpack_stats_plugin_1 = require("webpack-stats-plugin");
 // eslint-disable-next-line no-restricted-imports
 const lodash_1 = require("lodash");
-const optimize_1 = require("./optimize");
+const fs_1 = require("fs");
 const semver_1 = require("semver");
 const production = "production";
 const { ModuleFederationPlugin } = webpack_1.container;
@@ -80,6 +81,9 @@ function mergeFunction(objValue, srcValue) {
 function slugify(name) {
     return name.replace(/[\/\-@]/g, "_");
 }
+function fileExistsSync(name) {
+    return (0, fs_1.existsSync)(name) && (0, fs_1.statSync)(name).isFile();
+}
 /**
  * This object will be merged into the webpack config.
  * Array values will be concatenated with the existing array.
@@ -131,6 +135,14 @@ exports.default = (env, argv = {}) => {
     const srcFile = (0, path_1.resolve)(root, browser ? main : types);
     const ident = makeIdent(name);
     const frameworkVersion = getFrameworkVersion();
+    const routes = (0, path_1.resolve)(root, "src", "routes.json");
+    const hasRoutesDefined = fileExistsSync(routes);
+    if (!hasRoutesDefined) {
+        console.error("This app does not define a routes.json. This file is required for this app to be used by the OpenMRS 3 App Shell.");
+        // key-smash error code
+        // so this (hopefully) doesn't interfere with Webpack-specific exit codes
+        process.exit(9819023573289);
+    }
     const cssLoader = {
         loader: "css-loader",
         options: {
@@ -154,7 +166,7 @@ exports.default = (env, argv = {}) => {
                     test: /\.m?(js|ts|tsx)$/,
                     exclude: /(node_modules|bower_components)/,
                     use: {
-                        loader: require.resolve("swc-loader"),
+                        loader: "@swc-node/loader",
                     },
                 }, exports.scriptRuleConfig),
                 (0, lodash_1.merge)({
@@ -177,7 +189,7 @@ exports.default = (env, argv = {}) => {
                     type: "asset/resource",
                 }, exports.assetRuleConfig),
             ],
-        }, mode, devtool: mode === production ? "hidden-nosources-source-map" : "eval-source-map", devServer: {
+        }, mode, devtool: mode === production ? "hidden-nosources-source-map" : "source-map", devServer: {
             headers: {
                 "Access-Control-Allow-Origin": "*",
             },
@@ -196,9 +208,6 @@ exports.default = (env, argv = {}) => {
                 analyzerMode: env && env.analyze ? "server" : "disabled",
             }),
             new webpack_1.DefinePlugin({
-                __VERSION__: mode === production
-                    ? JSON.stringify(version)
-                    : JSON.stringify((0, semver_1.inc)(version, "prerelease", "local")),
                 "process.env.FRAMEWORK_VERSION": JSON.stringify(frameworkVersion),
             }),
             new ModuleFederationPlugin({
@@ -225,6 +234,21 @@ exports.default = (env, argv = {}) => {
                     return obj;
                 }, {}),
             }),
+            hasRoutesDefined &&
+                new copy_webpack_plugin_1.default({
+                    patterns: [
+                        {
+                            from: routes,
+                            transform: {
+                                transformer: (content) => JSON.stringify(Object.assign({}, JSON.parse(content.toString()), {
+                                    version: mode === production
+                                        ? version
+                                        : (0, semver_1.inc)(version, "prerelease", "local"),
+                                })),
+                            },
+                        },
+                    ],
+                }),
             new webpack_stats_plugin_1.StatsWriterPlugin({
                 filename: `${filename}.buildmanifest.json`,
                 stats: {
@@ -232,19 +256,8 @@ exports.default = (env, argv = {}) => {
                     chunks: true,
                 },
             }),
-            {
-                apply(compiler) {
-                    compiler.hooks.afterEmit.tap("PostProcessPlugin", (compilation) => {
-                        if (mode === "production") {
-                            // only post-optimize the bundle in production mode
-                            const fn = (0, path_1.resolve)(root, outDir, filename);
-                            (0, optimize_1.postProcessFile)(fn);
-                        }
-                    });
-                },
-            },
-        ], resolve: {
-            extensions: [".tsx", ".ts", ".jsx", ".js", ".scss"],
+        ].filter(Boolean), resolve: {
+            extensions: [".tsx", ".ts", ".jsx", ".js", ".scss", ".json"],
             alias: {
                 "@openmrs/esm-framework": "@openmrs/esm-framework/src/internal",
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/webpack-config",
-  "version": "4.5.1-pre.804",
+  "version": "5.0.0",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -10,6 +10,7 @@
   "scripts": {
     "test": "jest --passWithNoTests",
     "build": "tsc",
+    "build:development": "tsc",
     "lint": "eslint src --ext ts,tsx"
   },
   "repository": {
@@ -30,20 +31,18 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@babel/core": "^7.17.9",
-    "@babel/types": "^7.17.0",
-    "@swc/core": "^1.2.165",
+    "@swc-node/loader": "^1.3.5",
+    "@swc/core": "^1.3.58",
     "babel-preset-minify": "^0.5.1",
     "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.4",
     "fork-ts-checker-webpack-plugin": "^6.5.0",
     "lodash": "^4.17.21",
     "sass": "^1.44.0",
     "sass-loader": "^12.3.0",
     "style-loader": "^3.3.1",
-    "swc-loader": "^0.1.15",
-    "systemjs-webpack-interop": "^2.3.7",
-    "webpack": "^5.75.0",
+    "webpack": "^5.86.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-stats-plugin": "^1.0.3"
   },
@@ -51,7 +50,7 @@
     "webpack": "5.x"
   },
   "devDependencies": {
-    "typescript": "~4.5.2"
+    "typescript": "^4.6.4"
   },
-  "gitHead": "3494e50fe502dc6411ce27014322dc87386d78f2"
+  "gitHead": "2de5bf392a036e12c6d48425ff61881be7e32344"
 }

package/src/index.ts

@@ -39,12 +39,13 @@
 import ForkTsCheckerWebpackPlugin from "fork-ts-checker-webpack-plugin";
 import { resolve, dirname, basename } from "path";
 import { CleanWebpackPlugin } from "clean-webpack-plugin";
+import CopyWebpackPlugin from "copy-webpack-plugin";
 import { DefinePlugin, container } from "webpack";
 import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
 import { StatsWriterPlugin } from "webpack-stats-plugin";
 // eslint-disable-next-line no-restricted-imports
 import { merge, mergeWith, isArray } from "lodash";
-import { postProcessFile } from "./optimize";
+import { existsSync, statSync } from "fs";
 import { inc } from "semver";
 
 const production = "production";
@@ -77,10 +78,14 @@ function mergeFunction(objValue: any, srcValue: any) {
   }
 }
 
-function slugify(name) {
+function slugify(name: string) {
   return name.replace(/[\/\-@]/g, "_");
 }
 
+function fileExistsSync(name: string) {
+  return existsSync(name) && statSync(name).isFile();
+}
+
 /**
  * This object will be merged into the webpack config.
  * Array values will be concatenated with the existing array.
@@ -149,6 +154,17 @@ export default (
   const srcFile = resolve(root, browser ? main : types);
   const ident = makeIdent(name);
   const frameworkVersion = getFrameworkVersion();
+  const routes = resolve(root, "src", "routes.json");
+  const hasRoutesDefined = fileExistsSync(routes);
+
+  if (!hasRoutesDefined) {
+    console.error(
+      "This app does not define a routes.json. This file is required for this app to be used by the OpenMRS 3 App Shell."
+    );
+    // key-smash error code
+    // so this (hopefully) doesn't interfere with Webpack-specific exit codes
+    process.exit(9819023573289);
+  }
 
   const cssLoader = {
     loader: "css-loader",
@@ -176,7 +192,7 @@ export default (
             test: /\.m?(js|ts|tsx)$/,
             exclude: /(node_modules|bower_components)/,
             use: {
-              loader: require.resolve("swc-loader"),
+              loader: "@swc-node/loader",
             },
           },
           scriptRuleConfig
@@ -212,8 +228,7 @@ export default (
       ],
     },
     mode,
-    devtool:
-      mode === production ? "hidden-nosources-source-map" : "eval-source-map",
+    devtool: mode === production ? "hidden-nosources-source-map" : "source-map",
     devServer: {
       headers: {
         "Access-Control-Allow-Origin": "*",
@@ -239,10 +254,6 @@ export default (
         analyzerMode: env && env.analyze ? "server" : "disabled",
       }),
       new DefinePlugin({
-        __VERSION__:
-          mode === production
-            ? JSON.stringify(version)
-            : JSON.stringify(inc(version, "prerelease", "local")),
         "process.env.FRAMEWORK_VERSION": JSON.stringify(frameworkVersion),
       }),
       new ModuleFederationPlugin({
@@ -268,6 +279,25 @@ export default (
           return obj;
         }, {}),
       }),
+      hasRoutesDefined &&
+        new CopyWebpackPlugin({
+          patterns: [
+            {
+              from: routes,
+              transform: {
+                transformer: (content) =>
+                  JSON.stringify(
+                    Object.assign({}, JSON.parse(content.toString()), {
+                      version:
+                        mode === production
+                          ? version
+                          : inc(version, "prerelease", "local"),
+                    })
+                  ),
+              },
+            },
+          ],
+        }),
       new StatsWriterPlugin({
         filename: `${filename}.buildmanifest.json`,
         stats: {
@@ -275,20 +305,9 @@ export default (
           chunks: true,
         },
       }),
-      {
-        apply(compiler) {
-          compiler.hooks.afterEmit.tap("PostProcessPlugin", (compilation) => {
-            if (mode === "production") {
-              // only post-optimize the bundle in production mode
-              const fn = resolve(root, outDir, filename);
-              postProcessFile(fn);
-            }
-          });
-        },
-      },
-    ],
+    ].filter(Boolean),
     resolve: {
-      extensions: [".tsx", ".ts", ".jsx", ".js", ".scss"],
+      extensions: [".tsx", ".ts", ".jsx", ".js", ".scss", ".json"],
       alias: {
         "@openmrs/esm-framework": "@openmrs/esm-framework/src/internal",
       },

package/.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": ["@babel/preset-typescript"]
-}

package/dist/optimize.js

@@ -1,146 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.postProcessFile = exports.transformFile = void 0;
-const types = __importStar(require("@babel/types"));
-const core_1 = require("@babel/core");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const exportedSetupFunctionName = "setupOpenMRS";
-const assetsPropertyName = "assets";
-const loaderName = "_$load";
-function isUnique(current, index, arr) {
-    return arr.indexOf(current) === index;
-}
-function getFiles(manifest) {
-    const files = [];
-    manifest.chunks.forEach((chunk) => {
-        files.push(...chunk.files);
-    });
-    return files.filter(isUnique);
-}
-function getChunkId(arg) {
-    if (types.isNumericLiteral(arg)) {
-        // e.g., t.e(307).then(...)
-        return arg.value;
-    }
-    else if (types.isArrayExpression(arg)) {
-        // e.g., Promise.all([t.e(983),t.e(307)]).then(...)
-        const last = arg.elements[arg.elements.length - 1];
-        if (types.isCallExpression(last)) {
-            const lastArg = last.arguments[0];
-            if (types.isNumericLiteral(lastArg)) {
-                return lastArg.value;
-            }
-        }
-    }
-    return 0;
-}
-function extendEntryFile(root, chunkId, allFiles) {
-    var _a, _b;
-    const chunkName = `${chunkId}.js`;
-    const filename = (0, path_1.resolve)(root, chunkName);
-    const code = (0, fs_1.readFileSync)(filename, "utf8");
-    const result = (0, core_1.transformSync)(code, {
-        ast: true,
-        filename,
-        sourceType: "script",
-        plugins: [
-            () => ({
-                visitor: {
-                    Property(path) {
-                        if (path.node.key.name === exportedSetupFunctionName) {
-                            path.insertAfter(types.objectProperty(types.identifier(assetsPropertyName), types.arrowFunctionExpression([], types.arrayExpression(allFiles
-                                .filter((file) => file !== chunkName)
-                                .map((file) => types.stringLiteral(file))))));
-                        }
-                    },
-                },
-            }),
-        ],
-    });
-    return (_b = (_a = result === null || result === void 0 ? void 0 : result.ast) === null || _a === void 0 ? void 0 : _a.program.body) !== null && _b !== void 0 ? _b : [];
-}
-function transformFile(filename) {
-    var _a;
-    const root = (0, path_1.dirname)(filename);
-    const manifest = require(`${filename}.buildmanifest.json`);
-    const files = getFiles(manifest);
-    const code = (0, fs_1.readFileSync)(filename, "utf8");
-    const result = (0, core_1.transformSync)(code, {
-        filename,
-        sourceType: "script",
-        presets: ["minify"],
-        plugins: [
-            () => ({
-                visitor: {
-                    Property(path) {
-                        if (path.node.key.name === "app") {
-                            const body = path.get("value.body");
-                            if (types.isExpression(body.node)) {
-                                const statements = [
-                                    types.expressionStatement(types.assignmentExpression("=", types.identifier(loaderName), body.node)),
-                                ];
-                                if (types.isMemberExpression(body.node.callee) &&
-                                    types.isCallExpression(body.node.callee.object) &&
-                                    types.isMemberExpression(body.node.callee.object.callee)) {
-                                    const arg = body.node.callee.object.arguments[0];
-                                    const chunkId = getChunkId(arg);
-                                    statements.unshift(...extendEntryFile(root, chunkId, files));
-                                }
-                                body.replaceWith(types.blockStatement([
-                                    types.ifStatement(types.unaryExpression("!", types.identifier(loaderName)), types.blockStatement(statements)),
-                                    types.returnStatement(types.identifier(loaderName)),
-                                ]));
-                            }
-                        }
-                    },
-                    CallExpression(path) {
-                        const node = path.node;
-                        if (types.isMemberExpression(node.callee) &&
-                            types.isIdentifier(node.callee.object, { name: "System" }) &&
-                            types.isIdentifier(node.callee.property, {
-                                name: "register",
-                            }) &&
-                            node.arguments.length === 3 &&
-                            types.isFunctionExpression(node.arguments[2])) {
-                            path
-                                .get("arguments.2.body")
-                                .unshiftContainer("body", types.variableDeclaration("var", [
-                                types.variableDeclarator(types.identifier(loaderName), types.identifier("undefined")),
-                            ]));
-                        }
-                    },
-                },
-            }),
-        ],
-    });
-    return [(_a = result === null || result === void 0 ? void 0 : result.code) === null || _a === void 0 ? void 0 : _a.split('"use strict";').join(""), code];
-}
-exports.transformFile = transformFile;
-function postProcessFile(fn) {
-    const [result, original] = transformFile(fn);
-    if (result && original) {
-        (0, fs_1.writeFileSync)(fn.replace(".js", ".old"), original, "utf8");
-        (0, fs_1.writeFileSync)(fn.replace(".js", ".js"), result, "utf8");
-    }
-}
-exports.postProcessFile = postProcessFile;

package/src/optimize.ts

@@ -1,173 +0,0 @@
-import * as types from "@babel/types";
-import { transformSync, Node } from "@babel/core";
-import { readFileSync, writeFileSync } from "fs";
-import { resolve, dirname } from "path";
-
-const exportedSetupFunctionName = "setupOpenMRS";
-const assetsPropertyName = "assets";
-const loaderName = "_$load";
-
-function isUnique(current: string, index: number, arr: Array<string>) {
-  return arr.indexOf(current) === index;
-}
-
-function getFiles(manifest: { chunks: Array<{ files: Array<string> }> }) {
-  const files: Array<string> = [];
-
-  manifest.chunks.forEach((chunk) => {
-    files.push(...chunk.files);
-  });
-
-  return files.filter(isUnique);
-}
-
-function getChunkId(arg: Node): number {
-  if (types.isNumericLiteral(arg)) {
-    // e.g., t.e(307).then(...)
-    return arg.value;
-  } else if (types.isArrayExpression(arg)) {
-    // e.g., Promise.all([t.e(983),t.e(307)]).then(...)
-    const last = arg.elements[arg.elements.length - 1];
-
-    if (types.isCallExpression(last)) {
-      const lastArg = last.arguments[0];
-
-      if (types.isNumericLiteral(lastArg)) {
-        return lastArg.value;
-      }
-    }
-  }
-
-  return 0;
-}
-
-function extendEntryFile(
-  root: string,
-  chunkId: number,
-  allFiles: Array<string>
-) {
-  const chunkName = `${chunkId}.js`;
-  const filename = resolve(root, chunkName);
-  const code = readFileSync(filename, "utf8");
-  const result = transformSync(code, {
-    ast: true,
-    filename,
-    sourceType: "script",
-    plugins: [
-      () => ({
-        visitor: {
-          Property(path) {
-            if (path.node.key.name === exportedSetupFunctionName) {
-              path.insertAfter(
-                types.objectProperty(
-                  types.identifier(assetsPropertyName),
-                  types.arrowFunctionExpression(
-                    [],
-                    types.arrayExpression(
-                      allFiles
-                        .filter((file) => file !== chunkName)
-                        .map((file) => types.stringLiteral(file))
-                    )
-                  )
-                )
-              );
-            }
-          },
-        },
-      }),
-    ],
-  });
-  return result?.ast?.program.body ?? [];
-}
-
-export function transformFile(filename: string) {
-  const root = dirname(filename);
-  const manifest = require(`${filename}.buildmanifest.json`);
-  const files = getFiles(manifest);
-  const code = readFileSync(filename, "utf8");
-  const result = transformSync(code, {
-    filename,
-    sourceType: "script",
-    presets: ["minify"],
-    plugins: [
-      () => ({
-        visitor: {
-          Property(path) {
-            if (path.node.key.name === "app") {
-              const body = path.get("value.body");
-
-              if (types.isExpression(body.node)) {
-                const statements: Array<types.Statement> = [
-                  types.expressionStatement(
-                    types.assignmentExpression(
-                      "=",
-                      types.identifier(loaderName),
-                      body.node
-                    )
-                  ),
-                ];
-
-                if (
-                  types.isMemberExpression(body.node.callee) &&
-                  types.isCallExpression(body.node.callee.object) &&
-                  types.isMemberExpression(body.node.callee.object.callee)
-                ) {
-                  const arg = body.node.callee.object.arguments[0];
-                  const chunkId = getChunkId(arg);
-
-                  statements.unshift(...extendEntryFile(root, chunkId, files));
-                }
-
-                body.replaceWith(
-                  types.blockStatement([
-                    types.ifStatement(
-                      types.unaryExpression("!", types.identifier(loaderName)),
-                      types.blockStatement(statements)
-                    ),
-                    types.returnStatement(types.identifier(loaderName)),
-                  ])
-                );
-              }
-            }
-          },
-          CallExpression(path) {
-            const node = path.node;
-
-            if (
-              types.isMemberExpression(node.callee) &&
-              types.isIdentifier(node.callee.object, { name: "System" }) &&
-              types.isIdentifier(node.callee.property, {
-                name: "register",
-              }) &&
-              node.arguments.length === 3 &&
-              types.isFunctionExpression(node.arguments[2])
-            ) {
-              path
-                .get("arguments.2.body")
-                .unshiftContainer(
-                  "body",
-                  types.variableDeclaration("var", [
-                    types.variableDeclarator(
-                      types.identifier(loaderName),
-                      types.identifier("undefined")
-                    ),
-                  ])
-                );
-            }
-          },
-        },
-      }),
-    ],
-  });
-
-  return [result?.code?.split('"use strict";').join(""), code];
-}
-
-export function postProcessFile(fn: string) {
-  const [result, original] = transformFile(fn);
-
-  if (result && original) {
-    writeFileSync(fn.replace(".js", ".old"), original, "utf8");
-    writeFileSync(fn.replace(".js", ".js"), result, "utf8");
-  }
-}