refactor: supersede entry query by entry dedicated loader

Author: fi3ework

packages/core/src/config.ts

@@ -941,7 +941,7 @@ const traverseEntryQuery = (
 };
 
 export const appendEntryQuery = (entries: RsbuildConfigEntry): RsbuildEntry =>
-  traverseEntryQuery(entries, (item) => `${item}?${RSLIB_ENTRY_QUERY}`);
+  traverseEntryQuery(entries, (item) => `${item}`);
 
 export const resolveEntryPath = (
   entries: RsbuildConfigEntry,
@@ -1020,7 +1020,8 @@ const composeEntryConfig = async (
     return {
       entryConfig: {
         source: {
-          entry: appendEntryQuery(resolveEntryPath(entries, root)),
+          // entry: appendEntryQuery(resolveEntryPath(entries, root)),
+          entry: resolveEntryPath(entries, root),
         },
       },
       outBase: null,
@@ -1126,7 +1127,8 @@ const composeEntryConfig = async (
       rspack: {
         entry: async () => {
           const { resolvedEntries } = await scanGlobEntries(false);
-          return appendEntryQuery(resolvedEntries);
+          // return appendEntryQuery(resolvedEntries);
+          return resolvedEntries;
         },
       },
     },

packages/core/src/plugins/EntryChunkPlugin.ts

@@ -205,7 +205,9 @@ const entryModuleLoaderRsbuildPlugin = (): RsbuildPlugin => ({
   setup(api) {
     api.modifyBundlerChain((config, { CHAIN_ID }) => {
       config.module
-        .rule(CHAIN_ID.RULE.JS)
+        .rule(`${CHAIN_ID.RULE.JS}:rslib_entry_loader`)
+        .test(/\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/)
+        .issuer(/^$/)
         .use(LOADER_NAME)
         .loader(require.resolve('./entryModuleLoader.js'));
     });

packages/core/src/plugins/entryModuleLoader.ts

@@ -17,18 +17,18 @@ function splitFromFirstLine(text: string): [string, string] {
 const loader: Rspack.LoaderDefinition = function loader(source) {
   let result = source;
 
-  if (this.resourceQuery === `?${RSLIB_ENTRY_QUERY}`) {
-    const [firstLine1, rest] = splitFromFirstLine(result);
+  // if (this.resourceQuery === `?${RSLIB_ENTRY_QUERY}`) {
+  const [firstLine1, rest] = splitFromFirstLine(result);
 
-    if (SHEBANG_REGEX.test(firstLine1)) {
-      result = rest;
-    }
+  if (SHEBANG_REGEX.test(firstLine1)) {
+    result = rest;
+  }
 
-    const [firstLine2, rest2] = splitFromFirstLine(result);
-    if (REACT_DIRECTIVE_REGEX.test(firstLine2)) {
-      result = rest2;
-    }
+  const [firstLine2, rest2] = splitFromFirstLine(result);
+  if (REACT_DIRECTIVE_REGEX.test(firstLine2)) {
+    result = rest2;
   }
+  // }
 
   return result;
 };

packages/core/tests/entry.test.ts

@@ -10,8 +10,8 @@ describe('appendEntryQuery', () => {
       }),
     ).toMatchInlineSnapshot(`
       {
-        "foo": "src/foo.js?__rslib_entry__",
-        "index": "src/index.js?__rslib_entry__",
+        "foo": "src/foo.js",
+        "index": "src/index.js",
       }
     `);
   });
@@ -25,11 +25,11 @@ describe('appendEntryQuery', () => {
     ).toMatchInlineSnapshot(`
       {
         "foo": [
-          "src/foo.js?__rslib_entry__",
+          "src/foo.js",
         ],
         "index": [
-          "src/index.ts?__rslib_entry__",
-          "src/extra.ts?__rslib_entry__",
+          "src/index.ts",
+          "src/extra.ts",
         ],
       }
     `);
@@ -54,13 +54,13 @@ describe('appendEntryQuery', () => {
             "src/dep.js",
           ],
           "import": [
-            "src/foo.js?__rslib_entry__",
+            "src/foo.js",
           ],
         },
         "index": {
           "import": [
-            "src/index.ts?__rslib_entry__",
-            "src/extra.ts?__rslib_entry__",
+            "src/index.ts",
+            "src/extra.ts",
           ],
           "layer": "l1",
         },
@@ -84,23 +84,23 @@ describe('appendEntryQuery', () => {
       }),
     ).toMatchInlineSnapshot(`
       {
-        "bar": "src/bar.ts?__rslib_entry__",
+        "bar": "src/bar.ts",
         "baz": [
-          "src/baz.ts?__rslib_entry__",
-          "src/bar.ts?__rslib_entry__",
+          "src/baz.ts",
+          "src/bar.ts",
         ],
         "foo": {
           "dependOn": [
             "src/dep.js",
           ],
           "import": [
-            "src/foo.js?__rslib_entry__",
+            "src/foo.js",
           ],
         },
         "index": {
           "import": [
-            "src/index.ts?__rslib_entry__",
-            "src/extra.ts?__rslib_entry__",
+            "src/index.ts",
+            "src/extra.ts",
           ],
           "layer": "l1",
         },

tests/integration/asset/__snapshots__/index.test.ts.snap

@@ -7,8 +7,8 @@ console.log(draft_namespaceObject);
 `;
 
 exports[`use asset/source 2`] = `
-"const draft_rslib_entry_namespaceObject = "this is a txt file\\nthis is a txt file\\n";
-export { draft_rslib_entry_namespaceObject as default };
+"const draft_namespaceObject = "this is a txt file\\nthis is a txt file\\n";
+export { draft_namespaceObject as default };
 "
 `;
 
@@ -19,8 +19,8 @@ console.log(draft_namespaceObject);
 `;
 
 exports[`use source.assetInclude 2`] = `
-"import draft_rslib_entry_namespaceObject from "../static/assets/draft.txt";
-export { draft_rslib_entry_namespaceObject as default };
+"import draft_namespaceObject from "../static/assets/draft.txt";
+export { draft_namespaceObject as default };
 "
 `;
 
@@ -49,8 +49,8 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_r
             ]
         })
     });
-const logo_rslib_entry_ = __rslib_svgr_url__0__;
-export { SvgLogo as ReactComponent, logo_rslib_entry_ as default };
+const logo = __rslib_svgr_url__0__;
+export { SvgLogo as ReactComponent, logo as default };
 "
 `;
 
@@ -81,7 +81,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>logo_rslib_entry_,
+    default: ()=>logo,
     ReactComponent: ()=>SvgLogo
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
@@ -107,7 +107,7 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
             ]
         })
     });
-const logo_rslib_entry_ = require("../static/svg/logo.svg");
+const logo = require("../static/svg/logo.svg");
 exports.ReactComponent = __webpack_exports__.ReactComponent;
 exports["default"] = __webpack_exports__["default"];
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
@@ -144,8 +144,8 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_r
             ]
         })
     });
