Merge branch 'main' into revert-chunk-integration

# Conflicts:
#	pnpm-lock.yaml

.changeset/config.json

@@ -6,7 +6,7 @@
     [
       "@module-federation/runtime",
       "@module-federation/enhanced",
-      "@module-federation/enhanced-rspack",
+      "@module-federation/rspack",
       "@module-federation/webpack-bundler-runtime",
       "@module-federation/sdk",
       "@module-federation/runtime-tools",

.github/workflows/build-and-test.yml

@@ -1,16 +1,15 @@
 name: Build affected packages
 
 on:
-  push:
-    branches: ['main']
   pull_request:
+    branches: [main]
+
+  push:
+    branches: [main]
 
 jobs:
   main:
     runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.head_ref || github.run_id }}
-      cancel-in-progress: true
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3

.github/workflows/devtools.yml

@@ -1,19 +1,18 @@
 name: Devtools
 
 on:
-  push:
-    branches: ['main']
   pull_request:
+    branches: [main]
+
+  push:
+    branches: [main]
 
 env:
   PLAYWRIGHT_BROWSERS_PATH: 0 # Places binaries to node_modules/@playwright/test
 
 jobs:
   main:
     runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.head_ref || github.run_id }}
-      cancel-in-progress: true
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -26,7 +25,7 @@ jobs:
       - name: Setup Node.js 18
         uses: actions/setup-node@v3
         with:
-          node-version: '17'
+          node-version: '18'
           cache: 'pnpm'
 
       - name: Set Nx SHA
@@ -36,7 +35,7 @@ jobs:
         run: pnpm install
 
       - name: Run Affected Build
-        run: npx nx affected -t build --parallel=10 --exclude='*,!tag:package'
+        run: npx nx build --parallel=10 --exclude='*,!tag:package'
 
       - name: Configuration xvfb
         shell: bash

.github/workflows/issue-close-require.yml

@@ -4,15 +4,23 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+permissions:
+  contents: read
+
 jobs:
-  close-issues:
-    if: github.repository == 'vitejs/vite'
+  issue-close-require:
+    permissions:
+      issues: write
     runs-on: ubuntu-latest
+    if: github.repository == 'module-federation/universe'
     steps:
       - name: need reproduction
         uses: actions-cool/issues-helper@v3
         with:
           actions: 'close-issues'
-          token: ${{ secrets.GITHUB_TOKEN }}
           labels: 'need reproduction'
           inactive-day: 5
