@module-federation/data-prefetch 0.0.0-next-20241010063233 → 0.0.0-next-20241010084324

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/data-prefetch",
   "description": "Module Federation Data Prefetch",
-  "version": "0.0.0-next-20241010063233",
+  "version": "0.0.0-next-20241010084324",
   "author": "nieyan <nyqykk@foxmail.com>",
   "homepage": "https://github.com/module-federation/core",
   "license": "MIT",
@@ -10,60 +10,57 @@
   },
   "exports": {
     ".": {
-      "import": "./dist/index.esm.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.cjs.d.ts"
+      "import": "./dist/esm/index.js",
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./react": {
-      "import": "./dist/react.esm.js",
-      "require": "./dist/react.cjs.js",
-      "types": "./dist/react.cjs.d.ts"
+      "import": "./dist/esm/react/index.js",
+      "require": "./dist/react/index.js",
+      "types": "./dist/react/index.d.ts"
     },
     "./cli": {
-      "import": "./dist/cli.esm.js",
-      "require": "./dist/cli.cjs.js",
-      "types": "./dist/cli.cjs.d.ts"
+      "import": "./dist/esm/cli/index.js",
+      "require": "./dist/cli/index.js",
+      "types": "./dist/cli/index.d.ts"
     },
     "./babel-plugin": {
-      "import": "./dist/babel.esm.js",
-      "require": "./dist/babel.cjs.js",
-      "types": "./dist/babel.cjs.d.ts"
+      "import": "./dist/esm/cli/babel.js",
+      "require": "./dist/cli/babel.js",
+      "types": "./dist/cli/babel.d.ts"
     },
     "./universal": {
-      "import": "./dist/universal.esm.js",
-      "require": "./dist/universal.cjs.js",
-      "types": "./dist/universal.cjs.d.ts"
+      "import": "./dist/esm/universal/index.js",
+      "require": "./dist/universal/index.js",
+      "types": "./dist/universal/index.d.ts"
     },
     "./shared": {
-      "import": "./dist/shared.esm.js",
-      "require": "./dist/shared.cjs.js",
-      "types": "./dist/shared/.cjs.d.ts"
+      "import": "./dist/esm/shared/index.js",
+      "require": "./dist/shared/index.js",
+      "types": "./dist/shared/index.d.ts"
     }
   },
   "typesVersions": {
     "*": {
       ".": [
-        "./dist/index.cjs.d.ts"
+        "./dist/index.d.ts"
       ],
       "react": [
-        "./dist/react.cjs.d.ts"
+        "./dist/react/index.d.ts"
       ],
       "cli": [
-        "./dist/cli.cjs.d.ts"
+        "./dist/cli/index.d.ts"
       ],
       "universal": [
-        "./dist/universal.cjs.d.ts"
+        "./dist/universal/index.d.ts"
       ],
       "shared": [
-        "./dist/shared.cjs.d.ts"
-      ],
-      "babel-plugin": [
-        "./dist/babel.cjs.d.ts"
+        "./dist/shared/index.d.ts"
       ]
     }
   },
