GeezerVison is showing github.com — tools: refactor `tools/license2rtf` to ESM · nodejs/node@30cb1bf
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: Makefile +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -1096,7 +1096,7 @@ endif |
1096 | 1096 | $(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules |
1097 | 1097 | unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npm |
1098 | 1098 | unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npx |
1099 | | - $(NODE) tools/license2rtf.js < LICENSE > \ |
| 1099 | + $(NODE) tools/license2rtf.mjs < LICENSE > \ |
1100 | 1100 | $(MACOSOUTDIR)/installer/productbuild/Resources/license.rtf |
1101 | 1101 | cp doc/osx_installer_logo.png $(MACOSOUTDIR)/installer/productbuild/Resources |
1102 | 1102 | pkgbuild --version $(FULLVERSION) \ |
|
Collapse file
Copy file name to clipboardExpand all lines: tools/license2rtf.mjs +12-18Lines changed: 12 additions & 18 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
1 | | -'use strict'; |
2 | | - |
3 | | -const assert = require('assert'); |
4 | | -const Stream = require('stream'); |
5 | | - |
| 1 | +import assert from 'node:assert'; |
| 2 | +import Stream from 'node:stream'; |
| 3 | +import { pipeline } from 'node:stream/promises'; |
| 4 | +import { stdin, stdout } from 'node:process'; |
6 | 5 |
|
7 | 6 | /* |
8 | 7 | * This filter consumes a stream of characters and emits one string per line. |
@@ -287,19 +286,14 @@ class RtfGenerator extends Stream { |
287 | 286 | } |
288 | 287 | } |
289 | 288 |
|
290 | | - |
291 | | -const stdin = process.stdin; |
292 | | -const stdout = process.stdout; |
293 | | -const lineSplitter = new LineSplitter(); |
294 | | -const paragraphParser = new ParagraphParser(); |
295 | | -const unwrapper = new Unwrapper(); |
296 | | -const rtfGenerator = new RtfGenerator(); |
297 | | - |
298 | 289 | stdin.setEncoding('utf-8'); |
299 | 290 | stdin.resume(); |
300 | 291 |
|
301 | | -stdin.pipe(lineSplitter); |
302 | | -lineSplitter.pipe(paragraphParser); |
303 | | -paragraphParser.pipe(unwrapper); |
304 | | -unwrapper.pipe(rtfGenerator); |
305 | | -rtfGenerator.pipe(stdout); |
| 292 | +await pipeline( |
| 293 | + stdin, |
| 294 | + new LineSplitter(), |
| 295 | + new ParagraphParser(), |
| 296 | + new Unwrapper(), |
| 297 | + new RtfGenerator(), |
| 298 | + stdout, |
| 299 | +); |
Collapse file
Copy file name to clipboardExpand all lines: vcbuild.bat +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -420,9 +420,9 @@ if "%use_x64_node_exe%"=="true" ( |
420 | 420 | set exit_code=1 |
421 | 421 | goto exit |
422 | 422 | ) |
423 | | - %x64_node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf |
| 423 | + %x64_node_exe% tools\license2rtf.mjs < LICENSE > %config%\license.rtf |
424 | 424 | ) else ( |
425 | | - %node_exe% tools\license2rtf.js < LICENSE > %config%\license.rtf |
| 425 | + %node_exe% tools\license2rtf.mjs < LICENSE > %config%\license.rtf |
426 | 426 | ) |
427 | 427 |
|
428 | 428 | if errorlevel 1 echo Failed to generate license.rtf&goto exit |
|