Skip to content

Commit

Permalink
fix(evasive-transform): RESM treatment (merge #1909)
Browse files Browse the repository at this point in the history
  • Loading branch information
kriskowal committed Dec 20, 2023
2 parents 3699cf1 + db660ce commit 71a2383
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 11 deletions.
16 changes: 10 additions & 6 deletions packages/evasive-transform/src/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
* @module
*/

import babelGenerate from '@agoric/babel-generator';
import babelGenerator from '@agoric/babel-generator';

/**
* It works; don't ask.
* @type {typeof import('@babel/generator')}
*/
const { default: generator } = /** @type {any} */ (babelGenerate);
// TODO The following is sufficient on Node.js, but for compatibility with
// `node -r esm`, we must use the pattern below.
// Restore after https://github.com/Agoric/agoric-sdk/issues/8671.
// OR, upgrading to Babel 8 probably addresses this defect.
// const { default: generator } = /** @type {any} */ (babelGenerator);
const generator = /** @type {typeof import('@babel/generator')['default']} */ (
// @ts-expect-error
babelGenerator.default || babelGenerator
);

/**
* Options for {@link generateCode} with source map
Expand Down
14 changes: 9 additions & 5 deletions packages/evasive-transform/src/transform-ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ import babelTraverse from '@babel/traverse';
import { transformComment } from './transform-comment.js';
import { makeLocationUnmapper } from './location-unmapper.js';

/**
* This is what happens when you compile Babel using Babel.
* @type {typeof import('@babel/traverse')}
*/
const { default: traverse } = /** @type {any} */ (babelTraverse);
// TODO The following is sufficient on Node.js, but for compatibility with
// `node -r esm`, we must use the pattern below.
// Restore after https://github.com/Agoric/agoric-sdk/issues/8671.
// OR, upgrading to Babel 8 probably addresses this defect.
// const { default: traverse } = /** @type {any} */ (babelTraverse);
const traverse = /** @type {typeof import('@babel/traverse')['default']} */ (
// @ts-expect-error
babelTraverse.default || babelTraverse
);

/**
* Options for {@link transformAst}
Expand Down

0 comments on commit 71a2383

Please sign in to comment.