From 3f2eb3a3b12f75201b59739f46abb5cbfa2803b6 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Fri, 29 Jul 2022 10:40:04 +0100 Subject: [PATCH] fix(vite, webpack): generate composable keys based on order (#6191) --- packages/vite/src/plugins/composable-keys.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/plugins/composable-keys.ts b/packages/vite/src/plugins/composable-keys.ts index 9b4e40b636..fd8fbd644e 100644 --- a/packages/vite/src/plugins/composable-keys.ts +++ b/packages/vite/src/plugins/composable-keys.ts @@ -28,6 +28,7 @@ export const composableKeysPlugin = createUnplugin((options: ComposableKeysOptio const { 0: script = code, index: codeIndex = 0 } = code.match(/(?<=]*>)[\S\s.]*?(?=<\/script>)/) || [] const s = new MagicString(code) // https://github.com/unjs/unplugin/issues/90 + let count = 0 const relativeID = isAbsolute(id) ? relative(options.rootDir, id) : id walk(this.parse(script, { sourceType: 'module', @@ -39,7 +40,7 @@ export const composableKeysPlugin = createUnplugin((options: ComposableKeysOptio const end = (node as any).end s.appendLeft( codeIndex + end - 1, - (node.arguments.length ? ', ' : '') + "'$" + hash(`${relativeID}-${codeIndex + end}`) + "'" + (node.arguments.length ? ', ' : '') + "'$" + hash(`${relativeID}-${++count}`) + "'" ) } }