From e2069f7963288b6d9693f48f1ea105f34d3c1968 Mon Sep 17 00:00:00 2001 From: Albert Salim <asalim@gitlab.com> Date: Mon, 4 Oct 2021 15:20:21 +0800 Subject: [PATCH] Remove dependency on jest-resolver --- .eslintrc.yml | 1 + jest_resolver.js | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 2eb52b59deaaa..cd3cd82d4e7a2 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -100,6 +100,7 @@ overrides: - 'scripts/**/*' - '*.config.js' - '*.config.*.js' + - 'jest_resolver.js' - storybook/config/*.js rules: '@gitlab/require-i18n-strings': off diff --git a/jest_resolver.js b/jest_resolver.js index de3355ff8146b..6cbc1b9f18fe8 100644 --- a/jest_resolver.js +++ b/jest_resolver.js @@ -1,15 +1,11 @@ -/* eslint-disable import/no-commonjs */ -/* eslint-disable import/no-extraneous-dependencies */ -const Resolver = require('jest-resolve'); +const fs = require('fs'); // Wrap jest default resolver to detect missing frontend fixtures. module.exports = (request, options) => { try { return options.defaultResolver(request, options); } catch (e) { - if (Resolver.tryCastModuleNotFoundError(e) && request.match(/tmp\/tests\/frontend\/fixtures/)) { - /* eslint-disable no-console */ - /* eslint-disable @gitlab/require-i18n-strings */ + if (request.match(/tmp\/tests\/frontend\/fixtures/) && !fs.existsSync(request)) { console.error( '\x1b[1m\x1b[41m\x1b[30m %s \x1b[0m %s', '!', -- GitLab