From cb02316103566aef7d246d8c4ca809ed01aca17f Mon Sep 17 00:00:00 2001 From: Jakub Romanczyk Date: Wed, 4 Dec 2024 20:14:41 +0100 Subject: [PATCH 1/5] refactor: move react refresh plugin from peerDeps to deps in repack --- packages/repack/package.json | 2 +- pnpm-lock.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/repack/package.json b/packages/repack/package.json index 1753ade54..5bfaea7a7 100644 --- a/packages/repack/package.json +++ b/packages/repack/package.json @@ -60,7 +60,6 @@ "@react-native-community/cli": "*", "@react-native-community/cli-types": "*", "@rspack/core": ">=1", - "@rspack/plugin-react-refresh": ">=1", "react-native": ">=0.74", "webpack": ">=5.90" }, @@ -78,6 +77,7 @@ "dependencies": { "@callstack/repack-dev-server": "workspace:*", "@discoveryjs/json-ext": "^0.5.7", + "@rspack/plugin-react-refresh": "1.0.0", "colorette": "^2.0.20", "dedent": "^0.7.0", "events": "^3.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ae5fb5020..d776f2790 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -433,6 +433,9 @@ importers: '@discoveryjs/json-ext': specifier: ^0.5.7 version: 0.5.7 + '@rspack/plugin-react-refresh': + specifier: 1.0.0 + version: 1.0.0(react-refresh@0.14.2) colorette: specifier: ^2.0.20 version: 2.0.20 @@ -503,9 +506,6 @@ importers: '@rspack/core': specifier: 1.0.8 version: 1.0.8(@swc/helpers@0.5.13) - '@rspack/plugin-react-refresh': - specifier: 1.0.0 - version: 1.0.0(react-refresh@0.14.2) '@swc/helpers': specifier: 0.5.13 version: 0.5.13 From 4adcbc0fe0b9d0ff6c6793fa94c4f2ee5bd5f3db Mon Sep 17 00:00:00 2001 From: Jakub Romanczyk Date: Wed, 4 Dec 2024 20:18:38 +0100 Subject: [PATCH 2/5] refactor: dont include refresh plugin when using repack-init --- packages/init/src/tasks/addDependencies.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/init/src/tasks/addDependencies.ts b/packages/init/src/tasks/addDependencies.ts index d2d3287ef..816949ef1 100644 --- a/packages/init/src/tasks/addDependencies.ts +++ b/packages/init/src/tasks/addDependencies.ts @@ -8,7 +8,6 @@ import logger from '../utils/logger.js'; const rspackDependencies = [ '@rspack/core@1.0.3', // 1.0.4 breaks sourcemaps - '@rspack/plugin-react-refresh', 'babel-loader', // still needed for codegen '@swc/helpers', '@callstack/repack', @@ -18,7 +17,6 @@ const webpackDependencies = [ 'webpack', 'terser-webpack-plugin', 'babel-loader', - '@rspack/plugin-react-refresh', '@callstack/repack', ]; From a380b97e13f50dc11749290d5856c5cd184e784e Mon Sep 17 00:00:00 2001 From: Jakub Romanczyk Date: Wed, 4 Dec 2024 20:24:56 +0100 Subject: [PATCH 3/5] chore: remove react refresh plugin from depdencies in testers --- apps/tester-app/package.json | 1 - apps/tester-federation-v2/package.json | 1 - apps/tester-federation/package.json | 1 - pnpm-lock.yaml | 9 --------- 4 files changed, 12 deletions(-) diff --git a/apps/tester-app/package.json b/apps/tester-app/package.json index 02a0a9f80..335191500 100644 --- a/apps/tester-app/package.json +++ b/apps/tester-app/package.json @@ -32,7 +32,6 @@ "@react-native/typescript-config": "0.76.1", "@rsdoctor/rspack-plugin": "^0.4.5", "@rspack/core": "1.0.8", - "@rspack/plugin-react-refresh": "1.0.0", "@svgr/webpack": "^8.1.0", "@swc/helpers": "^0.5.13", "@types/jest": "^29.5.12", diff --git a/apps/tester-federation-v2/package.json b/apps/tester-federation-v2/package.json index df5909acf..6511b1ec6 100644 --- a/apps/tester-federation-v2/package.json +++ b/apps/tester-federation-v2/package.json @@ -29,7 +29,6 @@ "@react-native-community/cli-platform-android": "15.0.1", "@rsdoctor/rspack-plugin": "^0.4.5", "@rspack/core": "1.0.8", - "@rspack/plugin-react-refresh": "1.0.0", "@swc/helpers": "^0.5.13", "@types/jest": "^29.5.12", "@types/react": "^18.2.51", diff --git a/apps/tester-federation/package.json b/apps/tester-federation/package.json index 39c82d54b..5f33eb64b 100644 --- a/apps/tester-federation/package.json +++ b/apps/tester-federation/package.json @@ -36,7 +36,6 @@ "@react-native-community/cli-platform-android": "15.0.1", "@rsdoctor/rspack-plugin": "^0.4.5", "@rspack/core": "1.0.8", - "@rspack/plugin-react-refresh": "1.0.0", "@swc/helpers": "^0.5.13", "@types/jest": "^29.5.12", "@types/react": "^18.2.51", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d776f2790..e1325fe2c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,9 +93,6 @@ importers: '@rspack/core': specifier: 1.0.8 version: 1.0.8(@swc/helpers@0.5.13) - '@rspack/plugin-react-refresh': - specifier: 1.0.0 - version: 1.0.0(react-refresh@0.14.2) '@svgr/webpack': specifier: ^8.1.0 version: 8.1.0(typescript@5.5.3) @@ -190,9 +187,6 @@ importers: '@rspack/core': specifier: 1.0.8 version: 1.0.8(@swc/helpers@0.5.13) - '@rspack/plugin-react-refresh': - specifier: 1.0.0 - version: 1.0.0(react-refresh@0.14.2) '@swc/helpers': specifier: ^0.5.13 version: 0.5.13 @@ -275,9 +269,6 @@ importers: '@rspack/core': specifier: 1.0.8 version: 1.0.8(@swc/helpers@0.5.13) - '@rspack/plugin-react-refresh': - specifier: 1.0.0 - version: 1.0.0(react-refresh@0.14.2) '@swc/helpers': specifier: ^0.5.13 version: 0.5.13 From 963e98f7fbf529ca52ef8ec77e48aa63762984ea Mon Sep 17 00:00:00 2001 From: Jakub Romanczyk Date: Wed, 4 Dec 2024 20:25:27 +0100 Subject: [PATCH 4/5] chore: remove duplicated react refresh plugin entry in repack --- packages/repack/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/repack/package.json b/packages/repack/package.json index 5bfaea7a7..9bc678a1a 100644 --- a/packages/repack/package.json +++ b/packages/repack/package.json @@ -103,7 +103,6 @@ "@module-federation/enhanced": "0.6.10", "@module-federation/sdk": "0.6.10", "@rspack/core": "1.0.8", - "@rspack/plugin-react-refresh": "1.0.0", "@swc/helpers": "0.5.13", "@types/dedent": "^0.7.0", "@types/jest": "^29.5.12", From 32b6f633c566e88fb51cfe444ab2c0a9612400e3 Mon Sep 17 00:00:00 2001 From: Jakub Romanczyk Date: Fri, 6 Dec 2024 11:14:00 +0100 Subject: [PATCH 5/5] chore: add changeset --- .changeset/cold-chefs-confess.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/cold-chefs-confess.md diff --git a/.changeset/cold-chefs-confess.md b/.changeset/cold-chefs-confess.md new file mode 100644 index 000000000..663c8fee3 --- /dev/null +++ b/.changeset/cold-chefs-confess.md @@ -0,0 +1,6 @@ +--- +"@callstack/repack": minor +"@callstack/repack-init": minor +--- + +Include `@rspack/plugin-react-refresh` with Re.Pack instead of requiring user to install it