@openmrs/rspack-config 10.0.1-pre.5396 → 10.0.1-pre.5426

package/dist/index.js

@@ -433,28 +433,19 @@ exports.default = (env, argv = {}) => {
                     './start': srcFile,
                 },
                 shared: [...Object.keys(peerDependencies), '@openmrs/esm-framework/src/internal'].reduce((obj, depName) => {
-                    var _a, _b;
+                    var _a;
+                    const shareNames = [depName];
+                    // Also handle swr/immutable, etc.
                     if (depName === 'swr') {
-                        // SWR is annoying with Module Federation
-                        // See: https://github.com/webpack/webpack/issues/16125 and https://github.com/vercel/swr/issues/2356
-                        obj['swr/'] = {
-                            requiredVersion: (_a = peerDependencies['swr']) !== null && _a !== void 0 ? _a : false,
-                            strictVersion: false,
-                            singleton: true,
-                            import: 'swr/',
-                            shareKey: 'swr/',
-                            shareScope: 'default',
-                            // eslint-disable-next-line @typescript-eslint/no-require-imports
-                            version: require('swr/package.json').version,
-                        };
+                        shareNames.push('swr/');
                     }
-                    else {
-                        obj[depName] = {
-                            requiredVersion: (_b = peerDependencies[depName]) !== null && _b !== void 0 ? _b : false,
+                    for (const shareName of shareNames) {
+                        obj[shareName] = {
+                            requiredVersion: (_a = peerDependencies[depName]) !== null && _a !== void 0 ? _a : false,
                             strictVersion: false,
                             singleton: true,
-                            import: depName,
-                            shareKey: depName,
+                            import: shareName,
+                            shareKey: shareName,
                             shareScope: 'default',
                         };
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/rspack-config",
-  "version": "10.0.1-pre.5396",
+  "version": "10.0.1-pre.5426",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -32,7 +32,7 @@
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
     "@module-federation/enhanced": "2.8.1",
-    "@openmrs/carbon-css-guard": "10.0.1-pre.5396",
+    "@openmrs/carbon-css-guard": "10.0.1-pre.5426",
     "@rspack/cli": "1.7.9",
     "@rspack/core": "1.7.9",
     "@swc/core": "1.15.21",

package/src/index.ts

@@ -488,26 +488,20 @@ export default (env: Record<string, string>, argv: Record<string, string> = {})
           './start': srcFile,
         },
         shared: [...Object.keys(peerDependencies), '@openmrs/esm-framework/src/internal'].reduce((obj, depName) => {
+          const shareNames = [depName];
+
+          // Also handle swr/immutable, etc.
           if (depName === 'swr') {
-            // SWR is annoying with Module Federation
-            // See: https://github.com/webpack/webpack/issues/16125 and https://github.com/vercel/swr/issues/2356
-            obj['swr/'] = {
-              requiredVersion: peerDependencies['swr'] ?? false,
-              strictVersion: false,
-              singleton: true,
-              import: 'swr/',
-              shareKey: 'swr/',
-              shareScope: 'default',
-              // eslint-disable-next-line @typescript-eslint/no-require-imports
-              version: require('swr/package.json').version,
-            };
-          } else {
-            obj[depName] = {
+            shareNames.push('swr/');
+          }
+
+          for (const shareName of shareNames) {
+            obj[shareName] = {
               requiredVersion: peerDependencies[depName] ?? false,
               strictVersion: false,
               singleton: true,
-              import: depName,
-              shareKey: depName,
+              import: shareName,
+              shareKey: shareName,
               shareScope: 'default',
             };
           }