-const logo_rslib_entry_ = SvgLogo;
-export { logo_rslib_entry_ as default };
+const logo = SvgLogo;
+export { logo as default };
 "
 `;
 
@@ -176,7 +176,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>logo_rslib_entry_
+    default: ()=>logo
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
@@ -201,7 +201,7 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
             ]
         })
     });
-const logo_rslib_entry_ = SvgLogo;
+const logo = SvgLogo;
 exports["default"] = __webpack_exports__["default"];
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "default"
@@ -213,15 +213,15 @@ Object.defineProperty(exports, '__esModule', {
 `;
 
 exports[`use svgr > should only contain url default export 1`] = `
-"import logo2_rslib_entry_namespaceObject from "../static/svg/logo2.svg";
-export { logo2_rslib_entry_namespaceObject as default };
+"import logo2_namespaceObject from "../static/svg/logo2.svg";
+export { logo2_namespaceObject as default };
 "
 `;
 
 exports[`use svgr > should only contain url default export 2`] = `
 ""use strict";
 var __webpack_modules__ = {
-    "./src/assets/logo2.svg?__rslib_entry__": function(module) {
+    "./src/assets/logo2.svg": function(module) {
         module.exports = require("../static/svg/logo2.svg");
     }
 };
@@ -235,7 +235,7 @@ function __webpack_require__(moduleId) {
     __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
     return module.exports;
 }
-var __webpack_exports__ = __webpack_require__("./src/assets/logo2.svg?__rslib_entry__");
+var __webpack_exports__ = __webpack_require__("./src/assets/logo2.svg");
 exports["default"] = __webpack_exports__["default"];
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "default"

tests/integration/asset/index.test.ts

@@ -36,13 +36,13 @@ test('set the size threshold to inline static assets', async () => {
   const { content: logoJs2 } = queryContent(contents.esm2!, /assets\/logo\.js/);
   expect(indexJs2).toMatchInlineSnapshot(`
     "import * as __WEBPACK_EXTERNAL_MODULE__assets_logo_js_450929b7__ from "./assets/logo.js";
-    const src_rslib_entry_ = __WEBPACK_EXTERNAL_MODULE__assets_logo_js_450929b7__["default"];
-    export { src_rslib_entry_ as default };
+    const src = __WEBPACK_EXTERNAL_MODULE__assets_logo_js_450929b7__["default"];
+    export { src as default };
     "
   `);
   expect(logoJs2).toMatchInlineSnapshot(`