-  "main": "dist/index.cjs",
-  "module": "dist/index.esm.js",
+  "main": "dist/index.js",
+  "module": "dist/esm/index.js",
   "peerDependencies": {
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
@@ -78,8 +75,8 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "minimist": "^1.2.8",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-router": "^6.21.3",
     "react-test-renderer": "^18.2.0",
     "ts-jest": "29.0.1",
@@ -88,8 +85,8 @@
   },
   "dependencies": {
     "fs-extra": "9.1.0",
-    "@module-federation/runtime": "0.0.0-next-20241010063233",
-    "@module-federation/sdk": "0.0.0-next-20241010063233"
+    "@module-federation/sdk": "0.0.0-next-20241010084324",
+    "@module-federation/runtime": "0.0.0-next-20241010084324"
   },
   "scripts": {
     "dev": "cross-env WATCH=true tsup",

package/project.json

@@ -1,63 +1,21 @@
 {
-  "name": "data-prefetch",
+  "name": "module-federation/data-prefetch",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "packages/data-prefetch/src",
   "projectType": "library",
-  "tags": ["type:pkg"],
   "targets": {
     "build": {
-      "executor": "@nx/rollup:rollup",
-      "outputs": ["{options.outputPath}"],
+      "executor": "nx:run-commands",
       "options": {
-        "outputPath": "packages/data-prefetch/dist",
-        "main": "packages/data-prefetch/src/index.ts",
-        "tsConfig": "packages/data-prefetch/tsconfig.lib.json",
-        "assets": [],
-        "project": "packages/data-prefetch/package.json",
-        "rollupConfig": "packages/data-prefetch/rollup.config.js",
-        "compiler": "swc",
-        "format": ["cjs", "esm"]
+        "commands": ["npm run build --prefix packages/data-prefetch"]
       }
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-      "options": {
-        "jestConfig": "packages/data-prefetch/jest.config.js",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
-      }
-    },
-    "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/data-prefetch/**/*.ts",
-          "packages/data-prefetch/package.json"
-        ]
-      }
-    },
-    "pre-release": {
       "executor": "nx:run-commands",
       "options": {
-        "parallel": false,
-        "commands": [
-          {
-            "command": "nx run data-prefetch:test",
-            "forwardAllArgs": false
-          },
-          {
-            "command": "nx run data-prefetch:build",
-            "forwardAllArgs": false
-          }
-        ]
+        "commands": ["npm run test --prefix packages/data-prefetch"]
       }
     }
-  }
+  },
+  "tags": ["type:pkg"]
 }

package/src/cli/index.ts

@@ -47,8 +47,8 @@ export class PrefetchPlugin implements WebpackPluginInstance {
       this.options.runtimePlugins = [];
     }
 
-    const runtimePath = path.resolve(__dirname, './plugin.esm.js');
-    const sharedPath = path.resolve(__dirname, './shared.esm.js');
+    const runtimePath = path.resolve(__dirname, '../esm/plugin.js');
+    const sharedPath = path.resolve(__dirname, '../esm/shared/index.js');
     if (!this.options.runtimePlugins?.includes(runtimePath)) {
       this.options.runtimePlugins!.push(runtimePath);
     }

package/tsconfig.json

@@ -22,6 +22,6 @@
       "@src/*": ["./src/*"]
     }
   },
-  "include": ["src", "../../global.d.ts", "__tests__/**/*"],
+  "include": ["src", "../../global.d.ts", "__tests__/**/*", "tsup.config.ts"],
   "exclude": ["node_modules/**/*", "../node_modules"]
 }

package/.swcrc

@@ -1,29 +0,0 @@
-{
-  "jsc": {
-    "target": "es2017",
-    "parser": {
-      "syntax": "typescript",
-      "decorators": true,
-      "dynamicImport": true
-    },
-    "transform": {
-      "decoratorMetadata": true,
-      "legacyDecorator": true
-    },
-    "keepClassNames": true,
-    "externalHelpers": true,
-    "loose": true
-  },
-  "module": {
-    "type": "es6"
-  },
-  "sourceMaps": true,
-  "exclude": [
-    "jest.config.ts",
-    ".*\\.spec.tsx?$",
-    ".*\\.test.tsx?$",
-    "./src/jest-setup.ts$",
-    "./**/jest-setup.ts$",
-    ".*.js$"
-  ]
-}

package/dist/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-present nieyan(nyqykk)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/babel.cjs.d.ts

@@ -1,2 +0,0 @@
-export * from "./src/cli/babel";
-export { default } from "./src/cli/babel";

package/dist/babel.cjs.js

