From d8279354b772fc2e3777dbf256f7fafb5d5cc259 Mon Sep 17 00:00:00 2001 From: Volodymyr Zhdanov Date: Wed, 25 May 2022 20:45:13 +0300 Subject: [PATCH 1/5] add named export to improve `"module": "nodenext"` compatibility * currently it shows error: This expression is not callable. Type 'typeof import("node_modules/vite-plugin-checker/lib/main")' has no call signatures.ts(2349) * see https://github.com/microsoft/TypeScript/issues/48845 --- packages/vite-plugin-checker/src/main.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/vite-plugin-checker/src/main.ts b/packages/vite-plugin-checker/src/main.ts index 8e70a767..8e53609e 100644 --- a/packages/vite-plugin-checker/src/main.ts +++ b/packages/vite-plugin-checker/src/main.ts @@ -42,7 +42,7 @@ function createCheckers(userConfig: UserPluginConfig, env: ConfigEnv): ServeAndB return serveAndBuildCheckers } -export default function Plugin(userConfig: UserPluginConfig): Plugin { +export function checker(userConfig: UserPluginConfig): Plugin { const enableBuild = userConfig?.enableBuild ?? true const enableOverlay = userConfig?.overlay !== false const enableTerminal = userConfig?.terminal !== false @@ -272,3 +272,5 @@ function spawnChecker( export function isObject(value: unknown): value is Record { return Object.prototype.toString.call(value) === '[object Object]' } + +export default checker; From ef7a774809f72d942888e42f3dab3869bd0e51e5 Mon Sep 17 00:00:00 2001 From: Volodymyr Zhdanov Date: Fri, 22 Jul 2022 16:20:10 +0300 Subject: [PATCH 2/5] switch to cjs module style --- packages/vite-plugin-checker/src/main.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/vite-plugin-checker/src/main.ts b/packages/vite-plugin-checker/src/main.ts index 86da9eda..0f13d8d2 100644 --- a/packages/vite-plugin-checker/src/main.ts +++ b/packages/vite-plugin-checker/src/main.ts @@ -37,7 +37,7 @@ function createCheckers(userConfig: UserPluginConfig, env: ConfigEnv): ServeAndB return serveAndBuildCheckers } -export function checker(userConfig: UserPluginConfig): Plugin { +const plugin = (userConfig: UserPluginConfig): Plugin => { const enableBuild = userConfig?.enableBuild ?? true const enableOverlay = userConfig?.overlay !== false const enableTerminal = userConfig?.terminal !== false @@ -256,8 +256,11 @@ function spawnChecker( }) } -export function isObject(value: unknown): value is Record { +function isObject(value: unknown): value is Record { return Object.prototype.toString.call(value) === '[object Object]' } -export default checker; +plugin.checker = plugin +plugin.isObject = isObject + +export = plugin From 8009ab46c33475022625292947fede41e8a37df0 Mon Sep 17 00:00:00 2001 From: Volodymyr Zhdanov Date: Fri, 22 Jul 2022 19:05:09 +0300 Subject: [PATCH 3/5] Revert "switch to cjs module style" This reverts commit ef7a774809f72d942888e42f3dab3869bd0e51e5. --- packages/vite-plugin-checker/src/main.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/vite-plugin-checker/src/main.ts b/packages/vite-plugin-checker/src/main.ts index 0f13d8d2..86da9eda 100644 --- a/packages/vite-plugin-checker/src/main.ts +++ b/packages/vite-plugin-checker/src/main.ts @@ -37,7 +37,7 @@ function createCheckers(userConfig: UserPluginConfig, env: ConfigEnv): ServeAndB return serveAndBuildCheckers } -const plugin = (userConfig: UserPluginConfig): Plugin => { +export function checker(userConfig: UserPluginConfig): Plugin { const enableBuild = userConfig?.enableBuild ?? true const enableOverlay = userConfig?.overlay !== false const enableTerminal = userConfig?.terminal !== false @@ -256,11 +256,8 @@ function spawnChecker( }) } -function isObject(value: unknown): value is Record { +export function isObject(value: unknown): value is Record { return Object.prototype.toString.call(value) === '[object Object]' } -plugin.checker = plugin -plugin.isObject = isObject - -export = plugin +export default checker; From 998303eaeef6699eaae5ba2a7643a2dee577a0b8 Mon Sep 17 00:00:00 2001 From: Volodymyr Zhdanov Date: Fri, 22 Jul 2022 19:12:41 +0300 Subject: [PATCH 4/5] remove extra semicolon --- packages/vite-plugin-checker/src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite-plugin-checker/src/main.ts b/packages/vite-plugin-checker/src/main.ts index 86da9eda..93fa72f4 100644 --- a/packages/vite-plugin-checker/src/main.ts +++ b/packages/vite-plugin-checker/src/main.ts @@ -260,4 +260,4 @@ export function isObject(value: unknown): value is Record { return Object.prototype.toString.call(value) === '[object Object]' } -export default checker; +export default checker From f29e09afed6f2d999505d43d3d84b0f33f8ea58a Mon Sep 17 00:00:00 2001 From: Volodymyr Zhdanov Date: Fri, 22 Jul 2022 19:53:50 +0300 Subject: [PATCH 5/5] fix patch --- packages/vite-plugin-checker/tsup.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite-plugin-checker/tsup.config.ts b/packages/vite-plugin-checker/tsup.config.ts index fdbe4255..4dcb7a85 100644 --- a/packages/vite-plugin-checker/tsup.config.ts +++ b/packages/vite-plugin-checker/tsup.config.ts @@ -31,7 +31,7 @@ function createPatchEsbuildDistPlugin(): Plugin { process.exit(1) } - const modifiedCode = patchEsbuildDist(targetFile.text, 'Plugin') + const modifiedCode = patchEsbuildDist(targetFile.text, 'checker') if (modifiedCode) { Object.defineProperty(targetFile, 'text', { value: modifiedCode })