-    "import logo_rslib_entry_namespaceObject from "../static/svg/logo.svg";
-    export { logo_rslib_entry_namespaceObject as default };
+    "import logo_namespaceObject from "../static/svg/logo.svg";
+    export { logo_namespaceObject as default };
     "
   `);
   // cjs
@@ -57,7 +57,7 @@ test('set the size threshold to inline static assets', async () => {
   expect(logoCjs2).toMatchInlineSnapshot(`
     ""use strict";
     var __webpack_modules__ = {
-        "./src/assets/logo.svg?__rslib_entry__": function(module) {
+        "./src/assets/logo.svg": function(module) {
             module.exports = require("../static/svg/logo.svg");
         }
     };
@@ -71,7 +71,7 @@ test('set the size threshold to inline static assets', async () => {
         __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
         return module.exports;
     }
-    var __webpack_exports__ = __webpack_require__("./src/assets/logo.svg?__rslib_entry__");
+    var __webpack_exports__ = __webpack_require__("./src/assets/logo.svg");
     exports["default"] = __webpack_exports__["default"];
     for(var __webpack_i__ in __webpack_exports__)if (-1 === [
         "default"
@@ -105,8 +105,8 @@ test('set the assets filename with hash', async () => {
     /assets\/image\.js/,
   );
   expect(imageJs1).toMatchInlineSnapshot(`
-    "import image_rslib_entry_namespaceObject from "../static/image/image.c74653c1.png";
-    export { image_rslib_entry_namespaceObject as default };
+    "import image_namespaceObject from "../static/image/image.c74653c1.png";
+    export { image_namespaceObject as default };
     "
   `);
   // cjs
@@ -117,7 +117,7 @@ test('set the assets filename with hash', async () => {
   expect(imageCjs1).toMatchInlineSnapshot(`
     ""use strict";
     var __webpack_modules__ = {
-        "./src/assets/image.png?__rslib_entry__": function(module) {
+        "./src/assets/image.png": function(module) {
             module.exports = require("../static/image/image.c74653c1.png");
         }
     };
@@ -131,7 +131,7 @@ test('set the assets filename with hash', async () => {
         __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
         return module.exports;
     }
-    var __webpack_exports__ = __webpack_require__("./src/assets/image.png?__rslib_entry__");
+    var __webpack_exports__ = __webpack_require__("./src/assets/image.png");
     exports["default"] = __webpack_exports__["default"];
     for(var __webpack_i__ in __webpack_exports__)if (-1 === [
         "default"
@@ -165,8 +165,8 @@ test('set the assets output path', async () => {
     /assets\/image\.js/,
   );
   expect(imageJs1).toMatchInlineSnapshot(`
-    "import image_rslib_entry_namespaceObject from "../assets/bundleless/image.png";
-    export { image_rslib_entry_namespaceObject as default };
+    "import image_namespaceObject from "../assets/bundleless/image.png";
+    export { image_namespaceObject as default };
     "
   `);
   // cjs
@@ -177,7 +177,7 @@ test('set the assets output path', async () => {
   expect(imageCjs1).toMatchInlineSnapshot(`
     ""use strict";
     var __webpack_modules__ = {
-        "./src/assets/image.png?__rslib_entry__": function(module) {
+        "./src/assets/image.png": function(module) {
             module.exports = require("../assets/bundleless/image.png");
         }
     };
@@ -191,7 +191,7 @@ test('set the assets output path', async () => {
         __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
         return module.exports;
     }
-    var __webpack_exports__ = __webpack_require__("./src/assets/image.png?__rslib_entry__");
+    var __webpack_exports__ = __webpack_require__("./src/assets/image.png");
     exports["default"] = __webpack_exports__["default"];
     for(var __webpack_i__ in __webpack_exports__)if (-1 === [
         "default"
@@ -258,8 +258,8 @@ test('set the assets public path', async () => {
     (()=>{
         __webpack_require__.p = "/public/path/";
     })();
-    const image_rslib_entry_namespaceObject = __webpack_require__.p + "static/image/image.png";
-    export { image_rslib_entry_namespaceObject as default };
+    const image_namespaceObject = __webpack_require__.p + "static/image/image.png";
+    export { image_namespaceObject as default };
     "
   `);
 });

tests/integration/bundle-false/__snapshots__/index.test.ts.snap

@@ -25,8 +25,8 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_r
             ]
         })
     });
-const logo_rslib_entry_ = __rslib_svgr_url__0__;
-export { SvgLogo as ReactComponent, logo_rslib_entry_ as default };
+const logo = __rslib_svgr_url__0__;
+export { SvgLogo as ReactComponent, logo as default };
 "
 `;
 
@@ -57,7 +57,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>logo_rslib_entry_,
+    default: ()=>logo,
     ReactComponent: ()=>SvgLogo
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
@@ -83,7 +83,7 @@ const SvgLogo = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("svg
             ]
         })
     });
-const logo_rslib_entry_ = require("../static/svg/logo.svg");
+const logo = require("../static/svg/logo.svg");
 exports.ReactComponent = __webpack_exports__.ReactComponent;
 exports["default"] = __webpack_exports__["default"];
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [