From 73379ea82ed70ae50d48a4133ea05f496c1ddfd5 Mon Sep 17 00:00:00 2001 From: feng Date: Sat, 14 May 2022 21:32:41 +0800 Subject: [PATCH] tools: refactor license2rtf.js to esm module --- Makefile | 2 +- tools/{license2rtf.js => license2rtf.mjs} | 6 +++--- vcbuild.bat | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename tools/{license2rtf.js => license2rtf.mjs} (98%) diff --git a/Makefile b/Makefile index a6549a8474c215..13671e4db17888 100644 --- 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.js < LICENSE > \ + $(NODE) tools/license2rtf.mjs < 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.js b/tools/license2rtf.mjs similarity index 98% rename from tools/license2rtf.js rename to tools/license2rtf.mjs index 817da81d7a6ada..8e1e28908b45c8 100644 --- a/tools/license2rtf.js +++ b/tools/license2rtf.mjs @@ -1,7 +1,7 @@ -'use strict'; -const assert = require('assert'); -const Stream = require('stream'); +import assert from 'node:assert'; +import Stream from 'node:stream'; +import process from 'node:process'; /* diff --git a/vcbuild.bat b/vcbuild.bat index 96306e407e1a19..d5299c3739a82d 100644 --- 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.js < LICENSE > %config%\license.rtf + %x64_node_exe% tools\license2rtf.mjs < LICENSE > %config%\license.rtf ) 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