From d4e0576e2d350c07aef89aac8a4851e4c173b901 Mon Sep 17 00:00:00 2001
From: Shai Reznik <shairez@users.noreply.github.com>
Date: Sun, 12 Nov 2023 23:20:42 +0200
Subject: [PATCH] fix: 3rd party imports of libs during build

---
 .../qwik-city-middleware-request-handler/index.md    |  2 +-
 packages/qwik/src/optimizer/src/plugins/plugin.ts    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/docs/src/routes/api/qwik-city-middleware-request-handler/index.md b/packages/docs/src/routes/api/qwik-city-middleware-request-handler/index.md
index 4629b930bee..f7638d9a9f9 100644
--- a/packages/docs/src/routes/api/qwik-city-middleware-request-handler/index.md
+++ b/packages/docs/src/routes/api/qwik-city-middleware-request-handler/index.md
@@ -261,7 +261,7 @@ export interface RequestEventBase<PLATFORM = QwikCityPlatform>
 | Property          | Modifiers             | Type                                                                                  | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | ----------------- | --------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | [basePathname](#) | <code>readonly</code> | string                                                                                | The base pathname of the request, which can be configured at build time. Defaults to <code>/</code>.                                                                                                                                                                                                                                                                                                                                                                           |
-| [cacheControl](#) | <code>readonly</code> | (cacheControl: [CacheControl](#cachecontrol), target?: CacheControlTarget) =&gt; void | <p>Convenience method to set the Cache-Control header. Depending on your CDN, you may want to add another cacheControl with the second argument set to <code>CDN-Cache-Control</code> or any other value (we provide the most common values for auto-complete, but you can use any string you want).</p><p>See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control and https://qwik.builder.io/docs/caching/#CDN-Cache-Controls for more information.</p> |
+| [cacheControl](#) | <code>readonly</code> | (cacheControl: [CacheControl](#cachecontrol), target?: CacheControlTarget) =&gt; void | <p>Convenience method to set the Cache-Control header. Depending on your CDN, you may want to add another cacheControl with the second argument set to <code>CDN-Cache-Control</code> or any other value (we provide the most common values for auto-complete, but you can use any string you want).</p><p>See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control and https://qwik.builder.io/docs/caching/\#CDN-Cache-Controls for more information.</p> |
 | [clientConn](#)   | <code>readonly</code> | [ClientConn](#clientconn)                                                             | Provides information about the client connection, such as the IP address and the country the request originated from.                                                                                                                                                                                                                                                                                                                                                          |
 | [cookie](#)       | <code>readonly</code> | [Cookie](#cookie)                                                                     | <p>HTTP request and response cookie. Use the <code>get()</code> method to retrieve a request cookie value. Use the <code>set()</code> method to set a response cookie value.</p><p>https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies</p>                                                                                                                                                                                                                               |
 | [env](#)          | <code>readonly</code> | [EnvGetter](#envgetter)                                                               | Platform provided environment variables.                                                                                                                                                                                                                                                                                                                                                                                                                                       |
diff --git a/packages/qwik/src/optimizer/src/plugins/plugin.ts b/packages/qwik/src/optimizer/src/plugins/plugin.ts
index bfa48a6ce22..9f09e6b216c 100644
--- a/packages/qwik/src/optimizer/src/plugins/plugin.ts
+++ b/packages/qwik/src/optimizer/src/plugins/plugin.ts
@@ -1,5 +1,7 @@
-import { createOptimizer } from '../optimizer';
+import type { Rollup } from 'vite';
+import { hashCode } from '../../../core/util/hash_code';
 import { generateManifestFromBundles, getValidManifest } from '../manifest';
+import { createOptimizer } from '../optimizer';
 import type {
   Diagnostic,
   EntryStrategy,
@@ -17,8 +19,6 @@ import type {
   TransformOutput,
 } from '../types';
 import { createLinter, type QwikLinter } from './eslint-plugin';
-import type { Rollup } from 'vite';
-import { hashCode } from '../../../core/util/hash_code';
 
 const REG_CTX_NAME = ['server'];
 
@@ -445,10 +445,10 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
         const transformedOutput = isSSR
           ? ssrTransformedOutputs.get(importer)
           : transformedOutputs.get(importer);
-        const p = transformedOutput?.[0].origPath;
-        if (p) {
+        const originalPath = transformedOutput?.[0].origPath || transformedOutput?.[1];
+        if (originalPath) {
           // Resolve imports relative to original source path
-          return ctx.resolve(id, p, { skipSelf: true });
+          return ctx.resolve(id, originalPath, { skipSelf: true });
         }
         return;
       }