miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(testing): correctly error with jest.mock for invalid filepaths (#15445)

Browse Source
This commit is contained in:
Caleb Ukle 2023-04-06 14:10:47 -05:00 committed by GitHub
parent 454344b1ef
commit 083f4f12c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/jest/plugins/resolver.ts
View File

@ -1,4 +1,4 @@
import { dirname, extname } from 'path'; import { dirname, extname, join } from 'path';
import { resolve as resolveExports } from 'resolve.exports'; import { resolve as resolveExports } from 'resolve.exports';
import type defaultResolver from 'jest-resolve/build/defaultResolver'; import type defaultResolver from 'jest-resolve/build/defaultResolver';
@ -81,7 +81,11 @@ module.exports = function (path: string, options: ResolveOptions) {
ts = ts || require('typescript'); ts = ts || require('typescript');
compilerSetup = compilerSetup || getCompilerSetup(options.rootDir); compilerSetup = compilerSetup || getCompilerSetup(options.rootDir);
const { compilerOptions, host } = compilerSetup; const { compilerOptions, host } = compilerSetup;
return ts.resolveModuleName(path, options.basedir, compilerOptions, host) return ts.resolveModuleName(
.resolvedModule.resolvedFileName; path,
join(options.basedir, 'fake-placeholder.ts'),
compilerOptions,
host
).resolvedModule.resolvedFileName;
} }
}; };

8
scripts/patched-jest-resolver.js
View File

@ -91,7 +91,11 @@ module.exports = function (path, options) {
} else if (path === '@nrwl/devkit/testing') { } else if (path === '@nrwl/devkit/testing') {
return join(__dirname, '../', './packages/devkit/testing.js'); return join(__dirname, '../', './packages/devkit/testing.js');
} }
return ts.resolveModuleName(path, options.basedir, compilerOptions, host) return ts.resolveModuleName(
.resolvedModule.resolvedFileName; path,
join(options.basedir, 'fake-placeholder.ts'),
compilerOptions,
host
).resolvedModule.resolvedFileName;
} }
}; };