@@ -1,50 +0,0 @@
-'use strict';
-
-var path = require('path');
-
-// no used now
-const attribute = 'id';
-const hookId = 'usePrefetch';
-const importPackage = '@module-federation/data-prefetch/react';
-// biome-ignore lint/suspicious/noExplicitAny: <explanation>
-var babel = ((babel, options)=>{
-    const t = babel.types;
-    let shouldHandle = false;
-    let scope = '';
-    const { name, exposes } = options;
-    if (!exposes) {
-        return {};
-    }
-    const exposesKey = Object.keys(exposes);
-    const processedExposes = exposesKey.map((expose)=>({
-            key: expose.replace('.', ''),
-            value: path.resolve(// @ts-ignore
-            typeof exposes[expose] === 'string' ? exposes[expose] : exposes[expose].import)
-        }));
-    return {
-        visitor: {
-            ImportDeclaration (nodePath, // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-            state) {
-                const source = nodePath.node.source.value;
-                const { specifiers } = nodePath.node;
-                const { filename } = state.file.opts;
-                if (source === importPackage) {
-                    shouldHandle = specifiers.some((specifier)=>specifier.imported && specifier.imported.name === hookId && processedExposes.find(// biome-ignore lint/suspicious/noAssignInExpressions: <explanation>
-                        (expose)=>expose.value === filename && (scope = expose.key)));
-                }
-            },
-            CallExpression (nodePath) {
-                if (shouldHandle && t.isIdentifier(nodePath.node.callee, {
-                    name: hookId
-                }) && nodePath.node.arguments.length > 0) {
-                    const objectExpression = nodePath.node.arguments[0];
-                    if (objectExpression && t.isObjectExpression(objectExpression) && !objectExpression.properties.find((p)=>p.key.name === attribute)) {
-                        objectExpression.properties.push(t.objectProperty(t.identifier(attribute), t.stringLiteral(name + scope)));
-                    }
-                }
-            }
-        }
-    };
-});
-
-module.exports = babel;

package/dist/babel.esm.d.ts

@@ -1,2 +0,0 @@
-export * from "./src/cli/babel";
-export { default } from "./src/cli/babel";

package/dist/babel.esm.js

@@ -1,48 +0,0 @@
-import path from 'path';
-
-// no used now
-const attribute = 'id';
-const hookId = 'usePrefetch';
-const importPackage = '@module-federation/data-prefetch/react';
-// biome-ignore lint/suspicious/noExplicitAny: <explanation>
-var babel = ((babel, options)=>{
-    const t = babel.types;
-    let shouldHandle = false;
-    let scope = '';
-    const { name, exposes } = options;
-    if (!exposes) {
-        return {};
-    }
-    const exposesKey = Object.keys(exposes);
-    const processedExposes = exposesKey.map((expose)=>({
-            key: expose.replace('.', ''),
-            value: path.resolve(// @ts-ignore
-            typeof exposes[expose] === 'string' ? exposes[expose] : exposes[expose].import)
-        }));
-    return {
-        visitor: {
-            ImportDeclaration (nodePath, // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-            state) {
-                const source = nodePath.node.source.value;
-                const { specifiers } = nodePath.node;
-                const { filename } = state.file.opts;
-                if (source === importPackage) {
-                    shouldHandle = specifiers.some((specifier)=>specifier.imported && specifier.imported.name === hookId && processedExposes.find(// biome-ignore lint/suspicious/noAssignInExpressions: <explanation>
-                        (expose)=>expose.value === filename && (scope = expose.key)));
-                }
-            },
-            CallExpression (nodePath) {
-                if (shouldHandle && t.isIdentifier(nodePath.node.callee, {
-                    name: hookId
-                }) && nodePath.node.arguments.length > 0) {
-                    const objectExpression = nodePath.node.arguments[0];
-                    if (objectExpression && t.isObjectExpression(objectExpression) && !objectExpression.properties.find((p)=>p.key.name === attribute)) {
-                        objectExpression.properties.push(t.objectProperty(t.identifier(attribute), t.stringLiteral(name + scope)));
-                    }
-                }
-            }
-        }
-    };
-});
-
-export { babel as default };

