fix(bundleless): only try to redirect files under outBase dir (#760)

Author: fi3ework

packages/core/src/config.ts

@@ -1099,6 +1099,7 @@ const composeEntryConfig = async (
       const outBase = await resolveOutBase(Object.values(resolvedEntries));
       return { resolvedEntries, outBase };
     }
+
     return { resolvedEntries, outBase: null };
   };
 
@@ -1126,7 +1127,7 @@ const composeBundlelessExternalConfig = (
   redirect: Redirect,
   cssModulesAuto: CssLoaderOptionsAuto,
   bundle: boolean,
-  rootPath: string,
+  outBase: string | null,
 ): {
   config: EnvironmentConfig;
   resolvedJsRedirect?: DeepRequired<JsRedirect>;
@@ -1167,8 +1168,14 @@ const composeBundlelessExternalConfig = (
                 let resolvedRequest = request;
                 // use resolver to resolve the request
                 resolvedRequest = await resolver!(context!, resolvedRequest);
-                const isSubpath = resolvedRequest.startsWith(
-                  rootPath + path.sep,
+                if (typeof outBase !== 'string') {
+                  throw new Error(
+                    `outBase expect to be a string in bundleless mode, but got ${outBase}`,
+                  );
+                }
+
+                const isSubpath = normalizeSlash(resolvedRequest).startsWith(
+                  `${normalizeSlash(outBase)}/`,
                 );
 
                 // only handle the request that within the root path
@@ -1456,12 +1463,19 @@ async function composeLibRsbuildConfig(
     jsExtension,
     dtsExtension,
   } = composeAutoExtensionConfig(config, autoExtension, pkgJson);
+  const { entryConfig, outBase } = await composeEntryConfig(
+    config.source?.entry!,
+    config.bundle,
+    rootPath,
+    cssModulesAuto,
+    config.outBase,
+  );
   const { config: bundlelessExternalConfig } = composeBundlelessExternalConfig(
     jsExtension,
     redirect,
     cssModulesAuto,
     bundle,
-    rootPath,
+    outBase,
   );
   const {
     config: targetConfig,
@@ -1476,13 +1490,6 @@ async function composeLibRsbuildConfig(
     pkgJson,
     userExternals: config.output?.externals,
   });
-  const { entryConfig, outBase } = await composeEntryConfig(
-    config.source?.entry!,
-    config.bundle,
-    rootPath,
-    cssModulesAuto,
-    config.outBase,
-  );
   const cssConfig = composeCssConfig(
     outBase,
     config.bundle,

tests/integration/bundle-false/basic/.gitignore

@@ -0,0 +1 @@
+!node_modules/

tests/integration/bundle-false/basic/node_modules/dep_add/index.d.ts

@@ -0,0 +1,3 @@
+import { add } from 'dep_add';
+
+export const added = add(1, 2);

tests/integration/bundle-false/basic/node_modules/dep_add/index.js

@@ -1,5 +1,6 @@
 import { mainFiles1 } from './mainFiles1';
 export { mainFiles1 };
+export { added } from './dep';
 
 export * from './mainFiles2';
 export * from './utils/numbers';

tests/integration/bundle-false/basic/node_modules/dep_add/package.json

@@ -6,8 +6,10 @@ test('basic', async () => {
   const fixturePath = join(__dirname, 'basic');
   const { files, contents } = await buildAndGetResults({ fixturePath });
 
+  // ESM
   expect(files.esm).toMatchInlineSnapshot(`
     [
+      "<ROOT>/tests/integration/bundle-false/basic/dist/esm/dep.js",
       "<ROOT>/tests/integration/bundle-false/basic/dist/esm/index.js",
       "<ROOT>/tests/integration/bundle-false/basic/dist/esm/mainFiles1/index.js",
       "<ROOT>/tests/integration/bundle-false/basic/dist/esm/mainFiles2/index.js",
@@ -23,6 +25,7 @@ test('basic', async () => {
 
   expect(await import(esmIndexPath)).toMatchInlineSnapshot(`
     {
+      "added": 3,
       "mainFiles1": "mainFiles1",
       "mainFiles2": "mainFiles2",
       "num1": 1,
@@ -36,8 +39,46 @@ test('basic', async () => {
     }
   `);
 
+  const { content: indexContent } = queryContent(contents.esm, 'index.js', {
+    basename: true,
+  });
+  const { content: depContent } = queryContent(contents.esm, 'dep.js', {
+    basename: true,
+  });
+  const { content: sumContent } = queryContent(contents.esm, 'sum.js', {
+    basename: true,
+  });
+  expect(indexContent).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE__mainFiles1_index_js_c28bc628__ from "./mainFiles1/index.js";
+    import * as __WEBPACK_EXTERNAL_MODULE__dep_js_6cc8d1bf__ from "./dep.js";
+    export * from "./mainFiles2/index.js";
+    export * from "./utils/numbers.js";
+    export * from "./utils/strings.js";
+    export * from "./sum.js";
+    var __webpack_exports__added = __WEBPACK_EXTERNAL_MODULE__dep_js_6cc8d1bf__.added;
+    var __webpack_exports__mainFiles1 = __WEBPACK_EXTERNAL_MODULE__mainFiles1_index_js_c28bc628__.mainFiles1;
+    export { __webpack_exports__added as added, __webpack_exports__mainFiles1 as mainFiles1 };
+    "
+  `);
+  expect(depContent).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE_dep_add__ from "dep_add";
+    const added = (0, __WEBPACK_EXTERNAL_MODULE_dep_add__.add)(1, 2);
+    export { added };
+    "
+  `);
+  expect(sumContent).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE__utils_numbers_js_ac3baff3__ from "./utils/numbers.js";
+    import * as __WEBPACK_EXTERNAL_MODULE__utils_strings_js_56d354bf__ from "./utils/strings.js";
+    const numSum = __WEBPACK_EXTERNAL_MODULE__utils_numbers_js_ac3baff3__.num1 + __WEBPACK_EXTERNAL_MODULE__utils_numbers_js_ac3baff3__.num2 + __WEBPACK_EXTERNAL_MODULE__utils_numbers_js_ac3baff3__.num3;
+    const strSum = __WEBPACK_EXTERNAL_MODULE__utils_strings_js_56d354bf__.str1 + __WEBPACK_EXTERNAL_MODULE__utils_strings_js_56d354bf__.str2 + __WEBPACK_EXTERNAL_MODULE__utils_strings_js_56d354bf__.str3;
+    export { numSum, strSum };
+    "
+  `);
+
+  // CJS
   expect(files.cjs).toMatchInlineSnapshot(`
     [
+      "<ROOT>/tests/integration/bundle-false/basic/dist/cjs/dep.cjs",
       "<ROOT>/tests/integration/bundle-false/basic/dist/cjs/index.cjs",
       "<ROOT>/tests/integration/bundle-false/basic/dist/cjs/mainFiles1/index.cjs",
       "<ROOT>/tests/integration/bundle-false/basic/dist/cjs/mainFiles2/index.cjs",
@@ -53,6 +94,7 @@ test('basic', async () => {
 
   expect((await import(cjsIndexPath)).default).toMatchInlineSnapshot(`
     {
+      "added": 3,
       "mainFiles1": "mainFiles1",
       "mainFiles2": "mainFiles2",
       "num1": 1,