fix: only treat files within context as source file (#677)

Author: fi3ework

packages/core/src/config.ts

@@ -878,6 +878,12 @@ const traverseEntryQuery = (
 export const appendEntryQuery = (entries: RsbuildConfigEntry): RsbuildEntry =>
   traverseEntryQuery(entries, (item) => `${item}?${RSLIB_ENTRY_QUERY}`);
 
+export const resolveEntryPath = (
+  entries: RsbuildConfigEntry,
+  root: string,
+): RsbuildEntry =>
+  traverseEntryQuery(entries, (item) => path.resolve(root, item));
+
 const composeEntryConfig = async (
   rawEntry: RsbuildConfigEntry,
   bundle: LibConfig['bundle'],
@@ -939,7 +945,7 @@ const composeEntryConfig = async (
     return {
       entryConfig: {
         source: {
-          entry: appendEntryQuery(entries),
+          entry: appendEntryQuery(resolveEntryPath(entries, root)),
         },
       },
       lcp: null,
@@ -1044,6 +1050,7 @@ const composeBundlelessExternalConfig = (
   redirect: Redirect,
   cssModulesAuto: CssLoaderOptionsAuto,
   bundle: boolean,
+  rootPath: string,
 ): {
   config: EnvironmentConfig;
   resolvedJsRedirect?: DeepRequired<JsRedirect>;
@@ -1083,9 +1090,12 @@ const composeBundlelessExternalConfig = (
                 let resolvedRequest = request;
                 // use resolver to resolve the request
                 resolvedRequest = await resolver!(context!, resolvedRequest);
+                const isSubpath = resolvedRequest.startsWith(
+                  rootPath + path.sep,
+                );
 
-                // only handle the request that is not in node_modules
-                if (!resolvedRequest.includes('node_modules')) {
+                // only handle the request that within the root path
+                if (isSubpath) {
                   resolvedRequest = normalizeSlash(
                     path.relative(path.dirname(issuer), resolvedRequest),
                   );
@@ -1359,6 +1369,7 @@ async function composeLibRsbuildConfig(
     redirect,
     cssModulesAuto,
     bundle,
+    rootPath,
   );
   const {
     config: targetConfig,

pnpm-lock.yaml

@@ -47,6 +47,7 @@ icss
 idents
 iife
 imagex
+importee
 jfif
 jiti
 jscpuprofile

scripts/dictionary.txt

@@ -1,3 +1,3 @@
-import logo from '../../../../assets/logo.svg';
+import logo from '../assets/logo.svg';
 
 export default logo;

tests/assets/logo.svg renamed to tests/integration/asset/limit/assets/logo.svg

@@ -1,4 +1,4 @@
-import a from '../../../../assets/image.png';
+import a from '../assets/image.png';
 
 export default () => {
   return <img src={a} alt="" />;

tests/integration/asset/limit/src/index.js

@@ -1,3 +1,3 @@
-import a from '../../../../assets/image.png';
+import a from '../assets/image.png';
 
 export default a;

tests/assets/image.png renamed to tests/integration/asset/name/assets/image.png

@@ -1,3 +1,3 @@
-import logo from '../../../../assets/logo.svg';
+import logo from '../assets/logo.svg';
 
 export default logo;

tests/integration/asset/name/src/index.jsx

@@ -1,3 +1,3 @@
-import logo from '../../../../assets/logo.svg?react';
+import logo from '../assets/logo.svg?react';
 
 console.log(logo);

tests/integration/asset/path/assets/image.png

@@ -1,3 +1,3 @@
-import { ReactComponent } from '../../../../assets/logo.svg';
+import { ReactComponent } from '../assets/logo.svg';
 
 console.log(ReactComponent);

tests/integration/asset/path/src/index.js

@@ -1,5 +1,5 @@
-import image from '../../../../assets/image.png';
-import logoURL from '../../../../assets/logo.svg';
+import image from '../assets/image.png';
+import logoURL from '../assets/logo.svg';
 
 console.log(logoURL);
 console.log(image);

tests/integration/asset/public-path/assets/logo.svg

@@ -67,6 +67,21 @@ test('basic', async () => {
   `);
 });
 
+test('monorepo', async () => {
+  const fixturePath = join(__dirname, 'monorepo/importer');
+  const { contents } = await buildAndGetResults({ fixturePath });
+  expect(
+    queryContent(contents.esm, 'index.js', {
+      basename: true,
+    }).content,
+  ).toMatchInlineSnapshot(`
+    "import * as __WEBPACK_EXTERNAL_MODULE_bundle_false_monorepo_importee_test_35ca595f__ from "bundle-false-monorepo-importee-test";
+    const src_rslib_entry_ = __WEBPACK_EXTERNAL_MODULE_bundle_false_monorepo_importee_test_35ca595f__["default"];
+    export { src_rslib_entry_ as default };
+    "
+  `);
+});
+
 test('single file', async () => {
   const fixturePath = join(__dirname, 'single-file');
   const { files } = await buildAndGetResults({ fixturePath });

tests/integration/asset/public-path/src/index.js

@@ -0,0 +1 @@
+export default 'importee';

tests/integration/asset/svgr/assets/logo.svg

@@ -0,0 +1,7 @@
+{
+  "name": "bundle-false-monorepo-importee-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "main": "./index.js"
+}

tests/integration/asset/svgr/src/index.js

@@ -0,0 +1,9 @@
+{
+  "name": "bundle-false-monorepo-importer-test",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "dependencies": {
+    "bundle-false-monorepo-importee-test": "workspace:*"
+  }
+}

tests/integration/asset/svgr/src/namedExport.js

@@ -0,0 +1,18 @@
+import { defineConfig } from '@rslib/core';
+import { generateBundleCjsConfig, generateBundleEsmConfig } from 'test-helper';
+
+export default defineConfig({
+  lib: [
+    generateBundleEsmConfig({
+      bundle: false,
+    }),
+    generateBundleCjsConfig({
+      bundle: false,
+    }),
+  ],
+  source: {
+    entry: {
+      index: ['./src/**'],
+    },
+  },
+});

tests/integration/bundle-false/asset/assets/image.png

@@ -0,0 +1,3 @@
+import importee from 'bundle-false-monorepo-importee-test';
+
+export default importee;

tests/integration/bundle-false/asset/assets/logo.svg

@@ -1,3 +1,3 @@
-import Logo from '../../../../assets/logo.svg?react';
+import Logo from '../assets/logo.svg?react';
 
 export default Logo;

tests/integration/bundle-false/asset/src/index.js

@@ -5,6 +5,4 @@ import prettier from 'prettier';
 import bar from './bar.js';
 import foo from './foo';
 
-console.log('prettier: ', prettier);
-
-export default lodash.toUpper(foo + bar);
+export default lodash.toUpper(foo + bar + prettier.version);