win

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,5 @@
 import { chmodSync } from 'node:fs';
 import { createRequire } from 'node:module';
-import os from 'node:os';
 import {
   type RsbuildConfig,
   type RsbuildPlugin,
@@ -19,12 +18,10 @@ 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);
-  if (!firstLine) {
-    return false;
-  }
-  const matched = regex.exec(firstLine);
+const matchFirstLine = (source: string, regex: RegExp): string | false => {
+  const lineBreakPos = source.match(/(\r\n|\n)/);
+  const firstLineContent = source.slice(0, lineBreakPos?.index);
+  const matched = regex.exec(firstLineContent);
   if (!matched) {
     return false;
   }
@@ -126,7 +123,7 @@ class EntryChunkPlugin {
               replaceSource.replace(
                 0,
                 11, // 'use strict;'.length,
-                `"use strict";${os.EOL}${importMetaUrlShim}`,
+                `"use strict";\n${importMetaUrlShim}`,
               );
             } else {
               replaceSource.insert(0, importMetaUrlShim);
@@ -154,13 +151,13 @@ class EntryChunkPlugin {
                 const replaceSource = new rspack.sources.ReplaceSource(old);
                 // Shebang
                 if (shebangValue) {
-                  replaceSource.insert(0, `${shebangValue}${os.EOL}`);
+                  replaceSource.insert(0, `${shebangValue}\n`);
                   this.shebangInjectedAssets.add(name);
                 }
 
                 // React directives
                 if (reactDirectiveValue) {
-                  replaceSource.insert(0, `${reactDirectiveValue}${os.EOL}`);
+                  replaceSource.insert(0, `${reactDirectiveValue}\n`);
                 }
 
                 return replaceSource;

packages/core/src/plugins/entryModuleLoader.ts

@@ -1,23 +1,32 @@
-import os from 'node:os';
 import type { LoaderDefinition } from '@rspack/core';
 import {
   REACT_DIRECTIVE_REGEX,
   RSLIB_ENTRY_QUERY,
   SHEBANG_REGEX,
 } from '../constant';
 
+function splitFromFirstLine(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}`) {
-    const [firstLine1, ...rest1] = result.split(os.EOL).slice(1);
-    if (SHEBANG_REGEX.test(firstLine1!)) {
-      result = rest1.join(os.EOL);
+    const [firstLine1, rest] = splitFromFirstLine(result);
+
+    if (SHEBANG_REGEX.test(firstLine1)) {
+      result = rest;
     }
 
-    const [firstLine2, ...rest2] = result.split(os.EOL);
-    if (REACT_DIRECTIVE_REGEX.test(firstLine2!)) {
-      result = rest2.join(os.EOL);
+    const [firstLine2, rest2] = splitFromFirstLine(result);
+    if (REACT_DIRECTIVE_REGEX.test(firstLine2)) {
+      result = rest2;
     }
   }
 

pnpm-lock.yaml

@@ -1,5 +1,5 @@
 {
-  "name": "directive-react-bundleless-test",
+  "name": "directive-react-test",
   "version": "1.0.0",
   "private": true,
   "type": "module"

tests/integration/directive/react/bundleless/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "directive-shebang-bundle-test",
+  "name": "directive-shebang-test",
   "version": "1.0.0",
   "private": true,
   "type": "module"

tests/integration/directive/shebang/package.json

@@ -95,10 +95,11 @@ describe('CJS shims', () => {
     const fileUrl = pathToFileURL(entryFiles.cjs).href;
     expect(importMetaUrl).toBe(fileUrl);
     expect(requiredModule).toBe('ok');
-    expect(cjsCode.startsWith('"use strict"')).toBe(true);
-    expect(cjsCode).toContain(
-      'const __rslib_import_meta_url__ = /*#__PURE__*/ function() {',
-    );
+    expect(
+      cjsCode.startsWith(
+        `"use strict";\nconst __rslib_import_meta_url__ = /*#__PURE__*/ function() {`,
+      ),
+    ).toBe(true);
   });
 
   test('ESM should not be affected by CJS shims configuration', async () => {