Skip to content

chore: general housekeeping #4002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2024
Merged

chore: general housekeeping #4002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c13692
chore: general housekeeping
ScriptedAlchemy Jun 3, 2024
0ae432c
chore: general housekeeping
ScriptedAlchemy Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11,340 changes: 4,728 additions & 6,612 deletions angular14-react/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions apollo-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"start": "pnpm --filter apollo-client_* --parallel start",
"serve": "pnpm --filter apollo-client_* --parallel serve",
"build": "pnpm --filter apollo-client_* --parallel build",
"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",
"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"
"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"
},
"devDependencies": {
"wait-on": "7.2.0",
Expand Down
11,916 changes: 4,690 additions & 7,226 deletions cra-react-app-rewired/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion cra/host/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"devDependencies": {
"@rsbuild/core": "0.6.15",
"@rsbuild/plugin-react": "0.6.15",
"@rspack/core": "0.6.5"
"@rspack/core": "0.6.5",
"@module-federation/enhanced": "0.1.13"
}
}
12 changes: 10 additions & 2 deletions cra/host/rsbuild.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import { defineConfig } from '@rsbuild/core';
import { pluginReact } from '@rsbuild/plugin-react';
import { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
//@ts-ignore
import mfConfig from './modulefederation.config';
import rspack from '@rspack/core';

export default defineConfig({
server: {
port: 3000,
},
moduleFederation: {options:mfConfig},
tools: {
rspack: (config, { appendPlugins }) => {
config.output.publicPath = 'auto'
appendPlugins([
new ModuleFederationPlugin(mfConfig),
]);
},
},
plugins: [pluginReact()],
});
3 changes: 0 additions & 3 deletions cra/host/scripts/build.js
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions cra/host/scripts/overrides/webpack-config.js
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions cra/host/scripts/start.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"start": "pnpm --filter cra_* start",
"build": "pnpm --filter cra_* build",
"preview": "pnpm run build && pnpm --filter cra_* preview",
"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"
"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"
},
"devDependencies": {
"wait-on": "7.2.0",
Expand Down
3 changes: 2 additions & 1 deletion cra/remote/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"devDependencies": {
"@rsbuild/core": "0.6.15",
"@rsbuild/plugin-react": "0.6.15",
"@rspack/core": "0.6.5"
"@rspack/core": "0.6.5",
"@module-federation/enhanced": "0.1.13"
}
}
12 changes: 10 additions & 2 deletions cra/remote/rsbuild.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import { defineConfig } from '@rsbuild/core';
import { pluginReact } from '@rsbuild/plugin-react';
import { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
//@ts-ignore
import mfConfig from './modulefederation.config';
import rspack from '@rspack/core';

export default defineConfig({
server: {
port: 3002,
},
moduleFederation: {options:mfConfig},
tools: {
rspack: (config, { appendPlugins }) => {
config.output.publicPath = 'auto'
appendPlugins([
new ModuleFederationPlugin(mfConfig),
]);
},
},
plugins: [pluginReact()],
});
3 changes: 0 additions & 3 deletions cra/remote/scripts/build.js
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions cra/remote/scripts/overrides/webpack-config.js
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions cra/remote/scripts/start.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion css-isolation/app1/rspack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const HtmlWebpackPlugin = require('html-webpack-plugin');
const { ModuleFederationPlugin } = require('@rspack/core').container;
const { ModuleFederationPlugin } = require('@module-federation/enhanced/rspack');
const path = require('path');

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion css-isolation/app2/rspack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { ModuleFederationPlugin } = require('@rspack/core').container;
const { ModuleFederationPlugin } = require('@module-federation/enhanced/rspack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const path = require('path');

Expand Down
2 changes: 1 addition & 1 deletion federated-npm/app1/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const HtmlWebpackPlugin = require('html-webpack-plugin');
const { ModuleFederationPlugin } = require('@module-federation/enhanced');
const { ModuleFederationPlugin } = require('@module-federation/enhanced/webpack');
const path = require('path');

const remotes = {
Expand Down
7 changes: 2 additions & 5 deletions federated-npm/app3/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const HtmlWebpackPlugin = require('html-webpack-plugin');
const { ModuleFederationPlugin } = require('@module-federation/enhanced');
const { ModuleFederationPlugin } = require('@module-federation/enhanced/webpack');
const path = require('path');

module.exports = {
Expand Down Expand Up @@ -33,11 +33,8 @@ module.exports = {
library: { type: 'var', name: 'app3' },
filename: 'remoteEntry.js',
exposes: {
'.': 'data:text/javascript,export default "nothing here"',
'.': './empty.js',
},
runtimePlugins: [
// uses global plugin injected by app1
],
shared: {
qs: {
import: 'qs',
Expand Down
4 changes: 2 additions & 2 deletions federated-npm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"legacy:build": "pnpm --filter legacy:build",
"serve": "pnpm --filter federated-npm_* --parallel serve",
"clean": "pnpm --filter federated-npm_* --parallel clean",
"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",
"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"
"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",
"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"
},
"devDependencies": {
"wait-on": "7.2.0"
Expand Down
Loading
Loading