Skip to content

Commit 109069b

Browse files
authored
chore: make requiring from outside the Jest VM harder w/out a Babel plugin. (#15658)
1 parent 0ab14ba commit 109069b

File tree

5 files changed

+24
-65
lines changed

5 files changed

+24
-65
lines changed

babel.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ module.exports = {
3737
],
3838
plugins: [
3939
['@babel/plugin-transform-modules-commonjs', {allowTopLevelThis: true}],
40-
require.resolve('./scripts/babel-plugin-jest-require-outside-vm'),
4140
],
4241
presets: [
4342
[

packages/jest-snapshot/src/InlineSnapshots.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,12 @@ export function saveInlineSnapshots(
4444
: undefined;
4545
if (prettierPath && !prettier) {
4646
try {
47-
prettier =
48-
// @ts-expect-error requireOutside
49-
requireOutside(prettierPath) as Prettier;
47+
prettier = require(
48+
require.resolve(prettierPath, {
49+
[Symbol.for('jest-resolve-outside-vm-option')]: true,
50+
}),
51+
) as Prettier;
52+
5053
cachedPrettier.set(`module|${prettierPath}`, prettier);
5154

5255
if (semver.gte(prettier.version, '3.0.0')) {

packages/jest-snapshot/src/utils.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,20 @@ const indent = (
169169
.join('\n');
170170
};
171171

172-
const generate = // @ts-expect-error requireOutside Babel transform
173-
(requireOutside('@babel/generator') as typeof import('@babel/generator'))
174-
.default;
172+
const generate = (
173+
require(
174+
require.resolve('@babel/generator', {
175+
[Symbol.for('jest-resolve-outside-vm-option')]: true,
176+
}),
177+
) as typeof import('@babel/generator')
178+
).default;
175179

176-
// @ts-expect-error requireOutside Babel transform
177-
const {parseSync, types} = requireOutside(
178-
'@babel/core',
180+
const {parseSync, types} = require(
181+
require.resolve('@babel/core', {
182+
[Symbol.for('jest-resolve-outside-vm-option')]: true,
183+
}),
179184
) as typeof import('@babel/core');
185+
180186
const {
181187
isAwaitExpression,
182188
templateElement,

packages/jest-snapshot/src/worker.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ runAsWorker(
2323
sourceFileWithSnapshots: string,
2424
snapshotMatcherNames: Array<string>,
2525
) => {
26-
// @ts-expect-error requireOutside
27-
prettier ??= requireOutside(/*webpackIgnore: true*/ prettierPath);
26+
prettier ??= require(
27+
/*webpackIgnore: true*/
28+
require.resolve(prettierPath, {
29+
[Symbol.for('jest-resolve-outside-vm-option')]: true,
30+
}),
31+
);
2832

2933
const config = await prettier.resolveConfig(filepath, {
3034
editorconfig: true,

scripts/babel-plugin-jest-require-outside-vm.js

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)