@redhat-cloud-services/frontend-components-config-utilities 4.12.9 → 4.13.1

package/federated-modules.d.ts

@@ -19,10 +19,13 @@ export type FederatedModulesConfig = {
     useFileHash?: boolean;
     separateRuntime?: boolean;
     exclude?: string[];
+    bundleChromeShared?: boolean;
     eager?: boolean;
     pluginMetadata?: PluginBuildMetadata;
     extensions?: EncodedExtension[];
 };
+export declare const bundleChromeSharedLocally: (root: string, sharedModules?: Record<string, WebpackSharedConfig>) => Record<string, WebpackSharedConfig>;
+export declare const omitHostConsumedShared: (sharedModules?: Record<string, WebpackSharedConfig>) => Record<string, WebpackSharedConfig>;
 export declare const createSharedDeps: (include: {
     [module: string]: WebpackSharedConfig;
 }, dependencies: {
@@ -32,5 +35,5 @@ export declare const createSharedDeps: (include: {
 };
 export declare const applyImpliedDeps: (sharedDeps: Record<string, WebpackSharedConfig>, include: Record<string, WebpackSharedConfig>, dependencies: Record<string, string>, impliedDeps: Record<string, string[]>) => Record<string, WebpackSharedConfig>;
 export declare const mergeSharedDeps: (sharedDeps: Record<string, WebpackSharedConfig>, shared: Record<string, WebpackSharedConfig>[], chromeProvided: Record<string, WebpackSharedConfig>, logger?: typeof fecLogger) => Record<string, WebpackSharedConfig>;
-declare const federatedModules: ({ root, dependencies: depsProp, exposes, shared, debug, moduleName, useFileHash, separateRuntime, exclude, pluginMetadata, extensions, }: FederatedModulesConfig) => DynamicRemotePlugin;
+declare const federatedModules: ({ root, dependencies: depsProp, exposes, shared, debug, moduleName, useFileHash, separateRuntime, exclude, bundleChromeShared, pluginMetadata, extensions, }: FederatedModulesConfig) => DynamicRemotePlugin;
 export default federatedModules;

package/federated-modules.js

@@ -47,11 +47,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeSharedDeps = exports.applyImpliedDeps = exports.createSharedDeps = exports.createIncludes = void 0;
+exports.mergeSharedDeps = exports.applyImpliedDeps = exports.createSharedDeps = exports.omitHostConsumedShared = exports.bundleChromeSharedLocally = exports.createIncludes = void 0;
 var path_1 = require("path");
 var dynamic_plugin_sdk_webpack_1 = require("@openshift/dynamic-plugin-sdk-webpack");
 var jsVarName_1 = __importDefault(require("./jsVarName"));
 var fec_logger_1 = __importStar(require("./fec-logger"));
+var resolve_shared_import_1 = require("./resolve-shared-import");
 var defaultPluginMetaDataJSON = {
     version: '1.0.0',
     extensions: [],
@@ -80,6 +81,32 @@ var createIncludes = function () { return ({
     },
 }); };
 exports.createIncludes = createIncludes;
+var bundleChromeSharedLocally = function (root, sharedModules) {
+    if (sharedModules === void 0) { sharedModules = {}; }
+    return Object.fromEntries(Object.entries(sharedModules).map(function (_a) {
+        var moduleName = _a[0], config = _a[1];
+        if (config.import !== false) {
+            return [moduleName, config];
+        }
+        var importPath = (0, resolve_shared_import_1.resolveSharedImportPath)(root, moduleName);
+        if (!importPath) {
+            return [moduleName, config];
+        }
+        return [
+            moduleName,
+            __assign(__assign({}, config), { eager: true, import: importPath }),
+        ];
+    }));
+};
+exports.bundleChromeSharedLocally = bundleChromeSharedLocally;
+var omitHostConsumedShared = function (sharedModules) {
+    if (sharedModules === void 0) { sharedModules = {}; }
+    return Object.fromEntries(Object.entries(sharedModules).filter(function (_a) {
+        var config = _a[1];
+        return typeof config.import === 'string';
+    }));
+};
+exports.omitHostConsumedShared = omitHostConsumedShared;
 var getRootPackage = function (key) {
     if (key.startsWith('@')) {
         return key.split('/').slice(0, 2).join('/');
@@ -149,15 +176,18 @@ function hasVersionSpecified(config) {
     return Object.values(config).every(function (c) { return typeof c.version === 'string'; });
 }
 var federatedModules = function (_a) {
-    var root = _a.root, depsProp = _a.dependencies, exposes = _a.exposes, _b = _a.shared, shared = _b === void 0 ? [] : _b, debug = _a.debug, moduleName = _a.moduleName, _c = _a.useFileHash, useFileHash = _c === void 0 ? true : _c, _d = _a.separateRuntime, separateRuntime = _d === void 0 ? false : _d, _e = _a.exclude, exclude = _e === void 0 ? [] : _e, pluginMetadata = _a.pluginMetadata, _f = _a.extensions, extensions = _f === void 0 ? [] : _f;
-    var _g = (0, exports.createIncludes)(), chromeProvided = _g.chromeProvided, defaultShared = _g.defaultShared, impliedDeps = _g.impliedDeps;
+    var root = _a.root, depsProp = _a.dependencies, exposes = _a.exposes, _b = _a.shared, shared = _b === void 0 ? [] : _b, debug = _a.debug, moduleName = _a.moduleName, _c = _a.useFileHash, useFileHash = _c === void 0 ? true : _c, _d = _a.separateRuntime, separateRuntime = _d === void 0 ? false : _d, _e = _a.exclude, exclude = _e === void 0 ? [] : _e, _f = _a.bundleChromeShared, bundleChromeShared = _f === void 0 ? false : _f, pluginMetadata = _a.pluginMetadata, _g = _a.extensions, extensions = _g === void 0 ? [] : _g;
+    var _h = (0, exports.createIncludes)(), chromeProvided = _h.chromeProvided, defaultShared = _h.defaultShared, impliedDeps = _h.impliedDeps;
     var include = __assign(__assign({}, chromeProvided), defaultShared);
-    var _h = depsProp ? { dependencies: depsProp, insights: undefined } : require((0, path_1.resolve)(root, './package.json')) || {}, _j = _h.dependencies, dependencies = _j === void 0 ? {} : _j, insights = _h.insights;
+    var _j = depsProp ? { dependencies: depsProp, insights: undefined } : require((0, path_1.resolve)(root, './package.json')) || {}, _k = _j.dependencies, dependencies = _k === void 0 ? {} : _k, insights = _j.insights;
     var appName = moduleName || (insights && (0, jsVarName_1.default)(insights.appname));
     var filename = "".concat(appName, ".").concat(useFileHash ? "[contenthash]." : '', "js");
     var sharedDeps = __assign(__assign({}, (0, exports.createSharedDeps)(chromeProvided, dependencies, [])), (0, exports.createSharedDeps)(defaultShared, dependencies, exclude));
     sharedDeps = (0, exports.applyImpliedDeps)(sharedDeps, include, dependencies, impliedDeps);
     sharedDeps = (0, exports.mergeSharedDeps)(sharedDeps, shared, chromeProvided);
+    if (bundleChromeShared) {
+        sharedDeps = (0, exports.omitHostConsumedShared)((0, exports.bundleChromeSharedLocally)(root, sharedDeps));
+    }
     if (debug) {
         console.log('Using package at path: ', (0, path_1.resolve)(root, './package.json'));
         console.log('Using appName: ', appName);
@@ -167,6 +197,9 @@ var federatedModules = function (_a) {
         if (exclude.length > 0) {
             console.log('Excluding default packages', exclude);
         }
+        if (bundleChromeShared) {
+            console.log('Bundling chrome-provided shared modules from local node_modules');
+        }
     }
     if (!exposes) {
         (0, fec_logger_1.default)(fec_logger_1.LogType.warn, 'No exposed modules provided! Falling back to ./src/AppEntry as "./RootApp"');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redhat-cloud-services/frontend-components-config-utilities",
-  "version": "4.12.9",
+  "version": "4.13.1",
   "description": "Utilities for shared config used in Red Hat Cloud Services project.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -21,7 +21,7 @@
     "build": "tsc"
   },
   "peerDependencies": {
-    "webpack": "^5.110.3"
+    "webpack": "^5.111.1"
   },
   "dependencies": {
     "@openshift/dynamic-plugin-sdk-webpack": "^4.1.0",

package/resolve-shared-import.d.ts

@@ -0,0 +1 @@
+export declare const resolveSharedImportPath: (root: string, moduleName: string) => string | null;

package/resolve-shared-import.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSharedImportPath = void 0;
+var path_1 = require("path");
+var resolveSharedImportPath = function (root, moduleName) {
+    try {
+        return require.resolve(moduleName, { paths: [(0, path_1.resolve)(root)] });
+    }
+    catch (_a) {
+        return null;
+    }
+};
+exports.resolveSharedImportPath = resolveSharedImportPath;
+//# sourceMappingURL=resolve-shared-import.js.map