From 46ffac7b6d3379d2d72b590f72684e81ec00b208 Mon Sep 17 00:00:00 2001
From: szymonrybczak <szymon.rybczak@gmail.com>
Date: Wed, 5 Feb 2025 13:27:28 +0100
Subject: [PATCH 1/4] fix: read `entry` property from config before
 `--entry-file`

---
 packages/repack/src/commands/common/getEnvOptions.ts | 10 ++++++----
 packages/repack/src/commands/rspack/bundle.ts        |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/repack/src/commands/common/getEnvOptions.ts b/packages/repack/src/commands/common/getEnvOptions.ts
index 3f4e330b0..17c8aef45 100644
--- a/packages/repack/src/commands/common/getEnvOptions.ts
+++ b/packages/repack/src/commands/common/getEnvOptions.ts
@@ -16,10 +16,12 @@ export function getEnvOptions(cliOptions: CliOptions): EnvOptions {
       cliOptions.arguments.bundle.minify ?? env.mode === 'production';
 
     const { entryFile } = cliOptions.arguments.bundle;
-    env.entry =
-      path.isAbsolute(entryFile) || entryFile.startsWith('./')
-        ? entryFile
-        : `./${entryFile}`;
+    if (entryFile) {
+      env.entry =
+        path.isAbsolute(entryFile) || entryFile.startsWith('./')
+          ? entryFile
+          : `./${entryFile}`;
+    }
 
     env.bundleFilename = cliOptions.arguments.bundle.bundleOutput;
     env.sourceMapFilename = cliOptions.arguments.bundle.sourcemapOutput;
diff --git a/packages/repack/src/commands/rspack/bundle.ts b/packages/repack/src/commands/rspack/bundle.ts
index 4a93b84b1..6d3a0d3b4 100644
--- a/packages/repack/src/commands/rspack/bundle.ts
+++ b/packages/repack/src/commands/rspack/bundle.ts
@@ -44,10 +44,6 @@ export async function bundle(
     arguments: { bundle: args },
   };
 
-  if (!args.entryFile) {
-    throw new Error("Option '--entry-file <path>' argument is missing");
-  }
-
   if (args.verbose) {
     process.env[VERBOSE_ENV_KEY] = '1';
   }
@@ -55,6 +51,10 @@ export async function bundle(
   const envOptions = getEnvOptions(cliOptions);
   const config = await loadConfig<Configuration>(rspackConfigPath, envOptions);
 
+  if (!args.entryFile && !config.entry) {
+    throw new Error("Option '--entry-file <path>' argument is missing");
+  }
+
   const errorHandler = async (error: Error | null, stats?: Stats) => {
     if (error) {
       console.error(error);

From b35152b336014bdba3ee42e61ae49eaf62ed0b54 Mon Sep 17 00:00:00 2001
From: szymonrybczak <szymon.rybczak@gmail.com>
Date: Wed, 5 Feb 2025 13:31:38 +0100
Subject: [PATCH 2/4] chore: add changset

---
 .changeset/khaki-olives-add.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/khaki-olives-add.md

diff --git a/.changeset/khaki-olives-add.md b/.changeset/khaki-olives-add.md
new file mode 100644
index 000000000..e717c5cc1
--- /dev/null
+++ b/.changeset/khaki-olives-add.md
@@ -0,0 +1,5 @@
+---
+"@callstack/repack": patch
+---
+
+Don't error on missing --entry-file when entry is defined in rspack.config.js

From 4c0cf82f1ca3a95a131a1f5db9de2dce858997bf Mon Sep 17 00:00:00 2001
From: szymonrybczak <szymon.rybczak@gmail.com>
Date: Wed, 5 Feb 2025 13:32:20 +0100
Subject: [PATCH 3/4] fix: apply change also to webpack version

---
 packages/repack/src/commands/webpack/bundle.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/repack/src/commands/webpack/bundle.ts b/packages/repack/src/commands/webpack/bundle.ts
index ca8884492..7e10830e9 100644
--- a/packages/repack/src/commands/webpack/bundle.ts
+++ b/packages/repack/src/commands/webpack/bundle.ts
@@ -43,10 +43,6 @@ export async function bundle(
     arguments: { bundle: args },
   };
 
-  if (!args.entryFile) {
-    throw new Error("Option '--entry-file <path>' argument is missing");
-  }
-
   if (args.verbose) {
     process.env[VERBOSE_ENV_KEY] = '1';
   }
@@ -57,6 +53,10 @@ export async function bundle(
     envOptions
   );
 
+  if (!args.entryFile && !webpackConfig.entry) {
+    throw new Error("Option '--entry-file <path>' argument is missing");
+  }
+
   const errorHandler = async (error: Error | null, stats?: webpack.Stats) => {
     if (error) {
       console.error(error);

From 0d874c173861958ced36cbcee63b12f95e97fcd2 Mon Sep 17 00:00:00 2001
From: szymonrybczak <szymon.rybczak@gmail.com>
Date: Wed, 5 Feb 2025 13:42:20 +0100
Subject: [PATCH 4/4] chore: improve changeset

---
 .changeset/khaki-olives-add.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/khaki-olives-add.md b/.changeset/khaki-olives-add.md
index e717c5cc1..6bf38cd8f 100644
--- a/.changeset/khaki-olives-add.md
+++ b/.changeset/khaki-olives-add.md
@@ -2,4 +2,4 @@
 "@callstack/repack": patch
 ---
 
-Don't error on missing --entry-file when entry is defined in rspack.config.js
+Don't error on missing `--entry-file` when entry is defined in `rspack.config.js` or `webpack.config.js`.