From 10f472db2881c2da53af8c125411c888381556ec Mon Sep 17 00:00:00 2001 From: LeoTM <1881059+leotm@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:25:16 +0000 Subject: [PATCH] fix(compartment-mapper): sync module transforms in bundle.js Co-authored-by: naugtur --- packages/compartment-mapper/src/bundle.js | 2 ++ packages/ses/scripts/bundle.js | 6 +++--- packages/ses/scripts/hermes-transforms.js | 8 +------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/compartment-mapper/src/bundle.js b/packages/compartment-mapper/src/bundle.js index bea4f6a657..05b1384186 100644 --- a/packages/compartment-mapper/src/bundle.js +++ b/packages/compartment-mapper/src/bundle.js @@ -233,6 +233,7 @@ export const makeBundle = async (readPowers, moduleLocation, options) => { const { moduleTransforms, + syncModuleTransforms, dev, tags: tagsOption, conditions: conditionsOption = tagsOption, @@ -333,6 +334,7 @@ export const makeBundle = async (readPowers, moduleLocation, options) => { resolve, makeImportHook, moduleTransforms, + syncModuleTransforms, parserForLanguage, }); await compartment.load(entryModuleSpecifier); diff --git a/packages/ses/scripts/bundle.js b/packages/ses/scripts/bundle.js index 05b9212848..73fa964c61 100644 --- a/packages/ses/scripts/bundle.js +++ b/packages/ses/scripts/bundle.js @@ -29,7 +29,7 @@ const writeBundle = async ({ buildType } = {}) => { const packageJson = JSON.parse(text); const version = packageJson.version; - let moduleTransforms; + let syncModuleTransforms; let bundleFilePaths = [ 'dist/ses.cjs', @@ -44,13 +44,13 @@ const writeBundle = async ({ buildType } = {}) => { if (buildType === 'hermes') { bundleFilePaths = ['dist/ses-hermes.cjs']; terseFilePaths = []; - moduleTransforms = hermesTransforms; + syncModuleTransforms = hermesTransforms; } const bundle = await makeBundle( read, pathToFileURL(resolve('../index.js', import.meta.url)).toString(), - { moduleTransforms }, + { syncModuleTransforms }, ); const versionedBundle = `// ses@${version}\n${bundle}`; diff --git a/packages/ses/scripts/hermes-transforms.js b/packages/ses/scripts/hermes-transforms.js index 1c0d7a299a..8142fcbf53 100644 --- a/packages/ses/scripts/hermes-transforms.js +++ b/packages/ses/scripts/hermes-transforms.js @@ -62,13 +62,7 @@ const asyncGeneratorDestroyer = { }; export const hermesTransforms = { - mjs: async ( - sourceBytes, - specifier, - location, - _packageLocation, - { sourceMap }, - ) => { + mjs: (sourceBytes, specifier, location, _packageLocation, { sourceMap }) => { const transforms = { ...asyncArrowEliminator, ...asyncGeneratorDestroyer,