+          body: |
+            As the issue was labelled with `need reproduction`, but no response in 5 days. This issue will be closed. Feel free to comment and reopen it if you have any further questions. For background, see [Why reproductions are required](https://antfu.me/posts/why-reproductions-are-required).
+
+            由于该 issue 被标记为 "需要重现"，但在 5 天内没有回应，因此该 issue 将被关闭。如果你有任何进一步的问题，请随时发表评论并重新打开该 issue。背景请参考 [为什么需要最小重现](https://antfu.me/posts/why-reproductions-are-required-zh)。

.prettierignore

@@ -6,4 +6,5 @@
 *.md
 !README.md
 pnpm-lock.yaml
-**/dist/**
+**/dist/**
+apps/website-new/docs

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "diffEditor.wordWrap": "on"
+}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ScriptedAlchemy LLC (Zack Jackson)
+Copyright (c) 2020 ScriptedAlchemy LLC (Zack Jackson) Zhou Shaw (zhouxiao)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -12,21 +12,34 @@
 
 - Module Federation reuses common dependencies between modules as much as possible
 
-[Learn more](https://module-federation.io/docs/en/mf-docs/0.2/getting-started/)
+[Learn more](https://module-federation.io/)
 
 ## 🔥 What does universe offer?
 
 The universe repository provides a set of tools to enhance module federation's capabilities. These include:
 
-- [Next.js Module Federation](./packages/nextjs-mf)
+- [Module Federation Runtime](https://module-federation.io/guide/basic/runtime.html)
+- [Rspack Module Federation](https://module-federation.io/guide/basic/rspack.html)
+- [Webpack Module Federation](https://module-federation.io/guide/basic/webpack.html)
+- [Next.js Module Federation](https://module-federation.io/guide/framework/nextjs.html)
+
+## 📚 Getting Started
+
+To get started with Module Federation, see the [Quick Start](https://module-federation.io/guide/start/quick-start.html).
+
+
+## 📦 Packages
+
+Some of the underlying dependencies of the past are listed here, and [enhanced](https://module-federation.io/) access is recommended for direct use.
+
 - [Node Module Federation](./packages/node)
 - [Storybook addon for Module Federation](./packages/storybook-addon)
 - [Native federation typescript](./packages/native-federation-typescript)
 - [Utilities](./packages/utilities)
 
 # 🧑‍💻 Community
 
-Come and chat with us on [Discord](https://discord.com/invite/T8c6yAxkbv)! The Module federation team and users are active there, and we're always looking for contributions.
+Come and chat with us on [Discussions](https://github.com/module-federation/universe/discussions)! The Module federation team and users are active there, and we're always looking for contributions.
 
 # 🤝 Contribution
 

apps/manifest-demo/3008-webpack-host/@mf-types/index.d.ts

@@ -0,0 +1,19 @@
+import type { PackageType as PackageType_0,RemoteKeys as RemoteKeys_0 } from './manifest-provider/apis.d.ts';
+import type { PackageType as PackageType_1,RemoteKeys as RemoteKeys_1 } from './js-entry-provider/apis.d.ts';
+    declare module "@module-federation/runtime" {
+      type RemoteKeys = RemoteKeys_0 | RemoteKeys_1;
+      type PackageType<T, Y=any> = T extends RemoteKeys_0 ? PackageType_0<T> :
+T extends RemoteKeys_1 ? PackageType_1<T> :
+Y ;
+      export function loadRemote<T extends RemoteKeys,Y>(packageName: T): Promise<PackageType<T, Y>>;
+      export function loadRemote<T extends string,Y>(packageName: T): Promise<PackageType<T, Y>>;
+    }
+declare module "@module-federation/runtime-tools" {
+      type RemoteKeys = RemoteKeys_0 | RemoteKeys_1;
+      type PackageType<T, Y=any> = T extends RemoteKeys_0 ? PackageType_0<T> :
+T extends RemoteKeys_1 ? PackageType_1<T> :
+Y ;
+      export function loadRemote<T extends RemoteKeys,Y>(packageName: T): Promise<PackageType<T, Y>>;
+      export function loadRemote<T extends string,Y>(packageName: T): Promise<PackageType<T, Y>>;
+    }
+

apps/manifest-demo/3008-webpack-host/@mf-types/js-entry-provider/Component.d.ts

@@ -0,0 +1,2 @@
+export * from './compiled-types/apps/manifest-demo/3012-rspack-js-entry-provider/src/App';
+export { default } from './compiled-types/apps/manifest-demo/3012-rspack-js-entry-provider/src/App';

apps/manifest-demo/3008-webpack-host/@mf-types/js-entry-provider/apis.d.ts

@@ -0,0 +1,3 @@
+
+    export type RemoteKeys = 'js-entry-provider/Component';
+    type PackageType<T> = T extends 'js-entry-provider/Component' ? typeof import('js-entry-provider/Component') :any;

apps/manifest-demo/3008-webpack-host/@mf-types/js-entry-provider/compiled-types/apps/manifest-demo/3012-rspack-js-entry-provider/src/App.d.ts

@@ -0,0 +1,2 @@
+export default App;
+declare function App(): import("react/jsx-runtime").JSX.Element;

apps/manifest-demo/3008-webpack-host/@mf-types/js-entry-provider/compiled-types/apps/manifest-demo/3012-rspack-js-entry-provider/src/asyncFile.d.ts

@@ -0,0 +1,2 @@
+declare const _default: "async file";
+export default _default;

apps/manifest-demo/3008-webpack-host/@mf-types/manifest-provider/Component.d.ts

@@ -0,0 +1,2 @@
+export * from './compiled-types/apps/manifest-demo/3011-rspack-manifest-provider/src/App';
+export { default } from './compiled-types/apps/manifest-demo/3011-rspack-manifest-provider/src/App';

apps/manifest-demo/3008-webpack-host/@mf-types/manifest-provider/apis.d.ts

@@ -0,0 +1,3 @@
+
+    export type RemoteKeys = 'manifest-provider/Component';
+    type PackageType<T> = T extends 'manifest-provider/Component' ? typeof import('manifest-provider/Component') :any;

apps/manifest-demo/3008-webpack-host/@mf-types/manifest-provider/compiled-types/apps/manifest-demo/3011-rspack-manifest-provider/src/App.d.ts

@@ -0,0 +1,2 @@
+export default App;
+declare function App(): import("react/jsx-runtime").JSX.Element;

apps/manifest-demo/3008-webpack-host/@mf-types/manifest-provider/compiled-types/apps/manifest-demo/3011-rspack-manifest-provider/src/asyncFile.d.ts

@@ -0,0 +1,2 @@
+declare const _default: "async file";
+export default _default;

apps/manifest-demo/3008-webpack-host/webpack.config.js

@@ -1,7 +1,9 @@
 const path = require('path');
 const { registerPluginTSTranspiler } = require('nx/src/utils/nx-plugin.js');
 registerPluginTSTranspiler();
-const { ModuleFederationPlugin } = require('@module-federation/enhanced');
+const {
+  ModuleFederationPlugin,
+} = require('@module-federation/enhanced/webpack');
 const { composePlugins, withNx } = require('@nx/webpack');
 const { withReact } = require('@nx/react');
 

apps/manifest-demo/3009-webpack-provider/src/components/WebpackPng.tsx

@@ -1,5 +1,9 @@
 import png from '../../public/webpack.png';
 
 export default function WebpackPng() {
-  return <img className="remote1-webpack-png" src={png} alt="webpack png" />;
+  return (
+    <div>
+      <img className="remote1-webpack-png" src={png} alt="webpack png" />
+    </div>
+  );
 }

apps/manifest-demo/3009-webpack-provider/webpack.config.js

@@ -4,7 +4,9 @@ registerPluginTSTranspiler();
 const { composePlugins, withNx } = require('@nx/webpack');
 const { withReact } = require('@nx/react');
 
-const { ModuleFederationPlugin } = require('@module-federation/enhanced');
+const {
+  ModuleFederationPlugin,
+} = require('@module-federation/enhanced/webpack');
 
 module.exports = composePlugins(
   withNx(),

apps/modernjs/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @module-federation/modernjs
 
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies [c1efbbf]
+- Updated dependencies [c8c0ad2]
+- Updated dependencies [1bb03d1]
+- Updated dependencies [1bb03d1]
+  - @module-federation/enhanced@0.1.2
+
 ## 0.1.6
 
 ### Patch Changes

apps/modernjs/modern.config.ts

@@ -31,7 +31,12 @@ export default defineConfig({
           exposes: {
             './thing': './src/test.ts',
           },
-          runtimePlugins: ['./runtimePlugin.ts'],
+          runtimePlugins: [
+            {
+              import: './runtimePlugin.ts',
+              async: true,
+            },
+          ],
           shared: {
             react: { singleton: true },
             'react-dom': { singleton: true },

apps/modernjs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@module-federation/modernjs",
   "private": true,
-  "version": "0.1.6",
+  "version": "0.1.7",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
     "dev": "modern dev",