From 6161a71deeadcf1c2cffc56eea127ec6ef363f35 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 27 Oct 2022 15:39:58 +0200 Subject: [PATCH 1/2] fix(nuxt): check before appending comma in composable keys --- packages/vite/src/plugins/composable-keys.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/plugins/composable-keys.ts b/packages/vite/src/plugins/composable-keys.ts index af251194fe1..d736501473a 100644 --- a/packages/vite/src/plugins/composable-keys.ts +++ b/packages/vite/src/plugins/composable-keys.ts @@ -59,9 +59,11 @@ export const composableKeysPlugin = createUnplugin((options: ComposableKeysOptio break } + const endsWithComma = code.slice(codeIndex + (node as any).start, codeIndex + (node as any).end - 1).trim().endsWith(',') + s.appendLeft( codeIndex + (node as any).end - 1, - (node.arguments.length ? ', ' : '') + "'$" + hash(`${relativeID}-${++count}`) + "'" + (node.arguments.length && !endsWithComma ? ', ' : '') + "'$" + hash(`${relativeID}-${++count}`) + "'" ) } }) From 4abf359ed40f4ef7880fc103ab7d07f7a2e5d2f2 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Wed, 2 Nov 2022 11:14:41 +0100 Subject: [PATCH 2/2] Update packages/vite/src/plugins/composable-keys.ts --- packages/vite/src/plugins/composable-keys.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/vite/src/plugins/composable-keys.ts b/packages/vite/src/plugins/composable-keys.ts index d736501473a..1b649363c0d 100644 --- a/packages/vite/src/plugins/composable-keys.ts +++ b/packages/vite/src/plugins/composable-keys.ts @@ -59,6 +59,7 @@ export const composableKeysPlugin = createUnplugin((options: ComposableKeysOptio break } + // TODO: Optimize me (https://github.com/nuxt/framework/pull/8529) const endsWithComma = code.slice(codeIndex + (node as any).start, codeIndex + (node as any).end - 1).trim().endsWith(',') s.appendLeft(