@module-federation/data-prefetch 1.0.16 → 2.0.1

package/dist/universal/index.js

@@ -1,204 +1,32 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+import { MFDataPrefetch } from "../prefetch.js";
+import { getScope } from "../common/runtime-utils.js";
 
-// src/universal/index.ts
-var universal_exports = {};
-__export(universal_exports, {
-  prefetch: () => prefetch
-});
-module.exports = __toCommonJS(universal_exports);
+;// CONCATENATED MODULE: external "../prefetch.js"
 
-// src/prefetch.ts
-var import_runtime2 = require("@module-federation/runtime");
-var import_sdk2 = require("@module-federation/sdk");
+;// CONCATENATED MODULE: external "../common/runtime-utils.js"
 
-// src/common/runtime-utils.ts
-var import_runtime = require("@module-federation/runtime");
-var import_sdk = require("@module-federation/sdk");
-var getScope = () => {
-  return (0, import_runtime.getInstance)().options.name;
-};
-var getPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/${import_sdk.MFPrefetchCommon.identifier}`);
-var compatGetPrefetchId = (id) => (0, import_sdk.encodeName)(`${id}/VmokPrefetch`);
+;// CONCATENATED MODULE: ./src/universal/index.ts
 
-// src/prefetch.ts
-globalThis.__FEDERATION__ ?? (globalThis.__FEDERATION__ = {});
-var _a;
-(_a = globalThis.__FEDERATION__).__PREFETCH__ ?? (_a.__PREFETCH__ = {
-  entryLoading: {},
-  instance: /* @__PURE__ */ new Map(),
-  __PREFETCH_EXPORTS__: {}
-});
-var MFDataPrefetch = class {
-  constructor(options) {
-    this.prefetchMemory = /* @__PURE__ */ new Map();
-    this.recordOutdate = {};
-    this._exports = {};
-    this._options = options;
-    this.global.instance.set(options.name, this);
-  }
-  get global() {
-    return globalThis.__FEDERATION__.__PREFETCH__;
-  }
-  static getInstance(id) {
-    return globalThis.__FEDERATION__.__PREFETCH__.instance.get(id);
-  }
-  async loadEntry(entry) {
-    const { name, remoteSnapshot, remote, origin } = this._options;
-    if (entry) {
-      const { buildVersion, globalName } = remoteSnapshot;
-      const uniqueKey = globalName || `${name}:${buildVersion}`;
-      if (!this.global.entryLoading[uniqueKey]) {
-        this.global.entryLoading[uniqueKey] = (0, import_sdk2.loadScript)(entry, {});
-      }
-      return this.global.entryLoading[uniqueKey];
-    } else {
-      const remoteInfo = (0, import_runtime2.getRemoteInfo)(remote);
-      const module2 = origin.moduleCache.get(remoteInfo.name);
-      return (0, import_runtime2.getRemoteEntry)({
-        origin,
-        remoteInfo,
-        remoteEntryExports: module2 ? module2.remoteEntryExports : void 0
-      });
-    }
-  }
-  getProjectExports() {
-    var _a2;
-    if (Object.keys(this._exports).length > 0) {
-      return this._exports;
-    }
-    const { name } = this._options;
-    const exportsPromise = (_a2 = globalThis.__FEDERATION__.__PREFETCH__.__PREFETCH_EXPORTS__) == null ? void 0 : _a2[name];
-    const resolve = exportsPromise.then(
-      (exports = {}) => {
-        const memory = {};
-        Object.keys(exports).forEach((key) => {
-          memory[key] = {};
-          const exportVal = exports[key];
-          Object.keys(exportVal).reduce(
-            (memo, current) => {
-              if (current.toLocaleLowerCase().endsWith("prefetch") || current.toLocaleLowerCase() === "default") {
-                memo[current] = exportVal[current];
-              }
-              return memo;
-            },
-            memory[key]
-          );
-        });
-        this.memorizeExports(memory);
-      }
-    );
-    return resolve;
-  }
-  memorizeExports(exports) {
-    this._exports = exports;
-  }
-  getExposeExports(id) {
-    const prefetchId = getPrefetchId(id);
-    const compatId = compatGetPrefetchId(id);
-    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
-    return prefetchExports || {};
-  }
-  prefetch(prefetchOptions) {
-    const { id, functionId = "default", refetchParams } = prefetchOptions;
-    let prefetchResult;
-    const prefetchId = getPrefetchId(id);
-    const compatId = compatGetPrefetchId(id);
-    const memorizeId = id + functionId;
-    const memory = this.prefetchMemory.get(memorizeId);
-    if (!this.checkOutdate(prefetchOptions) && memory) {
-      return memory;
-    }
-    const prefetchExports = this._exports[prefetchId] || this._exports[compatId];
-    if (!prefetchExports) {
-      return;
-    }
-    const executePrefetch = prefetchExports[functionId];
-    if (typeof executePrefetch === "function") {
-      if (refetchParams) {
-        prefetchResult = executePrefetch(refetchParams);
-      } else {
-        prefetchResult = executePrefetch();
-      }
-    } else {
-      throw new Error(
-        `[Module Federation Data Prefetch]: No prefetch function called ${functionId} export in prefetch file`
-      );
-    }
-    this.memorize(memorizeId, prefetchResult);
-    return prefetchResult;
-  }
-  memorize(id, value) {
-    this.prefetchMemory.set(id, value);
-  }
-  markOutdate(markOptions, isOutdate) {
-    const { id, functionId = "default" } = markOptions;
-    if (!this.recordOutdate[id]) {
-      this.recordOutdate[id] = {};
-    }
-    this.recordOutdate[id][functionId] = isOutdate;
-  }
-  checkOutdate(outdateOptions) {
-    const { id, functionId = "default", cacheStrategy } = outdateOptions;
-    if (typeof cacheStrategy === "function") {
-      return cacheStrategy();
-    }
-    if (!this.recordOutdate[id]) {
-      this.recordOutdate[id] = {};
-    }
-    if (this.recordOutdate[id][functionId]) {
-      this.markOutdate(
-        {
-          id,
-          functionId
-        },
-        false
-      );
-      return true;
-    } else {
-      return false;
-    }
-  }
-};
 
-// src/universal/index.ts
 function prefetch(options) {
-  const { id, functionId = "default" } = options;
-  const mfScope = getScope();
-  const prefetchInstance = MFDataPrefetch.getInstance(mfScope) || new MFDataPrefetch({
-    name: mfScope
-  });
-  const res = prefetchInstance.getProjectExports();
-  if (res instanceof Promise) {
-    const promise = res.then(() => {
-      const result = prefetchInstance.prefetch(options);
-      prefetchInstance.memorize(id + functionId, result);
-      return result;
+    const { id, functionId = 'default' } = options;
+    const mfScope = getScope();
+    const prefetchInstance = MFDataPrefetch.getInstance(mfScope) || new MFDataPrefetch({
+        name: mfScope
     });
-    return promise;
-  } else {
-    const result = prefetchInstance.prefetch(options);
-    prefetchInstance.memorize(id + functionId, result);
-    return result;
-  }
+    const res = prefetchInstance.getProjectExports();
+    if (res instanceof Promise) {
+        const promise = res.then(()=>{
+            const result = prefetchInstance.prefetch(options);
+            prefetchInstance.memorize(id + functionId, result);
+            return result;
+        });
+        return promise;
+    } else {
+        const result = prefetchInstance.prefetch(options);
+        prefetchInstance.memorize(id + functionId, result);
+        return result;
+    }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  prefetch
-});
+
+export { prefetch };

package/dist/universal.cjs

@@ -0,0 +1,95 @@
+"use strict";
+const __rslib_import_meta_url__ = /*#__PURE__*/ (function () {
+  return typeof document === 'undefined'
+    ? new (require('url'.replace('', '')).URL)('file:' + __filename).href
+    : (document.currentScript && document.currentScript.src) ||
+      new URL('main.js', document.baseURI).href;
+})();
+;
+var __webpack_modules__ = ({
+"./universal/index": (function (module) {
+module.exports = require("./universal/index.cjs");
+
+}),
+
+});
+/************************************************************************/
+// The module cache
+var __webpack_module_cache__ = {};
+
+// The require function
+function __webpack_require__(moduleId) {
+
+// Check if module is in cache
+var cachedModule = __webpack_module_cache__[moduleId];
+if (cachedModule !== undefined) {
+return cachedModule.exports;
+}
+// Create a new module (and put it into the cache)
+var module = (__webpack_module_cache__[moduleId] = {
+exports: {}
+});
+// Execute the module function
+__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+
+// Return the exports of the module
+return module.exports;
+
+}
+
+/************************************************************************/
+// webpack/runtime/compat_get_default_export
+(() => {
+// getDefaultExport function for compatibility with non-ESM modules
+__webpack_require__.n = (module) => {
+	var getter = module && module.__esModule ?
+		() => (module['default']) :
+		() => (module);
+	__webpack_require__.d(getter, { a: getter });
+	return getter;
+};
+
+})();
+// webpack/runtime/define_property_getters
+(() => {
+__webpack_require__.d = (exports, definition) => {
+	for(var key in definition) {
+        if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+            Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+        }
+    }
+};
+})();
+// webpack/runtime/has_own_property
+(() => {
+__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+})();
+// webpack/runtime/make_namespace_object
+(() => {
+// define __esModule on exports
+__webpack_require__.r = (exports) => {
+	if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+		Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+	}
+	Object.defineProperty(exports, '__esModule', { value: true });
+};
+})();
+/************************************************************************/
+var __webpack_exports__ = {};
+// This entry needs to be wrapped in an IIFE because it needs to be isolated against other modules in the chunk.
+(() => {
+__webpack_require__.r(__webpack_exports__);
+/* ESM import */var _universal_index__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./universal/index");
+/* ESM import */var _universal_index__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_universal_index__WEBPACK_IMPORTED_MODULE_0__);
+
+/* ESM reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};
+/* ESM reexport (unknown) */ for( var __WEBPACK_IMPORT_KEY__ in _universal_index__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== "default") __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] =function(key) { return _universal_index__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)
+/* ESM reexport (unknown) */ __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+
+
+})();
+
+for(var __webpack_i__ in __webpack_exports__) {
+  exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+}
+Object.defineProperty(exports, '__esModule', { value: true });

package/dist/universal.d.ts

@@ -0,0 +1 @@
+export * from './universal/index';

package/dist/universal.js

@@ -0,0 +1,5 @@
+export * from "./universal/index.js";
+
+;// CONCATENATED MODULE: ./src/universal.ts
+
+

package/package.json

@@ -1,43 +1,74 @@
 {
   "name": "@module-federation/data-prefetch",
   "description": "Module Federation Data Prefetch",
-  "version": "1.0.16",
+  "version": "2.0.1",
+  "type": "module",
   "author": "nieyan <nyqykk@foxmail.com>",
   "homepage": "https://github.com/module-federation/core",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/module-federation/core.git",
+    "directory": "packages/data-prefetch"
+  },
   "publishConfig": {
     "access": "public"
   },
+  "files": [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
   "exports": {
     ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.cjs"
+      }
     },
     "./react": {
-      "import": "./dist/esm/react/index.js",
-      "require": "./dist/react/index.js",
-      "types": "./dist/react/index.d.ts"
+      "import": {
+        "types": "./dist/react.d.ts",
+        "default": "./dist/react.js"
+      },
+      "require": {
+        "types": "./dist/react.d.ts",
+        "default": "./dist/react.cjs"
+      }
     },
     "./cli": {
-      "import": "./dist/esm/cli/index.js",
-      "require": "./dist/cli/index.js",
-      "types": "./dist/cli/index.d.ts"
+      "import": {
+        "types": "./dist/cli.d.ts",
+        "default": "./dist/cli.js"
+      },
+      "require": {
+        "types": "./dist/cli.d.ts",
+        "default": "./dist/cli.cjs"
+      }
     },
     "./babel-plugin": {
-      "import": "./dist/esm/cli/babel.js",
-      "require": "./dist/cli/babel.js",
-      "types": "./dist/cli/babel.d.ts"
+      "import": {
+        "types": "./dist/babel.d.ts",
+        "default": "./dist/babel.js"
+      },
+      "require": {
+        "types": "./dist/babel.d.ts",
+        "default": "./dist/babel.cjs"
+      }
     },
     "./universal": {
-      "import": "./dist/esm/universal/index.js",
-      "require": "./dist/universal/index.js",
-      "types": "./dist/universal/index.d.ts"
-    },
-    "./shared": {
-      "import": "./dist/esm/shared/index.js",
-      "require": "./dist/shared/index.js",
-      "types": "./dist/shared/index.d.ts"
+      "import": {
+        "types": "./dist/universal.d.ts",
+        "default": "./dist/universal.js"
+      },
+      "require": {
+        "types": "./dist/universal.d.ts",
+        "default": "./dist/universal.cjs"
+      }
     }
   },
   "typesVersions": {
@@ -46,51 +77,56 @@
         "./dist/index.d.ts"
       ],
       "react": [
-        "./dist/react/index.d.ts"
+        "./dist/react.d.ts"
       ],
       "cli": [
-        "./dist/cli/index.d.ts"
+        "./dist/cli.d.ts"
       ],
       "universal": [
-        "./dist/universal/index.d.ts"
+        "./dist/universal.d.ts"
       ],
-      "shared": [
-        "./dist/shared/index.d.ts"
+      "babel-plugin": [
+        "./dist/babel.d.ts"
       ]
     }
   },
-  "main": "dist/index.js",
-  "module": "dist/esm/index.js",
+  "main": "./dist/index.cjs",
+  "types": "./dist/index.d.ts",
+  "module": "./dist/index.js",
   "peerDependencies": {
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
+  "peerDependenciesMeta": {
+    "react": {
+      "optional": true
+    },
+    "react-dom": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@testing-library/react-hooks": "^8.0.1",
-    "@types/fs-extra": "9.0.6",
+    "@types/fs-extra": "9.0.13",
     "@types/jest": "^29.5.11",
-    "@types/node": "^17.0.45",
+    "@types/node": "^20.19.5",
     "@types/react": "~18.0.38",
-    "esbuild-plugin-replace": "^1.4.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "minimist": "^1.2.8",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router": "^6.21.3",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-router": "^6.30.2",
     "react-test-renderer": "^18.2.0",
     "ts-jest": "29.0.1",
-    "tsup": "6.2.0",
-    "webpack": "5.75.0"
+    "webpack": "5.104.1"
   },
   "dependencies": {
     "fs-extra": "9.1.0",
-    "@module-federation/sdk": "0.6.5",
-    "@module-federation/runtime": "0.6.5"
+    "@module-federation/runtime": "2.0.1",
+    "@module-federation/sdk": "2.0.1"
   },
   "scripts": {
-    "dev": "cross-env WATCH=true tsup",
-    "build": "rm -rf dist && tsup",
     "test": "jest"
   }
 }

package/CHANGELOG.md

@@ -1,9 +0,0 @@
-@module-federation/data-prefetch
-
-## 1.0.16
-
-### Patch Changes
-
-- 3070e26: feat(@module-federation/data-prefetch): support data prefetch in Module Federation
-  - @module-federation/runtime@0.6.5
-  - @module-federation/sdk@0.6.5

package/__tests__/babel.spec.ts

@@ -1,75 +0,0 @@
-/// <reference types="jest" />
-
-import path from 'path';
-import fs from 'fs';
-import { BabelFileResult, transformFileSync } from '@babel/core';
-// @ts-ignore no use
-import type from '@types/jest';
-
-import babelPlugin from '../src/cli/babel';
-
-const emptyRegexp = /\s+/g;
-describe('Babel Plugin Test', () => {
-  const options = {
-    name: '@mf/test',
-    exposes: { './expose': path.resolve(__dirname, 'test') },
-  };
-
-  const testFilePath = path.join(__dirname, './test');
-
-  beforeEach(() => {
-    fs.mkdirSync(path.dirname(testFilePath), { recursive: true });
-    fs.closeSync(fs.openSync(testFilePath, 'w'));
-  });
-
-  afterEach(() => {
-    fs.unlinkSync(testFilePath);
-  });
-
-  // Check if the plugin will add the id parameter when it is not present
-  test('it adds id argument to usePrefetch call when it is absent', () => {
-    const input = `
-      import { usePrefetch } from "@module-federation/data-prefetch/react";
-      usePrefetch({});
-    `;
-
-    const expected = `
-      import { usePrefetch } from "@module-federation/data-prefetch/react";
-      usePrefetch({ id: "@mf/test/expose" });
-    `;
-
-    fs.writeFileSync(testFilePath, input);
-    const { code } = transformFileSync(testFilePath, {
-      plugins: [[babelPlugin, options]],
-      configFile: false,
-    }) as BabelFileResult;
-
-    expect(code?.replace(emptyRegexp, '')).toBe(
-      expected.replace(emptyRegexp, ''),
-    );
-  });
-
-  // The plugin should retain the existing id parameter in the usePrefetch call
-  test('it does not overwrite existing id argument in usePrefetch call', () => {
-    const input = `
-      import { usePrefetch } from "@module-federation/data-prefetch/react";
-      usePrefetch({ id: "existingId" });
-    `;
-
-    const expected = `
-      import { usePrefetch } from "@module-federation/data-prefetch/react";
-      usePrefetch({ id: "existingId" });
-    `;
-
-    fs.writeFileSync(testFilePath, input);
-    const { code } = transformFileSync(testFilePath, {
-      plugins: [[babelPlugin, options]],
-      configFile: false,
-      babelrc: false,
-    }) as BabelFileResult;
-
-    expect(code?.replace(emptyRegexp, '')).toBe(
-      expected.replace(emptyRegexp, ''),
-    );
-  });
-});