refactor: optimize "globalThis.__bundlerPathsOverrides" overrides

wd-David · Aug 8, 2022 · f52a79f · f52a79f
1 parent bed9af9
commit f52a79f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -129,10 +129,7 @@ export default function esbuildPluginPino({
           .join(',')
 
         const globalThisDeclaration = `
-          globalThis.__bundlerPathsOverrides =
-            globalThis.__bundlerPathsOverrides
-                ? {...globalThis.__bundlerPathsOverrides, ${pinoOverrides}}
-                : {${pinoOverrides}};
+          globalThis.__bundlerPathsOverrides = { ...(globalThis.__bundlerPathsOverrides || {}), ${pinoOverrides}}
         `
 
         const code = functionDeclaration + globalThisDeclaration

diff --git a/test/index.test.ts b/test/index.test.ts
@@ -52,7 +52,7 @@ describe('Test esbuildPluginPino', () => {
       resolve(distFolder, firstFile as string),
       'utf-8'
     )
-    const overrides = `globalThis.__bundlerPathsOverrides = globalThis.__bundlerPathsOverrides ? { ...globalThis.__bundlerPathsOverrides, "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino-pipeline-worker": pinoBundlerAbsolutePath("./pino-pipeline-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") } : { "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino-pipeline-worker": pinoBundlerAbsolutePath("./pino-pipeline-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") };`
+    const overrides = `globalThis.__bundlerPathsOverrides = { ...globalThis.__bundlerPathsOverrides || {}, "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino-pipeline-worker": pinoBundlerAbsolutePath("./pino-pipeline-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") };`
     expect(firstContent.includes(functionDeclaration)).toBeTruthy()
     expect(firstContent.includes(overrides)).toBeTruthy()
 
@@ -107,7 +107,7 @@ describe('Test esbuildPluginPino', () => {
       resolve(distFolder, thirdFile as string),
       'utf-8'
     )
-    const overrides = `globalThis.__bundlerPathsOverrides = globalThis.__bundlerPathsOverrides ? { ...globalThis.__bundlerPathsOverrides, "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino-pipeline-worker": pinoBundlerAbsolutePath("./pino-pipeline-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-loki": pinoBundlerAbsolutePath("./pino-loki.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") } : { "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino-pipeline-worker": pinoBundlerAbsolutePath("./pino-pipeline-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-loki": pinoBundlerAbsolutePath("./pino-loki.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") };`
+    const overrides = `globalThis.__bundlerPathsOverrides = { ...globalThis.__bundlerPathsOverrides || {}, "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino-pipeline-worker": pinoBundlerAbsolutePath("./pino-pipeline-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-loki": pinoBundlerAbsolutePath("./pino-loki.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") };`
     expect(thirdContent.includes(functionDeclaration)).toBeTruthy()
     expect(thirdContent.includes(overrides)).toBeTruthy()