chore: update

Author: SoonIter

packages/core/src/asset/LibAssetExtractPlugin.ts

@@ -26,7 +26,14 @@ function extractAssetFilenames(content: string): string[] {
     .filter(Boolean) as string[];
 }
 
-// 2. bundle: concatenated
+// 2. bundle
+// remove __webpack_require__.p and __webpack_require__.g
+const WEBPACK_REQUIRE_G_IIFE =
+  /\(\(\)\s*=>\s*{.*?__webpack_require__\.g\s\=.*?}\)\(\);/gms;
+const WEBPACK_REQUIRE_P_IIFE =
+  /\(\(\)\s*=>\s*{.*?__webpack_require__\.p\s\=.*?}\)\(\);/gms;
+
+// 2.1 bundle: concatenated
 const CONCATENATED_PATTERN: RegExp =
   /(const|var)\s(\w+)\s=\s\(?__webpack_require__\.p\s\+\s["'](.+)["']\)?/g;
 const concatenatedEsmReplaceTemplate = (variableName: string, url: string) =>
@@ -37,7 +44,7 @@ const concatenatedCjsReplaceTemplate = (
   url: string,
 ) => `${declarationKind} ${variableName} = require('${url}');`;
 
-// 3. bundle: not concatenated, in __webpack_require__.m
+// 2.2 bundle: not concatenated, in __webpack_require__.m
 const NOT_CONCATENATED_PATTERN: RegExp =
   /module\.exports = __webpack_require__\.p\s\+\s["'](.+)["']/g;
 const nonConcatenatedReplaceTemplate = (url: string) =>
@@ -115,6 +122,9 @@ class LibAssetExtractPlugin implements Rspack.RspackPluginInstance {
                 );
               }
             }
+            replace(WEBPACK_REQUIRE_G_IIFE, () => '');
+            replace(WEBPACK_REQUIRE_P_IIFE, () => '');
+
             replace(CONCATENATED_PATTERN, (match) => {
               const declarationKind = match[1];
               const variableName = match[2];

packages/core/src/asset/assetConfig.ts

@@ -24,7 +24,6 @@ const pluginLibAsset = ({ bundle }: { bundle: boolean }): RsbuildPlugin => ({
           .oneOf(CHAIN_ID.RULE.SVG);
         rule.issuer([]);
       }
-
       config
         .plugin(LibAssetExtractPlugin.name)
         .use(LibAssetExtractPlugin, [{ bundle, isUsingSvgr }]);

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

@@ -3,24 +3,6 @@
 exports[`use svgr 1`] = `
 "import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__ from "react/jsx-runtime";
 import "react";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.g = function() {
-        if ('object' == typeof globalThis) return globalThis;
-        try {
-            return this || new Function('return this')();
-        } catch (e) {
-            if ('object' == typeof window) return window;
-        }
-    }();
-})();
-(()=>{
-    var scriptUrl;
-    if ("string" == typeof import.meta.url) scriptUrl = import.meta.url;
-    if (!scriptUrl) throw new Error("Automatic publicPath is not supported in this browser");
-    scriptUrl = scriptUrl.replace(/#.*$/, "").replace(/\\?.*$/, "").replace(/\\/[^\\/]+$/, "/");
-    __webpack_require__.p = scriptUrl;
-})();
 const SvgLogo = (props)=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime_225474f2__.jsx)("svg", {
         xmlns: "http://www.w3.org/2000/svg",
         viewBox: "0 0 841.9 595.3",
@@ -73,35 +55,6 @@ console.log(logo);
 
 exports[`use svgr 2`] = `
 ""use strict";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.g = function() {
-        if ('object' == typeof globalThis) return globalThis;
-        try {
-            return this || new Function('return this')();
-        } catch (e) {
-            if ('object' == typeof window) return window;
-        }
-    }();
-})();
-(()=>{
-    var scriptUrl;
-    if (__webpack_require__.g.importScripts) scriptUrl = __webpack_require__.g.location + "";
-    var document = __webpack_require__.g.document;
-    if (!scriptUrl && document) {
-        if (document.currentScript && 'SCRIPT' === document.currentScript.tagName.toUpperCase()) scriptUrl = document.currentScript.src;
-        if (!scriptUrl) {
-            var scripts = document.getElementsByTagName("script");
-            if (scripts.length) {
-                var i = scripts.length - 1;
-                while(i > -1 && (!scriptUrl || !/^http(s?):/.test(scriptUrl)))scriptUrl = scripts[i--].src;
-            }
-        }
-    }
-    if (!scriptUrl) throw new Error("Automatic publicPath is not supported in this browser");
-    scriptUrl = scriptUrl.replace(/#.*$/, "").replace(/\\?.*$/, "").replace(/\\/[^\\/]+$/, "/");
-    __webpack_require__.p = scriptUrl;
-})();
 var __webpack_exports__ = {};
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");

tests/integration/asset/index.test.ts

@@ -137,10 +137,10 @@ test('set the assets output path', async () => {
 test('set the assets public path', async () => {
   const fixturePath = join(__dirname, 'public-path');
   const { contents } = await buildAndGetResults({ fixturePath });
-
+  
+  // umd should preserve '__webpack_require__.p'
   const { content: indexUmdJs } = queryContent(contents.umd!, /index\.js/);
 
-  // umd
   expect(indexUmdJs).toContain(
     '__webpack_require__.p = "/public/path/bundleless/";',
   );