@taro-hmr-compile/plugin-webpack 0.0.1-alpha.9 → 0.0.2

package/src/patch/hmr-patch-processor.ts

@@ -1,23 +1,18 @@
-import {type Compilation,} from "webpack";
-import generator from '@babel/generator'
+import {type Chunk, type Compilation,} from "webpack";
 import {
     parseHotUpdateAssets,
     ParseHotUpdateAssetsOptions,
     parseChunkAsset, mergeUpdatePatches, generatePatchAssetSource,
 } from "./utils";
-import {createHash} from "crypto";
+import isNil from 'lodash/isNil'
 import {ModuleFactory, UpdatePatchSource} from "./types";
 import {DEFAULT_HMR_PATCH_HISTORY_LIMIT} from "../constants";
 
-interface ModuleHash {
-    moduleId: string;
-    factoryHash: string;
-}
-
 interface ProcessChunkModulesOptions {
     source: string
     compilation: Compilation,
-    isBootstrapChunk: boolean
+    isBootstrapChunk: boolean,
+    chunk: Chunk
 }
 
 export interface HmrPatchProcessorOptions {
@@ -31,7 +26,14 @@ interface ProcessUpdateOptions extends ParseHotUpdateAssetsOptions {
 
 type BootstrapFactories = Map<string, ModuleFactory>
 
-type ModuleHashesByFullHash = Map<string, Map<string, ModuleHash>>
+type ModuleHashes = Map<string, Set<string>>
+
+type ModuleHashesByFullHash = Map<string, ModuleHashes>
+
+const areModuleHashesEqual = (left: Set<string> | undefined, right: Set<string> | undefined): boolean => {
+    if (!left || !right || left.size !== right.size) return false
+    return Array.from(left).every(hash => right.has(hash))
+}
 
 export class HmrPatchProcessor {
     private readonly bootstrapFactories: BootstrapFactories = new Map()
@@ -62,9 +64,9 @@ export class HmrPatchProcessor {
 
         const changedModuleIds = new Set<string>()
         moduleIds.forEach(moduleId => {
-            const fromFactoryHash = fromModuleHashes.get(moduleId)?.factoryHash
-            const toFactoryHash = toModuleHashes.get(moduleId)?.factoryHash
-            if (fromFactoryHash !== toFactoryHash) changedModuleIds.add(moduleId)
+            const fromModuleHash = fromModuleHashes.get(moduleId)
+            const toModuleHash = toModuleHashes.get(moduleId)
+            if (!areModuleHashesEqual(fromModuleHash, toModuleHash)) changedModuleIds.add(moduleId)
         })
 
         return changedModuleIds
@@ -105,28 +107,44 @@ export class HmrPatchProcessor {
     }
 
     processChunkModules(opt: ProcessChunkModulesOptions) {
-        const {hash: fullHash} = opt.compilation
-        const modules = parseChunkAsset(opt.source)
+        const {chunk, compilation, isBootstrapChunk, source} = opt
+        const {hash: fullHash} = compilation
+        const modules = parseChunkAsset(source)
         modules.forEach(moduleFactory => {
             const {moduleId, factory} = moduleFactory
 
-            if (opt.isBootstrapChunk) {
-                const compilationFactories = this.bootstrapFactoriesByCompilation.get(opt.compilation) ?? new Map()
+            if (isBootstrapChunk) {
+                const compilationFactories = this.bootstrapFactoriesByCompilation.get(compilation) ?? new Map()
                 compilationFactories.set(moduleId, {moduleId, factory})
-                this.bootstrapFactoriesByCompilation.set(opt.compilation, compilationFactories)
+                this.bootstrapFactoriesByCompilation.set(compilation, compilationFactories)
             }
+        })
+
+        if (!fullHash) return
+
+        const moduleHashes = (() => {
+            const hasCurFullHashModuleHashMap = this.moduleHashesByFullHash.has(fullHash)
+            if (!hasCurFullHashModuleHashMap) this.moduleHashesByFullHash.set(fullHash, new Map())
+            return this.moduleHashesByFullHash.get(fullHash)!
+        })()
+
+        const { chunkGraph, codeGenerationResults } = compilation
+
+        Array.from(chunkGraph.getChunkModulesIterable(chunk)).forEach(module => {
+            const moduleId = chunkGraph.getModuleId(module)
+
+            if (isNil(moduleId)) return
 
-            if (!fullHash) return
+            const normalizedModuleId = String(moduleId)
 
-            const moduleHashes = (() => {
-                const hasCurFullHashModuleHashMap = this.moduleHashesByFullHash.has(fullHash)
-                if (!hasCurFullHashModuleHashMap) this.moduleHashesByFullHash.set(fullHash, new Map())
-                return this.moduleHashesByFullHash.get(fullHash)!
-            })()
+            // 获取模块在当前 chunk.runtime 下的 Hash，优先从 codeGenerationResults 获取，如果没有对应的代码生成结果，则回退到 chunkGraph 获取
+            const moduleHash = codeGenerationResults?.has(module, chunk.runtime)
+                ? codeGenerationResults.getHash(module, chunk.runtime)
+                : chunkGraph.getModuleHash(module, chunk.runtime)
 
-            const {code: source} = generator(factory, {compact: true, comments: false, minified: true,})
-            const factoryHash = createHash('sha256').update(source).digest('hex')
-            moduleHashes.set(moduleId, {moduleId, factoryHash})
+            const hashes = moduleHashes.get(normalizedModuleId) ?? new Set<string>()
+            hashes.add(moduleHash)
+            moduleHashes.set(normalizedModuleId, hashes)
         })
     }
 

package/src/patch/utils.ts

@@ -17,7 +17,7 @@ const parseModuleFactories = (expression: ObjectExpression) => {
 
     const moduleFactories = new Map<string, ModuleFactory>()
 
-    if (!t.isObjectExpression(expression)) return moduleFactories.values()
+    if (!t.isObjectExpression(expression)) return Array.from(moduleFactories.values())
 
     expression.properties.forEach(property => {
         if (!t.isObjectProperty(property) || !t.isExpression(property.value)) throw new Error('[taro-hmr-compile] HMR 模块对象包含无法识别的属性')
@@ -33,7 +33,7 @@ const parseModuleFactories = (expression: ObjectExpression) => {
         moduleFactories.set(moduleId, {factory, moduleId})
     })
 
-    return moduleFactories.values()
+    return Array.from(moduleFactories.values())
 }
 
 
@@ -128,7 +128,7 @@ export const mergeUpdatePatches = (basePatch: UpdatePatchSource, nextPatch: Upda
         type: 'update',
         fromHash: basePatch.fromHash,
         toHash: nextPatch.toHash,
-        moduleFactories: [...moduleFactories.values()],
+        moduleFactories: Array.from(moduleFactories.values()),
         runtimeModules: [...basePatch.runtimeModules, ...nextPatch.runtimeModules],
         removedModules: [...removedModules],
     }

package/src/types/taro-service.d.ts

@@ -0,0 +1,15 @@
+import type { IProjectConfig } from '@tarojs/taro/types/compile'
+import type { IComponentConfig } from '@tarojs/taro/types/compile/hooks'
+
+declare module '@tarojs/service' {
+    interface IPluginContext {
+        modifyComponentConfig: (
+            callback: (args: {
+                componentConfig: IComponentConfig
+                config: IProjectConfig
+            }) => void,
+        ) => void
+    }
+}
+
+export {}