up

Author: fi3ework

packages/core/src/config.ts

@@ -24,7 +24,7 @@ import {
   cssExternalHandler,
   isCssGlobalFile,
 } from './css/cssConfig';
-import { composePostEntryChunkConfig } from './plugins/PostEntryChunkPlugin';
+import { composeEntryChunkConfig } from './plugins/EntryChunkPlugin';
 import {
   pluginCjsImportMetaUrlShim,
   pluginEsmRequireShim,
@@ -1107,8 +1107,8 @@ async function composeLibRsbuildConfig(config: LibConfig, configPath: string) {
     cssModulesAuto,
   );
   const cssConfig = composeCssConfig(lcp, config.bundle);
-  const postEntryChunkConfig = composePostEntryChunkConfig({
-    importMetaUrlShim: !!resolvedShims?.cjs?.['import.meta.url'],
+  const entryChunkConfig = composeEntryChunkConfig({
+    enabledImportMetaUrlShim: !!resolvedShims?.cjs?.['import.meta.url'],
   });
   const dtsConfig = await composeDtsConfig(config, dtsExtension);
   const externalsWarnConfig = composeExternalsWarnConfig(
@@ -1137,7 +1137,7 @@ async function composeLibRsbuildConfig(config: LibConfig, configPath: string) {
     targetConfig,
     entryConfig,
     cssConfig,
-    postEntryChunkConfig,
+    entryChunkConfig,
     minifyConfig,
     dtsConfig,
     bannerFooterConfig,

packages/core/src/css/RemoveCssExtractAssetPlugin.ts

@@ -5,6 +5,7 @@ const pluginName = 'REMOVE_CSS_EXTRACT_ASSET_PLUGIN';
 type Options = {
   include: RegExp;
 };
+
 class RemoveCssExtractAssetPlugin implements RspackPluginInstance {
   readonly name: string = pluginName;
   options: Options;

packages/core/src/plugins/PostEntryChunkPlugin.ts renamed to packages/core/src/plugins/EntryChunkPlugin.ts

@@ -1,3 +1,4 @@
+import { chmodSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import os from 'node:os';
 import {
@@ -15,7 +16,8 @@ import {
 import { importMetaUrlShim } from './shims';
 const require = createRequire(import.meta.url);
 
-const PLUGIN_NAME = 'rsbuild:entry';
+const PLUGIN_NAME = 'rsbuild:lib-entry-chunk';
+const LOADER_NAME = 'rsbuild:lib-entry-module';
 
 const matchFirstLine = (source: string, regex: RegExp) => {
   const [firstLine] = source.split(os.EOL);
@@ -30,19 +32,23 @@ const matchFirstLine = (source: string, regex: RegExp) => {
   return matched[0];
 };
 
-class PostEntryPlugin {
-  private enabledImportMetaUrlShim: boolean;
-  private shebangEntries: Record<string, string> = {};
+class EntryChunkPlugin {
   private reactDirectives: Record<string, string> = {};
+
+  private shebangChmod = 0o755;
+  private shebangEntries: Record<string, string> = {};
+  private shebangInjectedAssets: Set<string> = new Set();
+
+  private enabledImportMetaUrlShim: boolean;
   private importMetaUrlShims: Record<string, { startsWithUseStrict: boolean }> =
     {};
 
   constructor({
-    importMetaUrlShim = true,
+    enabledImportMetaUrlShim = true,
   }: {
-    importMetaUrlShim: boolean;
+    enabledImportMetaUrlShim: boolean;
   }) {
-    this.enabledImportMetaUrlShim = importMetaUrlShim;
+    this.enabledImportMetaUrlShim = enabledImportMetaUrlShim;
   }
 
   apply(compiler: Rspack.Compiler) {
@@ -136,7 +142,7 @@ class PostEntryPlugin {
                   replaceSource.replace(
                     0,
                     11, // 'use strict;'.length,
-                    `"use strict";\n${importMetaUrlShim}`,
+                    `"use strict";${os.EOL}${importMetaUrlShim}`,
                   );
                 } else {
                   replaceSource.insert(0, importMetaUrlShim);
@@ -168,12 +174,13 @@ class PostEntryPlugin {
                 const replaceSource = new rspack.sources.ReplaceSource(old);
                 // Shebang
                 if (shebangValue) {
-                  replaceSource.insert(0, `${shebangValue}\n`);
+                  replaceSource.insert(0, `${shebangValue}${os.EOL}`);
+                  this.shebangInjectedAssets.add(name);
                 }
 
                 // React directives
                 if (reactDirectiveValue) {
-                  replaceSource.insert(0, `${reactDirectiveValue}\n`);
+                  replaceSource.insert(0, `${reactDirectiveValue}${os.EOL}`);
                 }
 
                 return replaceSource;
@@ -183,34 +190,39 @@ class PostEntryPlugin {
         },
       );
     });
+
+    compiler.hooks.assetEmitted.tap(PLUGIN_NAME, (file, { targetPath }) => {
+      if (this.shebangInjectedAssets.has(file)) {
+        chmodSync(targetPath, this.shebangChmod);
+      }
+    });
   }
 }
 
-const entryModuleLoaderPlugin = (): RsbuildPlugin => ({
+const entryModuleLoaderRsbuildPlugin = (): RsbuildPlugin => ({
   name: PLUGIN_NAME,
   setup(api) {
     api.modifyBundlerChain((config, { CHAIN_ID }) => {
-      const rule = config.module.rule(CHAIN_ID.RULE.JS);
-      rule
-        .use('shebang')
-        .loader(require.resolve('./entryModuleLoader.js'))
-        .options({});
+      config.module
+        .rule(CHAIN_ID.RULE.JS)
+        .use(LOADER_NAME)
+        .loader(require.resolve('./entryModuleLoader.js'));
     });
   },
 });
 
-export const composePostEntryChunkConfig = ({
-  importMetaUrlShim,
+export const composeEntryChunkConfig = ({
+  enabledImportMetaUrlShim,
 }: {
-  importMetaUrlShim: boolean;
+  enabledImportMetaUrlShim: boolean;
 }): RsbuildConfig => {
   return {
-    plugins: [entryModuleLoaderPlugin()],
+    plugins: [entryModuleLoaderRsbuildPlugin()],
     tools: {
       rspack: {
         plugins: [
-          new PostEntryPlugin({
-            importMetaUrlShim: importMetaUrlShim,
+          new EntryChunkPlugin({
+            enabledImportMetaUrlShim,
           }),
         ],
       },

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

@@ -55,7 +55,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
       },
       "plugins": [
         {
-          "name": "rsbuild:entry",
+          "name": "rsbuild:lib-entry-chunk",
           "setup": [Function],
         },
       ],
@@ -151,11 +151,13 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
           },
           {
             "plugins": [
-              PostEntryPlugin {
+              EntryChunkPlugin {
                 "enabledImportMetaUrlShim": true,
                 "importMetaUrlShims": {},
                 "reactDirectives": {},
+                "shebangChmod": 493,
                 "shebangEntries": {},
+                "shebangInjectedAssets": Set {},
               },
             ],
           },
@@ -233,7 +235,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
           "setup": [Function],
         },
         {
-          "name": "rsbuild:entry",
+          "name": "rsbuild:lib-entry-chunk",
           "setup": [Function],
         },
       ],
@@ -322,11 +324,13 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
           },
           {
             "plugins": [
-              PostEntryPlugin {
+              EntryChunkPlugin {
                 "enabledImportMetaUrlShim": true,
                 "importMetaUrlShims": {},
                 "reactDirectives": {},
+                "shebangChmod": 493,
                 "shebangEntries": {},
+                "shebangInjectedAssets": Set {},
               },
             ],
           },
@@ -400,7 +404,7 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
       },
       "plugins": [
         {
-          "name": "rsbuild:entry",
+          "name": "rsbuild:lib-entry-chunk",
           "setup": [Function],
         },
       ],
@@ -477,11 +481,13 @@ exports[`Should compose create Rsbuild config correctly > Merge Rsbuild config 1
           },
           {
             "plugins": [
-              PostEntryPlugin {
+              EntryChunkPlugin {
                 "enabledImportMetaUrlShim": true,
                 "importMetaUrlShims": {},
                 "reactDirectives": {},
+                "shebangChmod": 493,
                 "shebangEntries": {},
+                "shebangInjectedAssets": Set {},
               },
             ],
           },