www

Author: fi3ework

packages/core/src/constant.ts

@@ -12,7 +12,7 @@ export const DEFAULT_CONFIG_EXTENSIONS = [
 export const SWC_HELPERS = '@swc/helpers';
 export const RSLIB_ENTRY_QUERY = '__rslib_entry__';
 export const SHEBANG_PREFIX = '#!';
-export const SHEBANG_REGEX: RegExp = /#!.*[\s\n\r]*/;
+export const SHEBANG_REGEX: RegExp = /#!.*[\s\n\r]*$/;
 export const REACT_DIRECTIVE_REGEX: RegExp =
   /^['"]use (client|server)['"](;?)[\s\n\r]*$/;
 

packages/core/src/plugins/EntryChunkPlugin.ts

@@ -1,6 +1,6 @@
 import { chmodSync } from 'node:fs';
 import { createRequire } from 'node:module';
-import os from 'node:os';
+// import os from 'node:os';
 import {
   type RsbuildConfig,
   type RsbuildPlugin,
@@ -19,8 +19,9 @@ const require = createRequire(import.meta.url);
 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);
+const matchFirstLine = (source: string, regex: RegExp): string | false => {
+  const lineBreak = source.match(/(\r\n|\n)/);
+  const firstLine = source.slice(0, lineBreak?.index);
   if (!firstLine) {
     return false;
   }

packages/core/src/plugins/entryModuleLoader.ts

@@ -1,25 +1,35 @@
-import os from 'node:os';
+// import os from 'node:os';
 import type { LoaderDefinition } from '@rspack/core';
 import {
   REACT_DIRECTIVE_REGEX,
   RSLIB_ENTRY_QUERY,
   SHEBANG_REGEX,
 } from '../constant';
 
+function splitFirstLine(text: string): [string, string] {
+  const match = text.match(/(\r\n|\n)/);
+  if (!match) {
+    return [text, ''];
+  }
+
+  return [text.slice(0, match.index), text.slice(match.index)];
+}
+
 const loader: LoaderDefinition = function loader(source) {
   let result = source;
 
   if (this.resourceQuery === `?${RSLIB_ENTRY_QUERY}`) {
-    console.log('👝', source.includes('\n'), source.includes('\r\n'));
-    const [firstLine1, ...rest1] = result.split(os.EOL);
+    // console.log('👝', source.includes('\n'), source.includes('\r\n'));
+    // const [firstLine1, ...rest1] = result.split('\n');
+    const [firstLine1, rest] = splitFirstLine(result);
 
-    if (SHEBANG_REGEX.test(firstLine1!)) {
-      result = rest1.join('\n');
+    if (SHEBANG_REGEX.test(firstLine1)) {
+      result = rest;
     }
 
-    const [firstLine2, ...rest2] = result.split(os.EOL);
-    if (REACT_DIRECTIVE_REGEX.test(firstLine2!)) {
-      result = rest2.join('\n');
+    const [firstLine2, rest2] = splitFirstLine(result);
+    if (REACT_DIRECTIVE_REGEX.test(firstLine2)) {
+      result = rest2;
     }
   }