Revert "tools: refactor tools/license2rtf to ESM"

This reverts commit 30cb1bf. PR-URL: #43214 Fixes: #43213 Refs: #43101 Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: LiviaMedeiros <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · May 26, 2022 · 331088f · 331088f
1 parent cb4a558
commit 331088f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -1096,7 +1096,7 @@ endif
 		$(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules
 	unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npm
 	unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npx
-	$(NODE) tools/license2rtf.mjs < LICENSE > \
+	$(NODE) tools/license2rtf.js < LICENSE > \
 		$(MACOSOUTDIR)/installer/productbuild/Resources/license.rtf
 	cp doc/osx_installer_logo.png $(MACOSOUTDIR)/installer/productbuild/Resources
 	pkgbuild --version $(FULLVERSION) \

diff --git a/tools/license2rtf.mjs → tools/license2rtf.js b/tools/license2rtf.mjs → tools/license2rtf.js
@@ -1,7 +1,8 @@
-import assert from 'node:assert';
-import Stream from 'node:stream';
-import { pipeline } from 'node:stream/promises';
-import { stdin, stdout } from 'node:process';
+'use strict';
+
+const assert = require('assert');
+const Stream = require('stream');
+
 
 /*
  * This filter consumes a stream of characters and emits one string per line.
@@ -286,14 +287,19 @@ class RtfGenerator extends Stream {
   }
 }
 
+
+const stdin = process.stdin;
+const stdout = process.stdout;
+const lineSplitter = new LineSplitter();
+const paragraphParser = new ParagraphParser();
+const unwrapper = new Unwrapper();
+const rtfGenerator = new RtfGenerator();
+
 stdin.setEncoding('utf-8');
 stdin.resume();
 
-await pipeline(
-  stdin,
-  new LineSplitter(),
-  new ParagraphParser(),
-  new Unwrapper(),
-  new RtfGenerator(),
-  stdout,
-);
+stdin.pipe(lineSplitter);
+lineSplitter.pipe(paragraphParser);
+paragraphParser.pipe(unwrapper);
+unwrapper.pipe(rtfGenerator);
+rtfGenerator.pipe(stdout);
diff --git a/vcbuild.bat b/vcbuild.bat
@@ -420,9 +420,9 @@ if "%use_x64_node_exe%"=="true" (
     set exit_code=1
     goto exit
   )
-  %x64_node_exe% tools\license2rtf.mjs < LICENSE > %config%\license.rtf
+  %x64_node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf
 ) else (
-  %node_exe% tools\license2rtf.mjs < LICENSE > %config%\license.rtf
+  %node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf
 )
 
 if errorlevel 1 echo Failed to generate license.rtf&goto exit