From 97f1b0cda0b5b680af08ae3c0afc5476dbbd789c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Tue, 31 Oct 2023 12:35:51 -0700
Subject: [PATCH 1/2] fix(qwik): Incorrect module reference in inlinedQrl

Fix #5368
---
 packages/qwik/src/optimizer/src/plugins/plugin.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/qwik/src/optimizer/src/plugins/plugin.ts b/packages/qwik/src/optimizer/src/plugins/plugin.ts
index 26401007b34..0f9ce512103 100644
--- a/packages/qwik/src/optimizer/src/plugins/plugin.ts
+++ b/packages/qwik/src/optimizer/src/plugins/plugin.ts
@@ -634,7 +634,7 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
       }
       const deps = new Set<string>();
       for (const mod of newOutput.modules) {
-        if (mod.isEntry) {
+        if (mod.isEntry || mod.hook) {
           const key = normalizePath(path.join(srcDir, mod.path));
           currentOutputs.set(key, [mod, id]);
           deps.add(key);
@@ -669,7 +669,7 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
 
         results.set(normalizedID, clientNewOutput);
         for (const mod of clientNewOutput.modules) {
-          if (mod.isEntry) {
+          if (mod.isEntry || mod.hook) {
             const key = normalizePath(path.join(srcDir, mod.path));
             ctx.addWatchFile(key);
             transformedOutputs.set(key, [mod, id]);
@@ -686,7 +686,7 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
         await ctx.load({ id });
       }
 
-      const module = newOutput.modules.find((m) => !m.isEntry)!;
+      const module = newOutput.modules.find((m) => !m.isEntry && m.hook == null)!;
       return {
         code: module.code,
         map: module.map,

From 5d15c33797f853c4e0cbe47e3e367ae975f2f2f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Tue, 31 Oct 2023 12:56:57 -0700
Subject: [PATCH 2/2] fixup! fix(qwik): Incorrect module reference in
 inlinedQrl

---
 packages/qwik/src/optimizer/src/plugins/plugin.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/qwik/src/optimizer/src/plugins/plugin.ts b/packages/qwik/src/optimizer/src/plugins/plugin.ts
index 0f9ce512103..3bc6129e18c 100644
--- a/packages/qwik/src/optimizer/src/plugins/plugin.ts
+++ b/packages/qwik/src/optimizer/src/plugins/plugin.ts
@@ -634,7 +634,7 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
       }
       const deps = new Set<string>();
       for (const mod of newOutput.modules) {
-        if (mod.isEntry || mod.hook) {
+        if (isTransformedFile(mod)) {
           const key = normalizePath(path.join(srcDir, mod.path));
           currentOutputs.set(key, [mod, id]);
           deps.add(key);
@@ -669,7 +669,7 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
 
         results.set(normalizedID, clientNewOutput);
         for (const mod of clientNewOutput.modules) {
-          if (mod.isEntry || mod.hook) {
+          if (isTransformedFile(mod)) {
             const key = normalizePath(path.join(srcDir, mod.path));
             ctx.addWatchFile(key);
             transformedOutputs.set(key, [mod, id]);
@@ -686,7 +686,7 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
         await ctx.load({ id });
       }
 
-      const module = newOutput.modules.find((m) => !m.isEntry && m.hook == null)!;
+      const module = newOutput.modules.find((mod) => !isTransformedFile(mod))!;
       return {
         code: module.code,
         map: module.map,
@@ -837,6 +837,10 @@ const insideRoots = (ext: string, dir: string, srcDir: string | null, vendorRoot
   return false;
 };
 
+function isTransformedFile(mod: TransformModule) {
+  return mod.isEntry || mod.hook;
+}
+
 export function parseId(originalId: string) {
   const [pathId, query] = originalId.split('?');
   const queryStr = query || '';