wip(vue3): add script setup to template cache key

Author: Toilal

package.json

@@ -66,6 +66,7 @@
     "vm-browserify": "^1.1.2"
   },
   "devDependencies": {
+    "@types/spark-md5": "^3.0.2",
     "@vue/component-compiler-utils": "^3.2.0",
     "babel-loader": "^8.2.2",
     "caniuse-api": "^3.0.0",

src/createVue3SFCModule.ts

@@ -120,7 +120,7 @@ export async function createSFCModule(source : string, filename : string, option
 
 		// eg: https://github.com/vuejs/vue-loader/blob/6ed553f70b163031457acc961901313390cde9ef/src/index.ts#L136
 
-		const [ depsList, transformedScriptSource ] = await withCache(compiledCache, [ componentHash, descriptor.script.content ], async ({ preventCache }) => {
+		const [ depsList, transformedScriptSource ] = await withCache(compiledCache, [ componentHash, descriptor.script?.content, descriptor.scriptSetup?.content ], async ({ preventCache }) => {
 
 			const babelParserPlugins : babel_ParserPlugin[] = [];
 

src/tools.ts

@@ -22,8 +22,7 @@ import {
 import babelPluginTransformModulesCommonjs from '@babel/plugin-transform-modules-commonjs'
 
 
-// @ts-ignore (TS7016: Could not find a declaration file for module 'spark-md5')
-import SparkMD5 from 'spark-md5'
+import * as SparkMD5 from 'spark-md5'
 
 import {
 	Cache,
@@ -86,11 +85,9 @@ export function formatErrorStartEnd(message : string, path : string, source : st
 /**
  * @internal
  */
-export function hash(...valueList : any[]) : string {
-
+export function hash(...valueList : string[]) : string {
 	const hashInstance = new SparkMD5();
-	for ( const val of valueList )
-		hashInstance.append( typeof val === 'string' ? val : JSON.stringify(val) );
+	valueList.forEach(val => hashInstance.append(val ? val : ""))
 	return hashInstance.end().slice(0, 8);
 }
 
@@ -101,7 +98,7 @@ export function hash(...valueList : any[]) : string {
  * preventCache usage: non-fatal error
  * @internal
  */
-export async function withCache( cacheInstance : Cache, key : any[], valueFactory : ValueFactory ) {
+export async function withCache( cacheInstance : Cache, key : string[], valueFactory : ValueFactory ) {
 
 	let cachePrevented = false;
 

yarn.lock

@@ -1226,6 +1226,11 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.1.tgz#374e31645d58cb18a07b3ecd8e9dede4deb2cccd"
   integrity sha512-DxZZbyMAM9GWEzXL+BMZROWz9oo6A9EilwwOMET2UVu2uZTqMWS5S69KVtuVKaRjCUpcrOXRalet86/OpG4kqw==
 
+"@types/spark-md5@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/spark-md5/-/spark-md5-3.0.2.tgz#da2e8a778a20335fc4f40b6471c4b0d86b70da55"
+  integrity sha512-82E/lVRaqelV9qmRzzJ1PKTpyrpnT7mwdneKNJB9hUtypZDMggloDfFUCIqRRx3lYRxteCwXSq9c+W71Vf0QnQ==
+
 "@types/stack-utils@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"