@module-federation/data-prefetch 0.6.9 → 0.6.10

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @module-federation/data-prefetch
 
+## 0.6.10
+
+### Patch Changes
+
+- 22a3b83: fix(data-prefetch): apply DataPrefetchPlugin on demand
+- 22a3b83: fix(data-prefetch): set sharedStrategy in build options instead of using runtime plugin
+- Updated dependencies [b704f30]
+- Updated dependencies [22a3b83]
+  - @module-federation/runtime@0.6.10
+  - @module-federation/sdk@0.6.10
+
 ## 0.6.9
 
 ### Patch Changes

package/dist/cli.cjs.js

@@ -5,6 +5,7 @@ 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');
+var constant = require('./constant.cjs.js');
 require('@module-federation/runtime');
 
 const TEMP_DIR = '.mf';
@@ -40,7 +41,7 @@ function getFederationGlobalScope(runtimeGlobals) {
 class PrefetchPlugin {
     // eslint-disable-next-line max-lines-per-function
     apply(compiler) {
-        var _this_options_runtimePlugins, _this_options_runtimePlugins1;
+        var _this_options_runtimePlugins;
         const { name, exposes } = this.options;
         if (!exposes) {
             return;
@@ -53,12 +54,12 @@ class PrefetchPlugin {
             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);
+        if (this.options.shareStrategy !== constant.SHARED_STRATEGY) {
+            this.options.shareStrategy = constant.SHARED_STRATEGY;
+            console.warn(`[Module Federation Data Prefetch]: Your shared strategy is set to '${constant.SHARED_STRATEGY}', this is a necessary condition for data prefetch`);
         }
         const encodedName = sdk.encodeName(name);
         const asyncEntryPath = path.resolve(compiler.options.context, `node_modules/${TEMP_DIR}/${encodedName}/bootstrap.js`);

package/dist/cli.esm.js

@@ -3,6 +3,7 @@ import fs from 'fs-extra';
 import { encodeName, MFPrefetchCommon } from '@module-federation/sdk';
 import { normalizeWebpackPath } from '@module-federation/sdk/normalize-webpack-path';
 import { b as getPrefetchId } from './runtime-utils.esm.js';
+import { S as SHARED_STRATEGY } from './constant.esm.js';
 import '@module-federation/runtime';
 
 const TEMP_DIR = '.mf';
@@ -38,7 +39,7 @@ function getFederationGlobalScope(runtimeGlobals) {
 class PrefetchPlugin {
     // eslint-disable-next-line max-lines-per-function
     apply(compiler) {
-        var _this_options_runtimePlugins, _this_options_runtimePlugins1;
+        var _this_options_runtimePlugins;
         const { name, exposes } = this.options;
         if (!exposes) {
             return;
@@ -51,12 +52,12 @@ class PrefetchPlugin {
             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);
+        if (this.options.shareStrategy !== SHARED_STRATEGY) {
+            this.options.shareStrategy = SHARED_STRATEGY;
+            console.warn(`[Module Federation Data Prefetch]: Your shared strategy is set to '${SHARED_STRATEGY}', this is a necessary condition for data prefetch`);
         }
         const encodedName = encodeName(name);
         const asyncEntryPath = path.resolve(compiler.options.context, `node_modules/${TEMP_DIR}/${encodedName}/bootstrap.js`);

package/dist/constant.cjs.js

@@ -0,0 +1,5 @@
+'use strict';
+
+const SHARED_STRATEGY = 'loaded-first';
+
+exports.SHARED_STRATEGY = SHARED_STRATEGY;

package/dist/constant.esm.js

@@ -0,0 +1,3 @@
+const SHARED_STRATEGY = 'loaded-first';
+
+export { SHARED_STRATEGY as S };

package/dist/index.cjs.js

@@ -6,6 +6,7 @@ require('@module-federation/runtime');
 require('@module-federation/sdk');
 require('./runtime-utils.cjs.js');
 require('./index.cjs2.js');
+require('./constant.cjs.js');
 
 
 

package/dist/index.esm.js

@@ -4,3 +4,4 @@ import '@module-federation/runtime';
 import '@module-federation/sdk';
 import './runtime-utils.esm.js';
 import './index.esm2.js';
+import './constant.esm.js';

package/dist/package.json

@@ -1,13 +1,11 @@
 {
   "name": "@module-federation/data-prefetch",
   "description": "Module Federation Data Prefetch",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "author": "nieyan <nyqykk@foxmail.com>",
   "homepage": "https://github.com/module-federation/core",
   "license": "MIT",
   "scripts": {
-    "dev": "cross-env WATCH=true tsup",
-    "build": "rm -rf dist && tsup",
     "test": "jest"
   },
   "publishConfig": {
@@ -38,11 +36,6 @@
       "import": "./dist/universal.esm.js",
       "require": "./dist/universal.cjs.js",
       "types": "./dist/universal.cjs.d.ts"
-    },
-    "./shared": {
-      "import": "./dist/shared.esm.js",
-      "require": "./dist/shared.cjs.js",
-      "types": "./dist/shared/.cjs.d.ts"
     }
   },
   "typesVersions": {
@@ -59,9 +52,6 @@
       "universal": [
         "./dist/universal.cjs.d.ts"
       ],
-      "shared": [
-        "./dist/shared.cjs.d.ts"
-      ],
       "babel-plugin": [
         "./dist/babel.cjs.d.ts"
       ]
@@ -79,7 +69,6 @@
     "@types/jest": "^29.5.11",
     "@types/node": "^17.0.45",
     "@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",
@@ -88,7 +77,6 @@
     "react-router": "^6.21.3",
     "react-test-renderer": "^18.2.0",
     "ts-jest": "29.0.1",
-    "tsup": "6.2.0",
     "webpack": "5.75.0"
   },
   "dependencies": {

package/dist/plugin.cjs.js

@@ -6,11 +6,11 @@ var sdk = require('@module-federation/sdk');
 var runtimeUtils = require('./runtime-utils.cjs.js');
 var prefetch = require('./prefetch.cjs.js');
 var index = require('./index.cjs2.js');
+var constant = require('./constant.cjs.js');
 require('@module-federation/runtime');
 
 const loadingArray = [];
-const strategy = 'loaded-first';
-let sharedFlag = strategy;
+let sharedFlag = constant.SHARED_STRATEGY;
 // eslint-disable-next-line max-lines-per-function
 const prefetchPlugin = ()=>({
         name: 'data-prefetch-runtime-plugin',
@@ -28,7 +28,7 @@ const prefetchPlugin = ()=>({
             if (!signal) {
                 return options;
             }
-            if (sharedFlag !== strategy) {
+            if (sharedFlag !== constant.SHARED_STRATEGY) {
                 throw new Error(`[Module Federation Data Prefetch]: If you want to use data prefetch, the shared strategy must be 'loaded-first'`);
             }
             const instance = prefetch.MFDataPrefetch.getInstance(name) || new prefetch.MFDataPrefetch(prefetchOptions);
@@ -88,7 +88,7 @@ const prefetchPlugin = ()=>({
             if (!inited) {
                 return options;
             }
-            if (sharedFlag !== strategy) {
+            if (sharedFlag !== constant.SHARED_STRATEGY) {
                 throw new Error(`[Module Federation Data Prefetch]: If you want to use data prefetch, the shared strategy must be 'loaded-first'`);
             }
             const instance = prefetch.MFDataPrefetch.getInstance(name) || new prefetch.MFDataPrefetch(prefetchOptions);

package/dist/plugin.esm.js

@@ -2,11 +2,11 @@ import { getResourceUrl } from '@module-federation/sdk';
 import { a as getSignalFromManifest } from './runtime-utils.esm.js';
 import { M as MFDataPrefetch } from './prefetch.esm.js';
 import { l as logger } from './index.esm2.js';
+import { S as SHARED_STRATEGY } from './constant.esm.js';
 import '@module-federation/runtime';
 
 const loadingArray = [];
-const strategy = 'loaded-first';
-let sharedFlag = strategy;
+let sharedFlag = SHARED_STRATEGY;
 // eslint-disable-next-line max-lines-per-function
 const prefetchPlugin = ()=>({
         name: 'data-prefetch-runtime-plugin',
@@ -24,7 +24,7 @@ const prefetchPlugin = ()=>({
             if (!signal) {
                 return options;
             }
-            if (sharedFlag !== strategy) {
+            if (sharedFlag !== SHARED_STRATEGY) {
                 throw new Error(`[Module Federation Data Prefetch]: If you want to use data prefetch, the shared strategy must be 'loaded-first'`);
             }
             const instance = MFDataPrefetch.getInstance(name) || new MFDataPrefetch(prefetchOptions);
@@ -84,7 +84,7 @@ const prefetchPlugin = ()=>({
             if (!inited) {
                 return options;
             }
-            if (sharedFlag !== strategy) {
+            if (sharedFlag !== SHARED_STRATEGY) {
                 throw new Error(`[Module Federation Data Prefetch]: If you want to use data prefetch, the shared strategy must be 'loaded-first'`);
             }
             const instance = MFDataPrefetch.getInstance(name) || new MFDataPrefetch(prefetchOptions);

package/dist/src/constant.d.ts

@@ -0,0 +1 @@
+export declare const SHARED_STRATEGY = "loaded-first";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/data-prefetch",
   "description": "Module Federation Data Prefetch",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "author": "nieyan <nyqykk@foxmail.com>",
   "homepage": "https://github.com/module-federation/core",
   "license": "MIT",
@@ -33,11 +33,6 @@
       "import": "./dist/universal.esm.js",
       "require": "./dist/universal.cjs.js",
       "types": "./dist/universal.cjs.d.ts"
-    },
-    "./shared": {
-      "import": "./dist/shared.esm.js",
-      "require": "./dist/shared.cjs.js",
-      "types": "./dist/shared/.cjs.d.ts"
     }
   },
   "typesVersions": {
@@ -54,9 +49,6 @@
       "universal": [
         "./dist/universal.cjs.d.ts"
       ],
-      "shared": [
-        "./dist/shared.cjs.d.ts"
-      ],
       "babel-plugin": [
         "./dist/babel.cjs.d.ts"
       ]
@@ -74,7 +66,6 @@
     "@types/jest": "^29.5.11",
     "@types/node": "^17.0.45",
     "@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",
@@ -83,17 +74,14 @@
     "react-router": "^6.21.3",
     "react-test-renderer": "^18.2.0",
     "ts-jest": "29.0.1",
-    "tsup": "6.2.0",
     "webpack": "5.75.0"
   },
   "dependencies": {
     "fs-extra": "9.1.0",
-    "@module-federation/runtime": "0.6.9",
-    "@module-federation/sdk": "0.6.9"
+    "@module-federation/runtime": "0.6.10",
+    "@module-federation/sdk": "0.6.10"
   },
   "scripts": {
-    "dev": "cross-env WATCH=true tsup",
-    "build": "rm -rf dist && tsup",
     "test": "jest"
   }
 }

package/rollup.config.js

@@ -18,7 +18,6 @@ module.exports = (rollupConfig, _projectOptions) => {
     babel: 'packages/data-prefetch/src/cli/babel.ts',
     universal: 'packages/data-prefetch/src/universal/index.ts',
     plugin: 'packages/data-prefetch/src/plugin.ts',
-    shared: 'packages/data-prefetch/src/shared/index.ts',
   };
 
   if (Array.isArray(rollupConfig.output)) {

package/src/cli/index.ts

@@ -12,6 +12,7 @@ import type { Compiler, WebpackPluginInstance } from 'webpack';
 import { TEMP_DIR } from '../common/constant';
 import { fileExistsWithCaseSync, fixPrefetchPath } from '../common/node-utils';
 import { getPrefetchId } from '../common/runtime-utils';
+import { SHARED_STRATEGY } from '../constant';
 
 const { RuntimeGlobals, Template } = require(
   normalizeWebpackPath('webpack'),
@@ -48,12 +49,14 @@ export class PrefetchPlugin implements WebpackPluginInstance {
     }
 
     const runtimePath = path.resolve(__dirname, './plugin.esm.js');
-    const sharedPath = path.resolve(__dirname, './shared.esm.js');
     if (!this.options.runtimePlugins?.includes(runtimePath)) {
       this.options.runtimePlugins!.push(runtimePath);
     }
-    if (!this.options.runtimePlugins?.includes(sharedPath)) {
-      this.options.runtimePlugins!.push(sharedPath);
+    if (this.options.shareStrategy !== SHARED_STRATEGY) {
+      this.options.shareStrategy = SHARED_STRATEGY;
+      console.warn(
+        `[Module Federation Data Prefetch]: Your shared strategy is set to '${SHARED_STRATEGY}', this is a necessary condition for data prefetch`,
+      );
     }
 
     const encodedName = encodeName(name as string);

package/src/constant.ts

@@ -0,0 +1 @@
+export const SHARED_STRATEGY = 'loaded-first';

package/src/plugin.ts

@@ -4,6 +4,7 @@ import { ModuleInfo, getResourceUrl } from '@module-federation/sdk';
 import { getSignalFromManifest } from './common/runtime-utils';
 import { MFDataPrefetch } from './prefetch';
 import logger from './logger';
+import { SHARED_STRATEGY } from './constant';
 
 interface Loading {
   id: string;
@@ -15,8 +16,7 @@ interface Loading {
   >;
 }
 const loadingArray: Array<Loading> = [];
-const strategy = 'loaded-first';
-let sharedFlag = strategy;
+let sharedFlag = SHARED_STRATEGY;
 // eslint-disable-next-line max-lines-per-function
 export const prefetchPlugin = (): FederationRuntimePlugin => ({
   name: 'data-prefetch-runtime-plugin',
@@ -35,7 +35,7 @@ export const prefetchPlugin = (): FederationRuntimePlugin => ({
     if (!signal) {
       return options;
     }
-    if (sharedFlag !== strategy) {
+    if (sharedFlag !== SHARED_STRATEGY) {
       throw new Error(
         `[Module Federation Data Prefetch]: If you want to use data prefetch, the shared strategy must be 'loaded-first'`,
       );
@@ -109,7 +109,7 @@ export const prefetchPlugin = (): FederationRuntimePlugin => ({
       return options;
     }
 
-    if (sharedFlag !== strategy) {
+    if (sharedFlag !== SHARED_STRATEGY) {
       throw new Error(
         `[Module Federation Data Prefetch]: If you want to use data prefetch, the shared strategy must be 'loaded-first'`,
       );

package/dist/shared.cjs.d.ts

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

package/dist/shared.cjs.js

@@ -1,24 +0,0 @@
-'use strict';
-
-const sharedStrategy = ()=>({
-        name: 'shared-strategy',
-        beforeInit (args) {
-            const { userOptions } = args;
-            const shared = userOptions.shared;
-            if (shared) {
-                Object.keys(shared).forEach((sharedKey)=>{
-                    const sharedConfigs = shared[sharedKey];
-                    const arraySharedConfigs = Array.isArray(sharedConfigs) ? sharedConfigs : [
-                        sharedConfigs
-                    ];
-                    arraySharedConfigs.forEach((s)=>{
-                        s.strategy = 'loaded-first';
-                    });
-                });
-                console.warn(`[Module Federation Data Prefetch]: Your shared strategy is set to 'loaded-first', this is a necessary condition for data prefetch`);
-            }
-            return args;
-        }
-    });
-
-module.exports = sharedStrategy;

package/dist/shared.esm.d.ts

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

package/dist/shared.esm.js

@@ -1,22 +0,0 @@
-const sharedStrategy = ()=>({
-        name: 'shared-strategy',
-        beforeInit (args) {
-            const { userOptions } = args;
-            const shared = userOptions.shared;
-            if (shared) {
-                Object.keys(shared).forEach((sharedKey)=>{
-                    const sharedConfigs = shared[sharedKey];
-                    const arraySharedConfigs = Array.isArray(sharedConfigs) ? sharedConfigs : [
-                        sharedConfigs
-                    ];
-                    arraySharedConfigs.forEach((s)=>{
-                        s.strategy = 'loaded-first';
-                    });
-                });
-                console.warn(`[Module Federation Data Prefetch]: Your shared strategy is set to 'loaded-first', this is a necessary condition for data prefetch`);
-            }
-            return args;
-        }
-    });
-
-export { sharedStrategy as default };

package/dist/src/shared/index.d.ts

@@ -1,3 +0,0 @@
-import type { FederationRuntimePlugin } from '@module-federation/runtime';
-declare const sharedStrategy: () => FederationRuntimePlugin;
-export default sharedStrategy;

package/src/shared/index.ts

@@ -1,26 +0,0 @@
-import type { FederationRuntimePlugin } from '@module-federation/runtime';
-
-const sharedStrategy: () => FederationRuntimePlugin = () => ({
-  name: 'shared-strategy',
-  beforeInit(args) {
-    const { userOptions } = args;
-    const shared = userOptions.shared;
-    if (shared) {
-      Object.keys(shared).forEach((sharedKey) => {
-        const sharedConfigs = shared[sharedKey];
-        const arraySharedConfigs = Array.isArray(sharedConfigs)
-          ? sharedConfigs
-          : [sharedConfigs];
-        arraySharedConfigs.forEach((s) => {
-          s.strategy = 'loaded-first';
-        });
-      });
-      console.warn(
-        `[Module Federation Data Prefetch]: Your shared strategy is set to 'loaded-first', this is a necessary condition for data prefetch`,
-      );
-    }
-    return args;
-  },
-});
-
-export default sharedStrategy;

package/tsup.config.ts

@@ -1,35 +0,0 @@
-import { replace } from 'esbuild-plugin-replace';
-import minimist from 'minimist';
-import type { Options } from 'tsup';
-
-import pkg from './package.json';
-
-const args = minimist(process.argv.slice(2));
-const watch = process.env.WATCH;
-const sourceMap = args.sourcemap || args.s;
-
-export const tsup: Options = {
-  entry: [
-    'src/index.ts',
-    'src/react/index.ts',
-    'src/cli/index.ts',
-    'src/cli/babel.ts',
-    'src/universal/index.ts',
-    'src/plugin.ts',
-    'src/shared/index.ts',
-  ],
-  sourcemap: sourceMap,
-  clean: true,
-  dts: true,
-  watch: watch ? 'src/' : false,
-  format: ['esm', 'cjs'],
-  legacyOutput: true,
-  esbuildPlugins: [
-    replace({
-      __VERSION__: `'${pkg.version}'`,
-      __DEV__:
-        '(typeof process !== "undefined" && process.env && process.env.NODE_ENV ? (process.env.NODE_ENV !== "production") : false)',
-      __TEST__: 'false',
-    }),
-  ],
-};