diff --git a/apollo-client/app1/config/module-federation.js b/apollo-client/app1/config/module-federation.js index f515c73173f..bd94bbaebd9 100644 --- a/apollo-client/app1/config/module-federation.js +++ b/apollo-client/app1/config/module-federation.js @@ -1,13 +1,19 @@ const deps = require('../package.json').dependencies; -const { ModuleFederationPlugin } = require('@module-federation/enhanced'); -const rspack = require('@rspack/core') -module.exports = (FederationPlugin)=> { -// let FederationPlugin; -// if(type === 'rspack') { -// FederationPlugin = rspack.container.ModuleFederationPlugin -// } else if(type === 'uni') - return { +const sharedDependencies = { + react: { requiredVersion: deps.react, eager: true }, + 'react-dom': deps['react-dom'], + graphql: { requiredVersion: deps.graphql, eager: true }, + '@apollo/client': { + eager: true, + singleton: true, + requiredVersion: deps['@apollo/client'], + }, + 'node-fetch': deps['node-fetch'], + 'serialize-javascript': deps['serialize-javascript'], +}; + +module.exports = (FederationPlugin) => ({ client: new FederationPlugin({ remoteType: 'script', name: 'app1', @@ -15,49 +21,19 @@ module.exports = (FederationPlugin)=> { remotes: { app2: 'app2@http://localhost:3001/static/remoteEntry.js', }, - shared: [ - { - react: {requiredVersion: deps.react, eager: true}, - 'react-dom': deps['react-dom'], - graphql: {requiredVersion: deps.graphql, eager: true}, - '@apollo/client': { - eager: true, - singleton: true, - requiredVersion: deps['@apollo/client'], - }, - 'node-fetch': deps['node-fetch'], - 'serialize-javascript': deps['serialize-javascript'], - }, - ], + shared: sharedDependencies, }), - server -: - [ + server: [ new FederationPlugin({ remoteType: 'script', - isServer: true, name: 'app1', - library: {type: 'commonjs-module'}, + library: { type: 'commonjs-module', name: 'app1' }, filename: 'remoteEntry.js', remotes: { app2: 'app2@http://localhost:3001/server/remoteEntry.js', }, runtimePlugins: [require.resolve('@module-federation/node/runtimePlugin')], - shared: [ - { - react: {requiredVersion: deps.react, eager: true}, - 'react-dom': deps['react-dom'], - graphql: {requiredVersion: deps.graphql, eager: true}, - '@apollo/client': { - eager: true, - singleton: true, - requiredVersion: deps['@apollo/client'], - }, - 'node-fetch': deps['node-fetch'], - 'serialize-javascript': deps['serialize-javascript'], - }, - ], + shared: sharedDependencies, }), - ] -} -} + ], +}); diff --git a/apollo-client/app1/config/rspack.client.js b/apollo-client/app1/config/rspack.client.js index 3fb72702014..818bdd84eb4 100644 --- a/apollo-client/app1/config/rspack.client.js +++ b/apollo-client/app1/config/rspack.client.js @@ -1,8 +1,8 @@ const path = require('path'); const { merge } = require('webpack-merge'); -const shared = require('./webpack.shared'); -const rspack = require('@rspack/core') -const moduleFederationPlugin = require('./module-federation'); +const sharedConfig = require('./webpack.shared'); +const { ModuleFederationPlugin } = require('@module-federation/enhanced/rspack'); +const getModuleFederationPlugin = require('./module-federation'); /** * @type {import('webpack').Configuration} @@ -19,7 +19,7 @@ const webpackConfig = { chunkFilename: '[name].js', publicPath: 'http://localhost:3000/static/', }, - plugins: [moduleFederationPlugin(rspack.container.ModuleFederationPlugin).client], + plugins: [getModuleFederationPlugin(ModuleFederationPlugin).client], }; -module.exports = merge(shared, webpackConfig); +module.exports = merge(sharedConfig, webpackConfig); diff --git a/apollo-client/app1/config/rspack.server.js b/apollo-client/app1/config/rspack.server.js index f6922812247..94b4786afd0 100644 --- a/apollo-client/app1/config/rspack.server.js +++ b/apollo-client/app1/config/rspack.server.js @@ -1,8 +1,8 @@ const path = require('path'); const { merge } = require('webpack-merge'); const shared = require('./webpack.shared'); -const moduleFederationPlugin = require('./module-federation'); -const rspack = require('@rspack/core'); +const { ModuleFederationPlugin } = require('@module-federation/enhanced/rspack'); +const getModuleFederationPlugin = require('./module-federation'); /** * @type {import('webpack').Configuration} @@ -14,14 +14,16 @@ const webpackConfig = { output: { path: path.resolve(__dirname, '../dist/server'), filename: '[name].js', + chunkFilename: '[name]-[contenthash].js', libraryTarget: 'commonjs-module', }, externals: ['express'], mode: 'production', - plugins: [...moduleFederationPlugin(rspack.container.ModuleFederationPlugin).server], + plugins: [...getModuleFederationPlugin(ModuleFederationPlugin).server], stats: { colors: true, }, }; module.exports = merge(shared, webpackConfig); + diff --git a/apollo-client/app1/config/webpack.client.js b/apollo-client/app1/config/webpack.client.js index bfe9d355468..9fb6086eab8 100644 --- a/apollo-client/app1/config/webpack.client.js +++ b/apollo-client/app1/config/webpack.client.js @@ -2,7 +2,7 @@ const path = require('path'); const { merge } = require('webpack-merge'); const shared = require('./webpack.shared'); const moduleFederationPlugin = require('./module-federation'); -const { ModuleFederationPlugin } = require('@module-federation/enhanced'); +const { ModuleFederationPlugin } = require('@module-federation/enhanced/webpack'); /** * @type {import('webpack').Configuration} diff --git a/apollo-client/app1/config/webpack.server.js b/apollo-client/app1/config/webpack.server.js index 75075e11a42..73d9e5dd205 100644 --- a/apollo-client/app1/config/webpack.server.js +++ b/apollo-client/app1/config/webpack.server.js @@ -2,7 +2,7 @@ const path = require('path'); const { merge } = require('webpack-merge'); const shared = require('./webpack.shared'); const moduleFederationPlugin = require('./module-federation'); -const { UniversalFederationPlugin } = require('@module-federation/node'); +const { ModuleFederationPlugin } = require('@module-federation/enhanced/webpack'); /** * @type {import('webpack').Configuration} @@ -13,12 +13,12 @@ const webpackConfig = { entry: ['@babel/polyfill', path.resolve(__dirname, '../src/server/index')], output: { path: path.resolve(__dirname, '../dist/server'), - filename: '[name].js', + filename: '[name]-[contenthash].js', libraryTarget: 'commonjs-module', }, externals: ['express'], mode: 'production', - plugins: [...moduleFederationPlugin(UniversalFederationPlugin).server], + plugins: [...moduleFederationPlugin(ModuleFederationPlugin).server], stats: { colors: true, }, diff --git a/apollo-client/app1/package.json b/apollo-client/app1/package.json index f89fd63f662..765dd8fd012 100644 --- a/apollo-client/app1/package.json +++ b/apollo-client/app1/package.json @@ -3,7 +3,8 @@ "version": "0.0.0", "scripts": { "legacy:start": "pnpm legacy:build && pnpm serve", - "serve": "node dist/server/main.js", + "start": "pnpm build && pnpm serve", + "serve": "wait-on tcp:3002 && node dist/server/main.js", "legacy:build": "pnpm build:server:legacy && pnpm build:client:legacy", "build": "pnpm build:server && pnpm build:client", "build:client:legacy": "rimraf dist/client && webpack --mode production --progress --config config/webpack.client.js", @@ -41,8 +42,8 @@ "webpack": "5.91.0", "webpack-cli": "4.10.0", "webpack-merge": "5.10.0", - "@rspack/core": "0.6.5", - "@rspack/cli": "0.6.5", - "@rspack/dev-server": "0.6.5" + "@rspack/core": "0.7.0-beta.0", + "@rspack/cli": "0.7.0-beta.0", + "@rspack/dev-server": "0.7.0-beta.0" } -} \ No newline at end of file +} diff --git a/apollo-client/app1/src/client/components/App.tsx b/apollo-client/app1/src/client/components/App.tsx index c84c6d90168..205f020ecde 100755 --- a/apollo-client/app1/src/client/components/App.tsx +++ b/apollo-client/app1/src/client/components/App.tsx @@ -2,6 +2,8 @@ import React from 'react'; import { Helmet } from 'react-helmet'; import type { PokemonListProps } from 'app2/PokemonList'; + +console.log(import('app2/PokemonList')); const PokemonList = React.lazy( () => import('app2/PokemonList') as Promise<{ default: React.FC }>, ); diff --git a/apollo-client/app1/src/server/render.tsx b/apollo-client/app1/src/server/render.tsx index dd6c2f58d60..e542982e909 100644 --- a/apollo-client/app1/src/server/render.tsx +++ b/apollo-client/app1/src/server/render.tsx @@ -2,14 +2,13 @@ import React from 'react'; import { Helmet } from 'react-helmet'; import { ApolloProvider } from '@apollo/client'; import { renderToStringWithData } from '@apollo/client/react/ssr'; -// import { renderToStaticMarkup } from 'react-dom/server'; import serialize from 'serialize-javascript'; -import fetch from 'node-fetch'; import App from '../client/components/App'; import { createApolloClient } from '../client/apolloClient'; export default async (req, res, next) => { + const fetch = (await import('node-fetch')).default const helmet = Helmet.renderStatic(); const { apolloClient } = createApolloClient({ @@ -47,3 +46,4 @@ export default async (req, res, next) => { res.write(''); res.send(); }; + diff --git a/apollo-client/app2/config/module-federation.js b/apollo-client/app2/config/module-federation.js index 5036ede6d43..aa5cf3d60eb 100644 --- a/apollo-client/app2/config/module-federation.js +++ b/apollo-client/app2/config/module-federation.js @@ -27,10 +27,9 @@ module.exports = (FederationPlugin) => { server: [ new FederationPlugin({ remoteType: 'script', - isServer: true, runtimePlugins:[require.resolve('@module-federation/node/runtimePlugin')], name: 'app2', - library: {type: 'commonjs-module'}, + library: {type: 'commonjs-module',name: 'app2'}, filename: 'remoteEntry.js', exposes: { './PokemonList': './src/client/components/PokemonList', diff --git a/apollo-client/app2/config/rspack.client.js b/apollo-client/app2/config/rspack.client.js index ee8fa6b3b90..1f473e81eea 100644 --- a/apollo-client/app2/config/rspack.client.js +++ b/apollo-client/app2/config/rspack.client.js @@ -1,7 +1,7 @@ const path = require('path'); const { merge } = require('webpack-merge'); const shared = require('./webpack.shared'); -const rspack = require('@rspack/core') +const {ModuleFederationPlugin} = require('@module-federation/enhanced/rspack') const moduleFederationPlugin = require('./module-federation'); /** @@ -19,7 +19,7 @@ const webpackConfig = { chunkFilename: '[name].js', publicPath: 'http://localhost:3001/static/', }, - plugins: [moduleFederationPlugin(rspack.container.ModuleFederationPlugin).client], + plugins: [moduleFederationPlugin(ModuleFederationPlugin).client], }; module.exports = merge(shared, webpackConfig); diff --git a/apollo-client/app2/config/rspack.server.js b/apollo-client/app2/config/rspack.server.js index f6922812247..7f5b303d779 100644 --- a/apollo-client/app2/config/rspack.server.js +++ b/apollo-client/app2/config/rspack.server.js @@ -2,7 +2,7 @@ const path = require('path'); const { merge } = require('webpack-merge'); const shared = require('./webpack.shared'); const moduleFederationPlugin = require('./module-federation'); -const rspack = require('@rspack/core'); +const {ModuleFederationPlugin} = require('@module-federation/enhanced/rspack') /** * @type {import('webpack').Configuration} @@ -18,7 +18,7 @@ const webpackConfig = { }, externals: ['express'], mode: 'production', - plugins: [...moduleFederationPlugin(rspack.container.ModuleFederationPlugin).server], + plugins: [...moduleFederationPlugin(ModuleFederationPlugin).server], stats: { colors: true, }, diff --git a/apollo-client/app2/config/webpack.client.js b/apollo-client/app2/config/webpack.client.js index 5c92a063a7c..af486bd3d59 100644 --- a/apollo-client/app2/config/webpack.client.js +++ b/apollo-client/app2/config/webpack.client.js @@ -2,7 +2,7 @@ const path = require('path'); const { merge } = require('webpack-merge'); const shared = require('./webpack.shared'); const moduleFederationPlugin = require('./module-federation'); -const { ModuleFederationPlugin } = require('@module-federation/enhanced'); +const { ModuleFederationPlugin } = require('@module-federation/enhanced/webpack'); /** * @type {import('webpack').Configuration} diff --git a/apollo-client/app2/config/webpack.server.js b/apollo-client/app2/config/webpack.server.js index 75075e11a42..b246cf49563 100644 --- a/apollo-client/app2/config/webpack.server.js +++ b/apollo-client/app2/config/webpack.server.js @@ -2,7 +2,7 @@ const path = require('path'); const { merge } = require('webpack-merge'); const shared = require('./webpack.shared'); const moduleFederationPlugin = require('./module-federation'); -const { UniversalFederationPlugin } = require('@module-federation/node'); +const { ModuleFederationPlugin } = require('@module-federation/enhanced/webpack'); /** * @type {import('webpack').Configuration} @@ -18,7 +18,7 @@ const webpackConfig = { }, externals: ['express'], mode: 'production', - plugins: [...moduleFederationPlugin(UniversalFederationPlugin).server], + plugins: [...moduleFederationPlugin(ModuleFederationPlugin).server], stats: { colors: true, }, diff --git a/apollo-client/app2/package.json b/apollo-client/app2/package.json index 23f4009c4df..6dc25206adf 100644 --- a/apollo-client/app2/package.json +++ b/apollo-client/app2/package.json @@ -3,7 +3,8 @@ "version": "0.0.0", "scripts": { "legacy:start": "pnpm legacy:build && pnpm serve", - "serve": "node dist/server/main.js", + "start": "pnpm build && pnpm serve", + "serve": "sleep 3 && node dist/server/main.js", "legacy:build": "pnpm build:server:legacy && pnpm build:client:legacy", "build": "pnpm build:server && pnpm build:client", "build:client:legacy": "rimraf dist/client && webpack --mode production --progress --config config/webpack.client.js", @@ -41,8 +42,8 @@ "webpack": "5.91.0", "webpack-cli": "4.10.0", "webpack-merge": "5.10.0", - "@rspack/core": "0.6.5", - "@rspack/cli": "0.6.5", - "@rspack/dev-server": "0.6.5" + "@rspack/core": "0.7.0-beta.0", + "@rspack/cli": "0.7.0-beta.0", + "@rspack/dev-server": "0.7.0-beta.0" } -} \ No newline at end of file +} diff --git a/apollo-client/package.json b/apollo-client/package.json index d1ec96842c4..262559cf6fd 100644 --- a/apollo-client/package.json +++ b/apollo-client/package.json @@ -1,6 +1,6 @@ { "name": "apollo-client", - "description": "This example demonstrates using Apollo Client with Module Federation.", + "description": "Example demonstrating Apollo Client with Module Federation.", "version": "0.0.0", "scripts": { "legacy:start": "pnpm --filter apollo-client_* --parallel legacy:start", @@ -8,11 +8,11 @@ "start": "pnpm --filter apollo-client_* --parallel start", "serve": "pnpm --filter apollo-client_* --parallel serve", "build": "pnpm --filter apollo-client_* --parallel build", - "e2e:ci": "pnpm build && pnpm serve & sleep 2 && wait-on tcp:3000 && wait-on tcp:3001 && npx cypress run --config-file ../cypress-e2e/config/cypress.config.ts --config '{\"supportFile\": \"../cypress-e2e/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome", - "legacy:e2e:ci": "kill-port 3000 && kill-port 3001 && pnpm legacy:build && pnpm serve & sleep 20 && wait-on tcp:3000 && wait-on tcp:3001 && npx cypress run --config-file ../cypress-e2e/config/cypress.config.ts --config '{\"supportFile\": \"../cypress-e2e/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome" + "e2e:ci": "pnpm build && pnpm serve & sleep 30 && npx cypress run --config-file ../cypress-e2e/config/cypress.config.ts --config '{\"supportFile\": \"../cypress-e2e/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome", + "legacy:e2e:ci": "kill-port 3000 && kill-port 3001 && pnpm legacy:build && pnpm serve & sleep 60 && npx cypress run --config-file ../cypress-e2e/config/cypress.config.ts --config '{\"supportFile\": \"../cypress-e2e/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome" }, "devDependencies": { - "wait-on": "7.2.0", - "kill-port": "2.0.1" + "wait-on": "^7.2.0", + "kill-port": "^2.0.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7866f27c91..9d16006cff1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1270,10 +1270,10 @@ importers: apollo-client: devDependencies: kill-port: - specifier: 2.0.1 + specifier: ^2.0.1 version: 2.0.1 wait-on: - specifier: 7.2.0 + specifier: ^7.2.0 version: 7.2.0 apollo-client/app1: @@ -1331,14 +1331,14 @@ importers: specifier: 2.2.6 version: 2.2.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.5)(vue-tsc@1.8.27)(webpack@5.91.0) '@rspack/cli': - specifier: 0.6.5 - version: 0.6.5(@rspack/core@0.6.5)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) + specifier: 0.7.0-beta.0 + version: 0.7.0-beta.0(@rspack/core@0.7.0-beta.0)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) '@rspack/core': - specifier: 0.6.5 - version: 0.6.5(@swc/helpers@0.5.3) + specifier: 0.7.0-beta.0 + version: 0.7.0-beta.0 '@rspack/dev-server': - specifier: 0.6.5 - version: 0.6.5(@rspack/core@0.6.5)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) + specifier: 0.7.0-beta.0 + version: 0.7.0-beta.0(@rspack/core@0.7.0-beta.0)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) '@types/express': specifier: 4.17.21 version: 4.17.21 @@ -1425,14 +1425,14 @@ importers: specifier: 2.2.6 version: 2.2.6(react-dom@18.2.0)(react@18.2.0)(typescript@5.4.5)(vue-tsc@1.8.27)(webpack@5.91.0) '@rspack/cli': - specifier: 0.6.5 - version: 0.6.5(@rspack/core@0.6.5)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) + specifier: 0.7.0-beta.0 + version: 0.7.0-beta.0(@rspack/core@0.7.0-beta.0)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) '@rspack/core': - specifier: 0.6.5 - version: 0.6.5(@swc/helpers@0.5.3) + specifier: 0.7.0-beta.0 + version: 0.7.0-beta.0 '@rspack/dev-server': - specifier: 0.6.5 - version: 0.6.5(@rspack/core@0.6.5)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) + specifier: 0.7.0-beta.0 + version: 0.7.0-beta.0(@rspack/core@0.7.0-beta.0)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) '@types/express': specifier: 4.17.21 version: 4.17.21 @@ -35998,6 +35998,14 @@ packages: tslib: 2.6.2 dev: true + /@nrwl/devkit@16.0.0(nx@16.0.0): + resolution: {integrity: sha512-ycd4wD4v1N/ywjU1cwTVCPQJwxnGjEsWIll5z5cMtfHwJf+0OhMTqC3zeZibIwnjjoh721pyEzXODyUmjkGmVw==} + dependencies: + '@nx/devkit': 16.0.0(nx@16.0.0) + transitivePeerDependencies: + - nx + dev: true + /@nrwl/devkit@16.0.0(nx@17.3.2): resolution: {integrity: sha512-ycd4wD4v1N/ywjU1cwTVCPQJwxnGjEsWIll5z5cMtfHwJf+0OhMTqC3zeZibIwnjjoh721pyEzXODyUmjkGmVw==} dependencies: @@ -37148,7 +37156,7 @@ packages: peerDependencies: nx: '>= 15 <= 17' dependencies: - '@nrwl/devkit': 16.0.0(nx@17.3.2) + '@nrwl/devkit': 16.0.0(nx@16.0.0) ejs: 3.1.9 ignore: 5.3.1 nx: 16.0.0 @@ -40418,6 +40426,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-darwin-arm64@0.7.0-beta.0: + resolution: {integrity: sha512-wROwYqJoTEjMh7DSYIui77KPHCED5Zrsb9VGXMXJNVcZhLr2pgWtK0d26u7iB1Qxkzwlee+njS42LdUQEgRoPQ==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@rspack/binding-darwin-x64@0.4.5: resolution: {integrity: sha512-K5HgE4nHwVWizCr2pBLA8N3LXfn1lQCSV5sR+6xQQrVdvRJ5zBhPMwjPOzP+AdmGhrD14zz1j9mktzCvA7FUtg==} cpu: [x64] @@ -40449,6 +40465,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-darwin-x64@0.7.0-beta.0: + resolution: {integrity: sha512-Yfgn58TFcvOMeqfsY2oHRE3K232aAa0tUoY4XDx8EytH/Kl9vLp59AqE/Uw36kpwCkal27ae9UGbB2uq5hrgaw==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@rspack/binding-linux-arm64-gnu@0.4.5: resolution: {integrity: sha512-JvESc3imqKbqwal5WesxlV3ix8eIO/07XCj+pkaZWaf4nj/ui02NGtLaeLVxwc1fxHekdLc+ROQrxpdOLhQ1jw==} cpu: [arm64] @@ -40480,6 +40504,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-linux-arm64-gnu@0.7.0-beta.0: + resolution: {integrity: sha512-udVUxnqO/D7jvTex4K28Zt0NcRdw9t4Nxk3oweb8kdKxJM492ubvl1dXAYfapZ13tEGXBXLewhNYDnEc2D0odg==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rspack/binding-linux-arm64-musl@0.4.5: resolution: {integrity: sha512-ziYGYEoLsPEyC0pEAj5clU8XOFr3+r7IExm9/sq2gp+M1as/yTzouEuzO3D8kI0xVfub1WmiEktTBlgjS13CSA==} cpu: [arm64] @@ -40511,6 +40543,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-linux-arm64-musl@0.7.0-beta.0: + resolution: {integrity: sha512-++dBCrk3QeavbrTnOYYcWenDlsbsgFbrd2iJBfiICN04ooV0wRJCn7QCp2bJmkbKfHCPopLnbjS+clrX7C9AhQ==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rspack/binding-linux-x64-gnu@0.4.5: resolution: {integrity: sha512-9cXOIswpSZYhEXeuIWdsQNrgpjHTD4I3v0NPm75cL6cdBtJMHOa/qejO5mdTLzoDdE7waGZAb4uSMfrJOEkwqQ==} cpu: [x64] @@ -40542,6 +40582,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-linux-x64-gnu@0.7.0-beta.0: + resolution: {integrity: sha512-LJjk9vI/g0gys4ZAwaf0SXGI2fOF4xdNwkqUe5Ke0QNe/Jq93S0enThVw4wS2lYw8bx8WdfUc0Zms4fCDgRLpg==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rspack/binding-linux-x64-musl@0.4.5: resolution: {integrity: sha512-wClTj9mbVKprHIWsLEVJg+ZXT5slF93JsyAALIhAFkNMmn5z0B2NPD7+Oaii62edKMk2nS3dpoHu1JCLDmP0cw==} cpu: [x64] @@ -40573,6 +40621,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-linux-x64-musl@0.7.0-beta.0: + resolution: {integrity: sha512-pMLXrtqOk+If3r2aF2aRDbLo7A4Kko5/cZq5v+3nst9Y3eHDISGQO/3hJ9vQORm8HfJ/FL2scS0o13772xxLGQ==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rspack/binding-win32-arm64-msvc@0.4.5: resolution: {integrity: sha512-8LNITZqPMKO69nc8hwdcweBXcAS4yAL5W/kZ6zKeb6Ly+X5SBZk7l0WPL7lPMib/vHFkjJjp1buGhzymLU0bzA==} cpu: [arm64] @@ -40604,6 +40660,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-win32-arm64-msvc@0.7.0-beta.0: + resolution: {integrity: sha512-I6+UJBmUXEASeK4v0C+flHOyWB+RY3/6V7oKGi7nNS45d8ENAanfxpQ5z/ER+cOUZDOV7npMj9h7f5xINU+0Xg==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rspack/binding-win32-ia32-msvc@0.4.5: resolution: {integrity: sha512-dndiXygG1ZmSO3unuZ9Mc+7IvqBtFqwvjFZGKUdIcufFr2CjZDL/KR1zJGTmFIzwHKMV2hEH4cZpa2TwisXvGQ==} cpu: [ia32] @@ -40635,6 +40699,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-win32-ia32-msvc@0.7.0-beta.0: + resolution: {integrity: sha512-3+kSOCzNExgTc4KxbeGeGwTKlOgGZ7L2bRIZazR2I/xoIBN0Aa2pVL6iSJ8AHSxS3sF6uIM+RoKtjlFxoz3FAw==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rspack/binding-win32-x64-msvc@0.4.5: resolution: {integrity: sha512-SEu8+pQsnGP7A0/XX5vawsccR825UCOzK5phJ8INSC7Mse8FKzkZpv2Af3PsHl2+N17M0PRgBxTghXR35PXkiw==} cpu: [x64] @@ -40666,6 +40738,14 @@ packages: requiresBuild: true optional: true + /@rspack/binding-win32-x64-msvc@0.7.0-beta.0: + resolution: {integrity: sha512-HoM/At5z58MHSWYDkUd7vtsGxuKdoN5SSFtc4TEWEkne4HHflHBgEogq4nHKx+0/VZK0Qp40uqhU0cJwwcp52w==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rspack/binding@0.4.5: resolution: {integrity: sha512-XmSlt9ucpfebhkWI4guPEym0F+8JZGr8UyBVAtHN2/7SQRI8TL8G1BUQGVgmc7+UKA5RM1Qfps1QmtHYzjARBQ==} optionalDependencies: @@ -40721,6 +40801,20 @@ packages: '@rspack/binding-win32-ia32-msvc': 0.6.5 '@rspack/binding-win32-x64-msvc': 0.6.5 + /@rspack/binding@0.7.0-beta.0: + resolution: {integrity: sha512-MVUyEzn4DMuOIWc/FuRJcF7ZaOPZ3JvBYpAyLQJw1itx9Em5ujLLvfW3WcfMJSmqVfD1LiwzOhhcEiPR2myDjA==} + optionalDependencies: + '@rspack/binding-darwin-arm64': 0.7.0-beta.0 + '@rspack/binding-darwin-x64': 0.7.0-beta.0 + '@rspack/binding-linux-arm64-gnu': 0.7.0-beta.0 + '@rspack/binding-linux-arm64-musl': 0.7.0-beta.0 + '@rspack/binding-linux-x64-gnu': 0.7.0-beta.0 + '@rspack/binding-linux-x64-musl': 0.7.0-beta.0 + '@rspack/binding-win32-arm64-msvc': 0.7.0-beta.0 + '@rspack/binding-win32-ia32-msvc': 0.7.0-beta.0 + '@rspack/binding-win32-x64-msvc': 0.7.0-beta.0 + dev: true + /@rspack/cli@0.6.5(@rspack/core@0.6.5)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0): resolution: {integrity: sha512-lIby0i6M0FE1V6ldzNXL0ESFJk4tzv1bKgl68cjfn0R2wNUD+uhT64cUJf1cg26xibSykqxuxmKgv4WxqED3lA==} hasBin: true @@ -40797,6 +40891,32 @@ packages: - webpack - webpack-cli + /@rspack/cli@0.7.0-beta.0(@rspack/core@0.7.0-beta.0)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0): + resolution: {integrity: sha512-S04WQzw4ToaMiGQhHqe1ymIGgp3YS8ZOuvMrE/gJbYrYXTJSztKsokIzjnxskNfZsAHuyC4DQlzc6ul4lVhycQ==} + hasBin: true + peerDependencies: + '@rspack/core': '>=0.4.0' + dependencies: + '@discoveryjs/json-ext': 0.5.7 + '@rspack/core': 0.7.0-beta.0 + '@rspack/dev-server': 0.7.0-beta.0(@rspack/core@0.7.0-beta.0)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0) + colorette: 2.0.19 + exit-hook: 3.2.0 + interpret: 3.1.1 + rechoir: 0.8.0 + semver: 6.3.1 + webpack-bundle-analyzer: 4.6.1 + yargs: 17.6.2 + transitivePeerDependencies: + - '@types/express' + - bufferutil + - debug + - supports-color + - utf-8-validate + - webpack + - webpack-cli + dev: true + /@rspack/core@0.4.5: resolution: {integrity: sha512-X29fvCqTJH9OYN5pqa2lYP9hBLGICGVugtpTIAyLtMxC7gqvjvZkG/qisaVsjPyg4p2eB0NvmosnHkRv0GJ4sg==} engines: {node: '>=16.0.0'} @@ -40887,6 +41007,23 @@ packages: tapable: 2.2.1 webpack-sources: 3.2.3 + /@rspack/core@0.7.0-beta.0: + resolution: {integrity: sha512-rHIgtNJYP6BcNZVZsZ+aLfasXreIVtbET4TEze4mYzP7/0LCojFTyBLabuPWaGr3Wgv3XkjVFLl9M/bbGDJ7KA==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@swc/helpers': '>=0.5.1' + peerDependenciesMeta: + '@swc/helpers': + optional: true + dependencies: + '@module-federation/runtime-tools': 0.1.6 + '@rspack/binding': 0.7.0-beta.0 + caniuse-lite: 1.0.30001618 + enhanced-resolve: 5.12.0 + tapable: 2.2.1 + webpack-sources: 3.2.3 + dev: true + /@rspack/dev-server@0.6.5(@rspack/core@0.6.5)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0): resolution: {integrity: sha512-NDhDIlwutGX5m0xdPzT3YtdmmjSr0p/9DHoSaxOXErc8Ml0651U4s6wXsw5ZoZhZYfzzpgIieKB8+yclHopNlQ==} peerDependencies: @@ -40957,6 +41094,30 @@ packages: - webpack - webpack-cli + /@rspack/dev-server@0.7.0-beta.0(@rspack/core@0.7.0-beta.0)(@types/express@4.17.21)(webpack-cli@4.10.0)(webpack@5.91.0): + resolution: {integrity: sha512-k2zqslmjb+Ca2lWOnwetcWGteYj1DghHuVjwOJ+mBW/H1maF6rA6FrxWu9uLrYdL2otzkvQK0AjCknNgEFXDOg==} + peerDependencies: + '@rspack/core': '*' + dependencies: + '@rspack/core': 0.7.0-beta.0 + chokidar: 3.5.3 + connect-history-api-fallback: 2.0.0 + express: 4.19.2(supports-color@6.1.0) + http-proxy-middleware: 2.0.6(@types/express@4.17.21) + mime-types: 2.1.35 + webpack-dev-middleware: 6.1.2(webpack@5.91.0) + webpack-dev-server: 4.13.1(webpack-cli@4.10.0)(webpack@5.91.0) + ws: 8.8.1 + transitivePeerDependencies: + - '@types/express' + - bufferutil + - debug + - supports-color + - utf-8-validate + - webpack + - webpack-cli + dev: true + /@rspack/plugin-html@0.4.5(@rspack/core@0.4.5): resolution: {integrity: sha512-W+m86gTwfY18Zbx/j1SHnF0qQwcvupcxn1UTCrkygVVmJhEtPXIid4DsNLMp9Igs4LBkWBeC9SU+xzF0BUkjGA==} peerDependencies: @@ -57931,7 +58092,7 @@ packages: dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.91.0(webpack-cli@5.1.4) + webpack: 5.91.0(webpack-cli@4.10.0) /file-system-cache@1.1.0: resolution: {integrity: sha512-IzF5MBq+5CR0jXx5RxPe4BICl/oEhBSXKaL9fLhAXrIfIUS77Hr4vzrYyqYMHN6uTt+BOqi3fDCTjjEBCjERKw==} @@ -78486,7 +78647,7 @@ packages: dependencies: neo-async: 2.6.2 sass: 1.77.2 - webpack: 5.91.0(webpack-cli@5.1.4) + webpack: 5.91.0(webpack-cli@4.10.0) dev: true /sass-loader@13.3.3(webpack@5.91.0): @@ -82192,7 +82353,7 @@ packages: chalk: 4.1.2 enhanced-resolve: 5.15.1 micromatch: 4.0.5 - semver: 7.6.0 + semver: 7.6.2 source-map: 0.7.4 typescript: 4.5.5 webpack: 5.91.0(webpack-cli@5.1.4) @@ -82208,7 +82369,7 @@ packages: chalk: 4.1.2 enhanced-resolve: 5.15.1 micromatch: 4.0.5 - semver: 7.6.0 + semver: 7.6.2 source-map: 0.7.4 typescript: 4.8.4 webpack: 5.91.0(@swc/core@1.5.7)(esbuild@0.21.4) @@ -82224,7 +82385,7 @@ packages: chalk: 4.1.2 enhanced-resolve: 5.15.1 micromatch: 4.0.5 - semver: 7.6.0 + semver: 7.6.2 source-map: 0.7.4 typescript: 4.9.5 webpack: 5.91.0(webpack-cli@5.1.4) @@ -82240,7 +82401,7 @@ packages: chalk: 4.1.2 enhanced-resolve: 5.15.1 micromatch: 4.0.5 - semver: 7.6.0 + semver: 7.6.2 source-map: 0.7.4 typescript: 5.2.2 webpack: 5.91.0(@swc/core@1.5.7)(webpack-cli@4.10.0) @@ -85952,7 +86113,7 @@ packages: webpack: 5.91.0(webpack-cli@4.10.0) webpack-cli: 4.10.0(webpack@5.91.0) webpack-dev-middleware: 5.3.4(webpack@5.91.0) - ws: 8.16.0 + ws: 8.17.0 transitivePeerDependencies: - bufferutil - debug @@ -86003,7 +86164,7 @@ packages: webpack: 5.91.0(webpack-cli@5.1.4) webpack-cli: 5.1.4(webpack-dev-server@4.15.2)(webpack@5.91.0) webpack-dev-middleware: 5.3.4(webpack@5.91.0) - ws: 8.16.0 + ws: 8.17.0 transitivePeerDependencies: - bufferutil - debug diff --git a/rspack-webpack-interop/app-04/public/225.css b/rspack-webpack-interop/app-04/public/225.css deleted file mode 100644 index 0852fca0c7f..00000000000 --- a/rspack-webpack-interop/app-04/public/225.css +++ /dev/null @@ -1,3 +0,0 @@ -h1.svelte-1ucbz36 { - color: purple; -} diff --git a/rspack-webpack-interop/app-04/public/494.494.js b/rspack-webpack-interop/app-04/public/494.494.js deleted file mode 100644 index 0da2e63e728..00000000000 --- a/rspack-webpack-interop/app-04/public/494.494.js +++ /dev/null @@ -1,282 +0,0 @@ -'use strict'; -(self.webpackChunkcomprehensive_demo_react18_app_04 = - self.webpackChunkcomprehensive_demo_react18_app_04 || []).push([ - [494], - { - 494: (t, e, n) => { - function o() {} - function r(t) { - return t(); - } - function c() { - return Object.create(null); - } - function s(t) { - t.forEach(r); - } - function i(t) { - return 'function' == typeof t; - } - function a(t, e) { - return t != t ? e == e : t !== e || (t && 'object' == typeof t) || 'function' == typeof t; - } - function u(t) { - return 0 === Object.keys(t).length; - } - n.d(e, { - $Tr: () => $, - Ljt: () => g, - N8: () => a, - R3I: () => f, - S1n: () => M, - ZTd: () => o, - bGB: () => p, - fLW: () => m, - f_C: () => q, - ogt: () => h, - rTO: () => _, - }), - new Set(); - let l, - d = !1; - function f(t, e) { - t.appendChild(e); - } - function $(t, e, n) { - t.insertBefore(e, n || null); - } - function h(t) { - t.parentNode && t.parentNode.removeChild(t); - } - function p(t) { - return document.createElement(t); - } - function m(t) { - return document.createTextNode(t); - } - function g(t, e, n) { - null == n ? t.removeAttribute(e) : t.getAttribute(e) !== n && t.setAttribute(e, n); - } - function _(t, e) { - (e = '' + e), t.data !== e && (t.data = e); - } - function b(t) { - l = t; - } - new Map(); - const y = [], - k = []; - let w = []; - const x = [], - C = Promise.resolve(); - let E = !1; - function v(t) { - w.push(t); - } - const T = new Set(); - let O = 0; - function S() { - if (0 !== O) return; - const t = l; - do { - try { - for (; O < y.length; ) { - const t = y[O]; - O++, b(t), N(t.$$); - } - } catch (t) { - throw ((y.length = 0), (O = 0), t); - } - for (b(null), y.length = 0, O = 0; k.length; ) k.pop()(); - for (let t = 0; t < w.length; t += 1) { - const e = w[t]; - T.has(e) || (T.add(e), e()); - } - w.length = 0; - } while (y.length); - for (; x.length; ) x.pop()(); - (E = !1), T.clear(), b(t); - } - function N(t) { - if (null !== t.fragment) { - t.update(), s(t.before_update); - const e = t.dirty; - (t.dirty = [-1]), t.fragment && t.fragment.p(t.ctx, e), t.after_update.forEach(v); - } - } - const j = new Set(); - let A; - function L(t, e) { - const n = t.$$; - null !== n.fragment && - ((function (t) { - const e = [], - n = []; - w.forEach(o => (-1 === t.indexOf(o) ? e.push(o) : n.push(o))), - n.forEach(t => t()), - (w = e); - })(n.after_update), - s(n.on_destroy), - n.fragment && n.fragment.d(e), - (n.on_destroy = n.fragment = null), - (n.ctx = [])); - } - function M(t, e, n, a, u, f, $, p = [-1]) { - const m = l; - b(t); - const g = (t.$$ = { - fragment: null, - ctx: [], - props: f, - update: o, - not_equal: u, - bound: c(), - on_mount: [], - on_destroy: [], - on_disconnect: [], - before_update: [], - after_update: [], - context: new Map(e.context || (m ? m.$$.context : [])), - callbacks: c(), - dirty: p, - skip_bound: !1, - root: e.target || m.$$.root, - }); - $ && $(g.root); - let _ = !1; - if ( - ((g.ctx = n - ? n(t, e.props || {}, (e, n, ...o) => { - const r = o.length ? o[0] : n; - return ( - g.ctx && - u(g.ctx[e], (g.ctx[e] = r)) && - (!g.skip_bound && g.bound[e] && g.bound[e](r), - _ && - (function (t, e) { - -1 === t.$$.dirty[0] && - (y.push(t), E || ((E = !0), C.then(S)), t.$$.dirty.fill(0)), - (t.$$.dirty[(e / 31) | 0] |= 1 << e % 31); - })(t, e)), - n - ); - }) - : []), - g.update(), - (_ = !0), - s(g.before_update), - (g.fragment = !!a && a(g.ctx)), - e.target) - ) { - if (e.hydrate) { - d = !0; - const t = (function (t) { - return Array.from(t.childNodes); - })(e.target); - g.fragment && g.fragment.l(t), t.forEach(h); - } else g.fragment && g.fragment.c(); - e.intro && (k = t.$$.fragment) && k.i && (j.delete(k), k.i(w)), - (function (t, e, n, o) { - const { fragment: c, after_update: a } = t.$$; - c && c.m(e, n), - o || - v(() => { - const e = t.$$.on_mount.map(r).filter(i); - t.$$.on_destroy ? t.$$.on_destroy.push(...e) : s(e), (t.$$.on_mount = []); - }), - a.forEach(v); - })(t, e.target, e.anchor, e.customElement), - (d = !1), - S(); - } - var k, w; - b(m); - } - 'undefined' != typeof window ? window : 'undefined' != typeof globalThis ? globalThis : n.g, - new Set([ - 'allowfullscreen', - 'allowpaymentrequest', - 'async', - 'autofocus', - 'autoplay', - 'checked', - 'controls', - 'default', - 'defer', - 'disabled', - 'formnovalidate', - 'hidden', - 'inert', - 'ismap', - 'loop', - 'multiple', - 'muted', - 'nomodule', - 'novalidate', - 'open', - 'playsinline', - 'readonly', - 'required', - 'reversed', - 'selected', - ]), - 'function' == typeof HTMLElement && - (A = class extends HTMLElement { - constructor() { - super(), this.attachShadow({ mode: 'open' }); - } - connectedCallback() { - const { on_mount: t } = this.$$; - this.$$.on_disconnect = t.map(r).filter(i); - for (const t in this.$$.slotted) this.appendChild(this.$$.slotted[t]); - } - attributeChangedCallback(t, e, n) { - this[t] = n; - } - disconnectedCallback() { - s(this.$$.on_disconnect); - } - $destroy() { - L(this, 1), (this.$destroy = o); - } - $on(t, e) { - if (!i(e)) return o; - const n = this.$$.callbacks[t] || (this.$$.callbacks[t] = []); - return ( - n.push(e), - () => { - const t = n.indexOf(e); - -1 !== t && n.splice(t, 1); - } - ); - } - $set(t) { - this.$$set && - !u(t) && - ((this.$$.skip_bound = !0), this.$$set(t), (this.$$.skip_bound = !1)); - } - }); - class q { - $destroy() { - L(this, 1), (this.$destroy = o); - } - $on(t, e) { - if (!i(e)) return o; - const n = this.$$.callbacks[t] || (this.$$.callbacks[t] = []); - return ( - n.push(e), - () => { - const t = n.indexOf(e); - -1 !== t && n.splice(t, 1); - } - ); - } - $set(t) { - this.$$set && - !u(t) && - ((this.$$.skip_bound = !0), this.$$set(t), (this.$$.skip_bound = !1)); - } - } - }, - }, -]); diff --git a/rspack-webpack-interop/app-04/public/966.css b/rspack-webpack-interop/app-04/public/966.css deleted file mode 100644 index 0852fca0c7f..00000000000 --- a/rspack-webpack-interop/app-04/public/966.css +++ /dev/null @@ -1,3 +0,0 @@ -h1.svelte-1ucbz36 { - color: purple; -}