From 48ba33ccc52f52ab55e2e642fa32e2834ac24a0d Mon Sep 17 00:00:00 2001 From: OJ Kwon Date: Thu, 21 Apr 2022 02:22:01 -0700 Subject: [PATCH] refactor(swc/trace): simplify config --- packages/next/build/webpack-config.ts | 13 ++++++------- packages/next/server/config-shared.ts | 5 +---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts index 198ce287b371..8d6699094fb1 100644 --- a/packages/next/build/webpack-config.ts +++ b/packages/next/build/webpack-config.ts @@ -457,7 +457,7 @@ export default async function getBaseWebpackConfig( const getBabelOrSwcLoader = (isMiddleware: boolean, buildDir: string) => { if ( useSWCLoader && - config?.experimental?.swcTraceProfiling?.enabled && + config?.experimental?.swcTraceProfiling && !swcTraceFlushGuard ) { // This will init subscribers once only in a single process lifecycle, @@ -465,12 +465,11 @@ export default async function getBaseWebpackConfig( // Subscriber need to be initialized _before_ any actual swc's call (transform, etcs) // to collect correct trace spans when they are called. swcTraceFlushGuard = require('./swc')?.initCustomTraceSubscriber?.( - config?.experimental?.swcTraceProfiling?.traceFileName ?? - path.join( - buildDir, - config.distDir, - `swc-trace-profile-${Date.now()}.json` - ) + path.join( + buildDir, + config.distDir, + `swc-trace-profile-${Date.now()}.json` + ) ) } diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts index 7d4000583812..ef72d5ec1de2 100644 --- a/packages/next/server/config-shared.ts +++ b/packages/next/server/config-shared.ts @@ -128,10 +128,7 @@ export interface ExperimentalConfig { skipDefaultConversion?: boolean } > - swcTraceProfiling?: { - enabled: boolean - traceFileName?: string - } + swcTraceProfiling?: boolean } /**