package/dist/cli.cjs.d.ts

@@ -1 +0,0 @@
-export * from "./src/cli/index";

package/dist/cli.cjs.js

@@ -1,155 +0,0 @@
-'use strict';
-
-var path = require('path');
-var fs = require('fs-extra');
-var sdk = require('@module-federation/sdk');
-var normalizeWebpackPath = require('@module-federation/sdk/normalize-webpack-path');
-var runtimeUtils = require('./runtime-utils.cjs.js');
-require('@module-federation/runtime');
-
-const TEMP_DIR = '.mf';
-
-const fileExistsWithCaseSync = (filepath)=>{
-    const dir = path.dirname(filepath);
-    if (filepath === '/' || filepath === '.') {
-        return true;
-    }
-    const filenames = fs.readdirSync(dir);
-    if (filenames.indexOf(path.basename(filepath)) === -1) {
-        return false;
-    }
-    return fileExistsWithCaseSync(dir);
-};
-const fixPrefetchPath = (exposePath)=>{
-    const pathExt = [
-        '.js',
-        '.ts'
-    ];
-    const extReg = /\.(ts|js|tsx|jsx)$/;
-    if (extReg.test(exposePath)) {
-        return pathExt.map((ext)=>exposePath.replace(extReg, `.prefetch${ext}`));
-    } else {
-        return pathExt.map((ext)=>exposePath + `.prefetch${ext}`);
-    }
-};
-
-const { RuntimeGlobals, Template } = require(normalizeWebpackPath.normalizeWebpackPath('webpack'));
-function getFederationGlobalScope(runtimeGlobals) {
-    return `${runtimeGlobals.require || '__webpack_require__'}.federation`;
-}
-class PrefetchPlugin {
-    // eslint-disable-next-line max-lines-per-function
-    apply(compiler) {
-        var _this_options_runtimePlugins, _this_options_runtimePlugins1;
-        const { name, exposes } = this.options;
-        if (!exposes) {
-            return;
-        }
-        if (!compiler.options.context) {
-            throw new Error('compiler.options.context is not defined');
-        }
-        const { runtimePlugins } = this.options;
-        if (!Array.isArray(runtimePlugins)) {
-            this.options.runtimePlugins = [];
-        }
-        const runtimePath = path.resolve(__dirname, './plugin.esm.js');
-        const sharedPath = path.resolve(__dirname, './shared.esm.js');
-        if (!((_this_options_runtimePlugins = this.options.runtimePlugins) == null ? void 0 : _this_options_runtimePlugins.includes(runtimePath))) {
-            this.options.runtimePlugins.push(runtimePath);
-        }
-        if (!((_this_options_runtimePlugins1 = this.options.runtimePlugins) == null ? void 0 : _this_options_runtimePlugins1.includes(sharedPath))) {
-            this.options.runtimePlugins.push(sharedPath);
-        }
-        const encodedName = sdk.encodeName(name);
-        const asyncEntryPath = path.resolve(compiler.options.context, `node_modules/${TEMP_DIR}/${encodedName}/bootstrap.js`);
-        if (fs.existsSync(asyncEntryPath)) {
-            fs.unlinkSync(asyncEntryPath);
-        }
-        if (!this.options.dataPrefetch) {
-            return;
-        }
-        const exposeAlias = Object.keys(exposes);
-        exposeAlias.forEach((alias)=>{
-            let exposePath;
-            // @ts-ignore
-            const exposeValue = exposes[alias];
-            if (typeof exposeValue === 'string') {
-                exposePath = exposeValue;
-            } else {
-                exposePath = exposeValue.import[0];
-            }
-            const targetPaths = fixPrefetchPath(exposePath);
-            for (const pathItem of targetPaths){
-                const absolutePath = path.resolve(compiler.options.context, pathItem);
-                if (fileExistsWithCaseSync(absolutePath)) {
-                    const absoluteAlias = alias.replace('.', '');
-                    this._reWriteExports += `export * as ${runtimeUtils.getPrefetchId(`${name}${absoluteAlias}`)} from '${absolutePath}';\n`;
-                    break;
-                }
-            }
-        });
-        if (!this._reWriteExports) {
-            return;
-        }
-        const tempDirRealPath = path.resolve(compiler.options.context, 'node_modules', TEMP_DIR);
-        if (!fs.existsSync(tempDirRealPath)) {
-            fs.mkdirSync(tempDirRealPath);
-        }
-        if (!fs.existsSync(`${tempDirRealPath}/${encodedName}`)) {
-            fs.mkdirSync(`${tempDirRealPath}/${encodedName}`);
-        }
-        fs.writeFileSync(asyncEntryPath, this._reWriteExports);
-        new compiler.webpack.DefinePlugin({
-            FederationDataPrefetch: JSON.stringify(asyncEntryPath)
-        }).apply(compiler);
-    }
-    static addRuntime(compiler, options) {
-        const encodedName = sdk.encodeName(options.name);
-        if (!compiler.options.context) {
-            throw new Error('compiler.options.context is not defined');
-        }
-        const prefetchEntry = path.resolve(compiler.options.context, `node_modules/.mf/${encodedName}/bootstrap.js`);
-        const federationGlobal = getFederationGlobalScope(RuntimeGlobals || {});
-        return Template.asString([
-            fs.existsSync(prefetchEntry) ? Template.indent([
-                'function injectPrefetch() {',
-                Template.indent([
-                    `globalThis.__FEDERATION__ = globalThis.__FEDERATION__ || {};`,
-                    `globalThis.__FEDERATION__['${sdk.MFPrefetchCommon.globalKey}'] = globalThis.__FEDERATION__['${sdk.MFPrefetchCommon.globalKey}'] || {`,
-                    `entryLoading: {},`,
-                    `instance: new Map(),`,
-                    `__PREFETCH_EXPORTS__: {},`,
-                    `};`,
-                    `globalThis.__FEDERATION__['${sdk.MFPrefetchCommon.globalKey}']['${sdk.MFPrefetchCommon.exportsKey}'] = globalThis.__FEDERATION__['${sdk.MFPrefetchCommon.globalKey}']['${sdk.MFPrefetchCommon.exportsKey}'] || {};`,
-                    `globalThis.__FEDERATION__['${sdk.MFPrefetchCommon.globalKey}']['${sdk.MFPrefetchCommon.exportsKey}']['${options.name}'] = function(){ return import('${prefetchEntry}');}`
-                ]),
-                '}',
-                `${federationGlobal}.prefetch = injectPrefetch`
-            ]) : '',
-            Template.indent([
-                `if(!${federationGlobal}.isMFRemote && ${federationGlobal}.prefetch){`,
-                `${federationGlobal}.prefetch()`,
-                '}'
-            ])
-        ]);
-    }
-    static setRemoteIdentifier() {
-        const federationGlobal = getFederationGlobalScope(RuntimeGlobals || {});
-        return Template.indent([
-            `${federationGlobal}.isMFRemote = true;`
-        ]);
-    }
-    static removeRemoteIdentifier() {
-        const federationGlobal = getFederationGlobalScope(RuntimeGlobals || {});
-        return Template.indent([
-            `${federationGlobal}.isMFRemote = false;`
-        ]);
-    }
-    constructor(options){
-        this.options = options;
-        this._reWriteExports = '';
-    }
-}
-
-exports.PrefetchPlugin = PrefetchPlugin;
-exports.getFederationGlobalScope = getFederationGlobalScope;

package/dist/cli.esm.d.ts

@@ -1 +0,0 @@
-export * from "./src/cli/index";