1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools: refactor tools/license2rtf to ESM

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/43101
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
This commit is contained in:
Feng Yu 2022-05-25 23:11:42 +08:00 committed by GitHub
parent b5ed1bd33a
commit 30cb1bf8b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1096,7 +1096,7 @@ endif
$(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules $(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules
unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npm unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npm
unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npx unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npx
$(NODE) tools/license2rtf.js < LICENSE > \ $(NODE) tools/license2rtf.mjs < LICENSE > \
$(MACOSOUTDIR)/installer/productbuild/Resources/license.rtf $(MACOSOUTDIR)/installer/productbuild/Resources/license.rtf
cp doc/osx_installer_logo.png $(MACOSOUTDIR)/installer/productbuild/Resources cp doc/osx_installer_logo.png $(MACOSOUTDIR)/installer/productbuild/Resources
pkgbuild --version $(FULLVERSION) \ pkgbuild --version $(FULLVERSION) \

30
tools/license2rtf.js → tools/license2rtf.mjs
View File

@ -1,8 +1,7 @@
'use strict'; import assert from 'node:assert';
import Stream from 'node:stream';
const assert = require('assert'); import { pipeline } from 'node:stream/promises';
const Stream = require('stream'); import { stdin, stdout } from 'node:process';
/* /*
* This filter consumes a stream of characters and emits one string per line. * This filter consumes a stream of characters and emits one string per line.
@ -287,19 +286,14 @@ 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.setEncoding('utf-8');
stdin.resume(); stdin.resume();
stdin.pipe(lineSplitter); await pipeline(
lineSplitter.pipe(paragraphParser); stdin,
paragraphParser.pipe(unwrapper); new LineSplitter(),
unwrapper.pipe(rtfGenerator); new ParagraphParser(),
rtfGenerator.pipe(stdout); new Unwrapper(),
new RtfGenerator(),
stdout,
);

4
vcbuild.bat
View File

@ -420,9 +420,9 @@ if "%use_x64_node_exe%"=="true" (
set exit_code=1 set exit_code=1
goto exit goto exit
) )
%x64_node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf %x64_node_exe% tools\license2rtf.mjs < LICENSE > %config%\license.rtf
) else ( ) else (
%node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf %node_exe% tools\license2rtf.mjs < LICENSE > %config%\license.rtf
) )
if errorlevel 1 echo Failed to generate license.rtf&goto exit if errorlevel 1 echo Failed to generate license.rtf&goto exit