From 3d822c67469526ab64a38969b45441afe26f6d9c Mon Sep 17 00:00:00 2001 From: FurryR Date: Fri, 4 Oct 2024 14:08:58 +0800 Subject: [PATCH 1/2] ESM-ify extensions Signed-off-by: FurryR --- scripts/prepare-extensions.js | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/scripts/prepare-extensions.js b/scripts/prepare-extensions.js index 6841caf5..7c83e57b 100644 --- a/scripts/prepare-extensions.js +++ b/scripts/prepare-extensions.js @@ -1,19 +1,21 @@ const pathUtil = require('path'); -let Builder; -try { - Builder = require('../extensions/development/builder'); -} catch (e) { - console.error('Could not load TurboWarp/extensions build scripts, most likely because the submodule is missing.'); - console.error('Try running: `git submodule init` and `git submodule update`'); - console.error(e); - process.exit(1); -} +(async () => { + let Builder; + try { + Builder = await import('../extensions/development/builder'); + } catch (e) { + console.error('Could not load TurboWarp/extensions build scripts, most likely because the submodule is missing.'); + console.error('Try running: `git submodule init` and `git submodule update`'); + console.error(e); + process.exit(1); + } -const outputDirectory = pathUtil.join(__dirname, '../dist-extensions/'); -const mode = 'desktop'; -const builder = new Builder(mode); -const build = builder.build(); -build.export(outputDirectory); + const outputDirectory = pathUtil.join(__dirname, '../dist-extensions/'); + const mode = 'desktop'; + const builder = new Builder(mode); + const build = builder.build(); + build.export(outputDirectory); -console.log(`Built ${mode} copy of extensions.turbowarp.org to ${outputDirectory}`); + console.log(`Built ${mode} copy of extensions.turbowarp.org to ${outputDirectory}`); +})(); From 6833a862e642a0c99be6922c48b69cfaaa71578c Mon Sep 17 00:00:00 2001 From: FurryR Date: Fri, 4 Oct 2024 14:10:34 +0800 Subject: [PATCH 2/2] asyncify Signed-off-by: FurryR --- scripts/prepare-extensions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare-extensions.js b/scripts/prepare-extensions.js index 7c83e57b..1f79ebfd 100644 --- a/scripts/prepare-extensions.js +++ b/scripts/prepare-extensions.js @@ -14,8 +14,8 @@ const pathUtil = require('path'); const outputDirectory = pathUtil.join(__dirname, '../dist-extensions/'); const mode = 'desktop'; const builder = new Builder(mode); - const build = builder.build(); - build.export(outputDirectory); + const build = await builder.build(); + await build.export(outputDirectory); console.log(`Built ${mode} copy of extensions.turbowarp.org to ${outputDirectory}`); })();