From f2625c109024853eddda3d6436fd0fb2886bba74 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Wed, 11 May 2022 12:08:49 +0800 Subject: [PATCH] fix(#36534): enable interopClientDefaultExport for next/jest --- packages/next/jest.js | 5 +---- packages/next/taskfile.js | 14 +++++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/next/jest.js b/packages/next/jest.js index c0451a2246bd..adeca0379d65 100644 --- a/packages/next/jest.js +++ b/packages/next/jest.js @@ -1,4 +1 @@ -function interopDefault(mod) { - return mod.default || mod -} -module.exports = interopDefault(require('./dist/build/jest/jest')) +module.exports = require('./dist/build/jest/jest') diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js index 58e0e94f4c8a..b912e726ff40 100644 --- a/packages/next/taskfile.js +++ b/packages/next/taskfile.js @@ -1763,6 +1763,7 @@ export async function compile(task, opts) { 'bin', 'server', 'nextbuild', + 'nextbuildjest', 'nextbuildstatic', 'pages', 'lib', @@ -1816,13 +1817,23 @@ export async function server(task, opts) { export async function nextbuild(task, opts) { await task .source(opts.src || 'build/**/*.+(js|ts|tsx)', { - ignore: ['**/fixture/**', '**/tests/**'], + ignore: ['**/fixture/**', '**/tests/**', '**/jest/**'], }) .swc('server', { dev: opts.dev }) .target('dist/build') notify('Compiled build files') } +export async function nextbuildjest(task, opts) { + await task + .source(opts.src || 'build/jest/**/*.+(js|ts|tsx)', { + ignore: ['**/fixture/**', '**/tests/**'], + }) + .swc('server', { dev: opts.dev, interopClientDefaultExport: true }) + .target('dist/build/jest') + notify('Compiled build/jest files') +} + export async function client(task, opts) { await task .source(opts.src || 'client/**/*.+(js|ts|tsx)') @@ -1903,6 +1914,7 @@ export default async function (task) { await task.watch('pages/**/*.+(js|ts|tsx)', 'pages', opts) await task.watch('server/**/*.+(js|ts|tsx)', 'server', opts) await task.watch('build/**/*.+(js|ts|tsx)', 'nextbuild', opts) + await task.watch('build/jest/**/*.+(js|ts|tsx)', 'nextbuildjest', opts) await task.watch('export/**/*.+(js|ts|tsx)', 'nextbuildstatic', opts) await task.watch('client/**/*.+(js|ts|tsx)', 'client', opts) await task.watch('lib/**/*.+(js|ts|tsx)', 'lib', opts)