advanced esm test

Author: Timeless0911

.github/workflows/preview.yml

@@ -3,10 +3,13 @@ name: Preview Release
 
 on:
   push:
-    branches:
-      - main
-      - beta
+    branches: [main]
   workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch to release'
+        required: true
+        default: 'main'
 
 permissions:
   contents: read
@@ -21,6 +24,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           fetch-depth: 1
+          ref: ${{ github.event.inputs.branch }}
 
       - name: Install pnpm
         run: |

packages/core/src/config.ts

@@ -675,7 +675,9 @@ const composeFormatConfig = ({
               module: true,
               chunkFormat: experimentalEsmOutput ? false : 'module',
               library: experimentalEsmOutput
-                ? undefined
+                ? {
+                    type: 'advanced-esm',
+                  }
                 : {
                     type: 'modern-module',
                   },

packages/core/tests/__snapshots__/config.test.ts.snap

@@ -104,7 +104,7 @@ exports[`Should compose create Rsbuild config correctly > Enable experiment.adva
     pathinfo: false,
     hashFunction: 'xxhash64',
     library: {
-      type: 'commonjs2'
+      type: 'advanced-esm'
     },
     assetModuleFilename: 'static/assets/[name][ext]',
     webassemblyModuleFilename: 'static/wasm/[contenthash:8].module.wasm',
@@ -3726,7 +3726,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config i
         use: [
           /* config.module.rule('css').use('mini-css-extract') */
           {
-            loader: '<ROOT>/node_modules/<PNPM_INNER>/@rspack-canary/core/dist/cssExtractLoader.js'
+            loader: '/Users/bytedance/codes/rspack/packages/rspack/dist/cssExtractLoader.js'
           },
           /* config.module.rule('css').use('css') */
           {

pnpm-lock.yaml

@@ -18,7 +18,7 @@ onlyBuiltDependencies:
 
 overrides:
   'zx>@types/node': '-'
-  '@rspack/core': 'npm:@rspack-canary/[email protected]6cd722f4-20251022123039'
+  '@rspack/core': 'npm:@rspack-canary/[email protected]cf832f72-20251028084837'
 
 strictPeerDependencies: false
 autoInstallPeers: false

pnpm-workspace.yaml

@@ -218,25 +218,58 @@ test('set the assets public path', async () => {
   // 2. bundle
   // esm
   const { content: indexJs } = queryContent(contents.esm0!, /index\.js/);
-  expect(indexJs).toMatchInlineSnapshot(`
-    "var __webpack_module_cache__ = {};
-    function __webpack_require__(moduleId) {
-        var cachedModule = __webpack_module_cache__[moduleId];
-        if (void 0 !== cachedModule) return cachedModule.exports;
-        var module = __webpack_module_cache__[moduleId] = {
-            exports: {}
-        };
-        __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-        return module.exports;
-    }
-    (()=>{
-        __webpack_require__.p = "/public/path/";
-    })();
-    const image_namespaceObject = __webpack_require__.p + "static/image/image.png";
-    const src = image_namespaceObject;
-    export { src as default };
-    "
-  `);
+  if (process.env.ADVANCED_ESM) {
+    const { content: runtimeJs } = queryContent(contents.esm0!, /runtime\.js/);
+    expect(indexJs).toMatchInlineSnapshot(`
+      "import { __webpack_require__ } from "./runtime.js";
+      const image_namespaceObject = __webpack_require__.p + "static/image/image.png";
+      const src = image_namespaceObject;
+      export default src;
+      "
+    `);
+    expect(runtimeJs).toMatchInlineSnapshot(`
+      "var __webpack_module_cache__ = {};
+      function __webpack_require__(moduleId) {
+          var cachedModule = __webpack_module_cache__[moduleId];
+          if (void 0 !== cachedModule) return cachedModule.exports;
+          var module = __webpack_module_cache__[moduleId] = {
+              exports: {}
+          };
+          __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+          return module.exports;
+      }
+      (()=>{
+          __webpack_require__.add = function(modules) {
+              Object.assign(__webpack_require__.m, modules);
+          };
+      })();
+      (()=>{
+          __webpack_require__.p = "/public/path/";
+      })();
+      export { __webpack_require__ };
+      "
+    `);
+  } else {
+    expect(indexJs).toMatchInlineSnapshot(`
+      "var __webpack_module_cache__ = {};
+      function __webpack_require__(moduleId) {
+          var cachedModule = __webpack_module_cache__[moduleId];
+          if (void 0 !== cachedModule) return cachedModule.exports;
+          var module = __webpack_module_cache__[moduleId] = {
+              exports: {}
+          };
+          __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+          return module.exports;
+      }
+      (()=>{
+          __webpack_require__.p = "/public/path/";
+      })();
+      const image_namespaceObject = __webpack_require__.p + "static/image/image.png";
+      const src = image_namespaceObject;
+      export { src as default };
+      "
+    `);
+  }
 
   // 3. bundleless
   // esm