Skip to content

Commit e5f3ebb

Browse files
ScriptedAlchemyScriptedAlchemy
authored
chore: general housekeeping (#4002)
* chore: general housekeeping * chore: general housekeeping --------- Co-authored-by: ScriptedAlchemy <[email protected]>
1 parent bef99e3 commit e5f3ebb

File tree

25 files changed

+63153
-75568
lines changed

25 files changed

+63153
-75568
lines changed

‎angular14-react/pnpm-lock.yaml

Lines changed: 4728 additions & 6612 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apollo-client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "pnpm --filter apollo-client_* --parallel start",
99
"serve": "pnpm --filter apollo-client_* --parallel serve",
1010
"build": "pnpm --filter apollo-client_* --parallel build",
11-
"e2e:ci": "kill-port 3001 3000 && 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",
12-
"legacy:e2e:ci": "kill-port 3001 3000 && pnpm legacy:build && pnpm serve & sleep 5 && 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"
11+
"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",
12+
"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"
1313
},
1414
"devDependencies": {
1515
"wait-on": "7.2.0",

‎cra-react-app-rewired/pnpm-lock.yaml

Lines changed: 4690 additions & 7226 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cra/host/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"devDependencies": {
2727
"@rsbuild/core": "0.6.15",
2828
"@rsbuild/plugin-react": "0.6.15",
29-
"@rspack/core": "0.6.5"
29+
"@rspack/core": "0.6.5",
30+
"@module-federation/enhanced": "0.1.13"
3031
}
3132
}

‎cra/host/rsbuild.config.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
import { defineConfig } from '@rsbuild/core';
22
import { pluginReact } from '@rsbuild/plugin-react';
3+
import { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
34
//@ts-ignore
45
import mfConfig from './modulefederation.config';
5-
import rspack from '@rspack/core';
6+
67
export default defineConfig({
78
server: {
89
port: 3000,
910
},
10-
moduleFederation: {options:mfConfig},
11+
tools: {
12+
rspack: (config, { appendPlugins }) => {
13+
config.output.publicPath = 'auto'
14+
appendPlugins([
15+
new ModuleFederationPlugin(mfConfig),
16+
]);
17+
},
18+
},
1119
plugins: [pluginReact()],
1220
});

‎cra/host/scripts/build.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎cra/host/scripts/overrides/webpack-config.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎cra/host/scripts/start.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎cra/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"start": "pnpm --filter cra_* start",
1111
"build": "pnpm --filter cra_* build",
1212
"preview": "pnpm run build && pnpm --filter cra_* preview",
13-
"e2e:ci": "pnpm start & npx cypress run --config-file ../cypress-e2e/config/cypress.config.ts --config '{\"supportFile\": \"../cypress-e2e/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome && lsof -ti tcp:3000,3001,3002 | xargs kill"
13+
"e2e:ci": "pnpm start & sleep 3 && (wait-on tcp:3000 tcp:3002 --timeout 30000 || echo 'wait-on timed out, proceeding with Cypress') && npx cypress run --config-file ../cypress-e2e/config/cypress.config.ts --config '{\"supportFile\": \"../cypress-e2e/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome && lsof -ti tcp:3000,3001,3002 | xargs kill"
1414
},
1515
"devDependencies": {
1616
"wait-on": "7.2.0",

‎cra/remote/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"devDependencies": {
2727
"@rsbuild/core": "0.6.15",
2828
"@rsbuild/plugin-react": "0.6.15",
29-
"@rspack/core": "0.6.5"
29+
"@rspack/core": "0.6.5",
30+
"@module-federation/enhanced": "0.1.13"
3031
}
3132
}

‎cra/remote/rsbuild.config.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
import { defineConfig } from '@rsbuild/core';
22
import { pluginReact } from '@rsbuild/plugin-react';
3+
import { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
34
//@ts-ignore
45
import mfConfig from './modulefederation.config';
5-
import rspack from '@rspack/core';
6+
67
export default defineConfig({
78
server: {
89
port: 3002,
910
},
10-
moduleFederation: {options:mfConfig},
11+
tools: {
12+
rspack: (config, { appendPlugins }) => {
13+
config.output.publicPath = 'auto'
14+
appendPlugins([
15+
new ModuleFederationPlugin(mfConfig),
16+
]);
17+
},
18+
},
1119
plugins: [pluginReact()],
1220
});

‎cra/remote/scripts/build.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎cra/remote/scripts/overrides/webpack-config.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎cra/remote/scripts/start.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎css-isolation/app1/rspack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const HtmlWebpackPlugin = require('html-webpack-plugin');
2-
const { ModuleFederationPlugin } = require('@rspack/core').container;
2+
const { ModuleFederationPlugin } = require('@module-federation/enhanced/rspack');
33
const path = require('path');
44

55
module.exports = {

‎css-isolation/app2/rspack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { ModuleFederationPlugin } = require('@rspack/core').container;
1+
const { ModuleFederationPlugin } = require('@module-federation/enhanced/rspack');
22
const HtmlWebpackPlugin = require('html-webpack-plugin');
33
const path = require('path');
44

‎federated-npm/app1/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const HtmlWebpackPlugin = require('html-webpack-plugin');
2-
const { ModuleFederationPlugin } = require('@module-federation/enhanced');
2+
const { ModuleFederationPlugin } = require('@module-federation/enhanced/webpack');
33
const path = require('path');
44

55
const remotes = {

‎federated-npm/app3/webpack.config.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const HtmlWebpackPlugin = require('html-webpack-plugin');
2-
const { ModuleFederationPlugin } = require('@module-federation/enhanced');
2+
const { ModuleFederationPlugin } = require('@module-federation/enhanced/webpack');
33
const path = require('path');
44

55
module.exports = {
@@ -33,11 +33,8 @@ module.exports = {
3333
library: { type: 'var', name: 'app3' },
3434
filename: 'remoteEntry.js',
3535
exposes: {
36-
'.': 'data:text/javascript,export default "nothing here"',
36+
'.': './empty.js',
3737
},
38-
runtimePlugins: [
39-
// uses global plugin injected by app1
40-
],
4138
shared: {
4239
qs: {
4340
import: 'qs',

‎federated-npm/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"legacy:build": "pnpm --filter legacy:build",
1616
"serve": "pnpm --filter federated-npm_* --parallel serve",
1717
"clean": "pnpm --filter federated-npm_* --parallel clean",
18-
"e2e:ci": "pnpm start & wait-on http-get://localhost: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",
19-
"legacy:e2e:ci": "pnpm legacy:start & wait-on http-get://localhost: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"
18+
"e2e:ci": "pnpm start & sleep 1 && wait-on tcp:3001 tcp:3002 tcp:3003 && npx cypress run --config-file ../cypress-e2e/config/cypress.config.ts --config '{\"supportFile\": \"../cypress-e2e/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome",
19+
"legacy:e2e:ci": "pnpm legacy:start & sleep 1 && wait-on tcp:3001 tcp:3002 tcp:3003 && npx cypress run --config-file ../cypress-e2e/config/cypress.config.ts --config '{\"supportFile\": \"../cypress-e2e/support/e2e.ts\"}' --spec \"./e2e/*.cy.ts\" --browser=chrome"
2020
},
2121
"devDependencies": {
2222
"wait-on": "7.2.0"

0 commit comments

Comments
 (0)