@taro-hmr-compile/plugin-webpack 0.0.1-alpha.7 → 0.0.1-alpha.8

package/dist/patch/utils.js

@@ -0,0 +1,173 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generatePatchAssetSource = exports.mergeUpdatePatches = exports.parseChunkAsset = exports.parseHotUpdateAssets = void 0;
+const t = __importStar(require("@babel/types"));
+const parser_1 = require("@babel/parser");
+const traverse_1 = __importDefault(require("@babel/traverse"));
+const template_1 = __importDefault(require("@babel/template"));
+const generator_1 = __importDefault(require("@babel/generator"));
+/**
+ * 解析模块 Factory
+ * @param expression
+ */
+const parseModuleFactories = (expression) => {
+    const moduleFactories = new Map();
+    if (!t.isObjectExpression(expression))
+        return moduleFactories.values();
+    expression.properties.forEach(property => {
+        if (!t.isObjectProperty(property) || !t.isExpression(property.value))
+            throw new Error('[taro-hmr-compile] HMR 模块对象包含无法识别的属性');
+        const { key, value: factory } = property;
+        const moduleId = (() => {
+            if (t.isStringLiteral(key) || t.isNumericLiteral(key))
+                return String(key.value);
+            if (t.isIdentifier(key) && !property.computed)
+                return key.name;
+            throw new Error('[taro-hmr-compile] Chunk 模块对象包含无法识别的模块 ID');
+        })();
+        moduleFactories.set(moduleId, { factory, moduleId });
+    });
+    return moduleFactories.values();
+};
+/**
+ * 解析热更新产物
+ * @param opt
+ */
+const parseHotUpdateAssets = (opt) => {
+    const { manifests, scripts } = opt;
+    const moduleFactories = new Map();
+    scripts.forEach(asset => {
+        const ast = (0, parser_1.parse)(asset.source.source().toString(), { sourceType: 'script' });
+        (0, traverse_1.default)(ast, {
+            CallExpression(nodePath) {
+                const { callee } = nodePath.node;
+                if (!t.isMemberExpression(callee) || !t.isIdentifier(callee.object, { name: 'wx' }))
+                    return;
+                if (!t.isStringLiteral(callee.property) || !callee.property.value.startsWith('webpackHotUpdate'))
+                    return;
+                const [_, modules] = nodePath.node.arguments;
+                if (!t.isObjectExpression(modules))
+                    return;
+                parseModuleFactories(modules).forEach(module => moduleFactories.set(module.moduleId, module));
+            },
+        });
+    });
+    const removedModules = new Set();
+    manifests.forEach((module) => {
+        const manifest = JSON.parse(module.source.source().toString());
+        const { m: tempRemoveModules = [] } = manifest;
+        tempRemoveModules.forEach(removedModule => removedModules.add(String(removedModule)));
+    }, []);
+    return { moduleFactories, removedModules };
+};
+exports.parseHotUpdateAssets = parseHotUpdateAssets;
+/**
+ * 解析 chunk 产物
+ * @param source
+ */
+const parseChunkAsset = (source) => {
+    const ast = (0, parser_1.parse)(`(${source})`, { sourceType: 'script' });
+    const [statement] = ast.program.body;
+    if (!t.isExpressionStatement(statement) || !t.isObjectExpression(statement.expression))
+        throw new Error('[taro-hmr-compile] Chunk 模块段不是对象表达式');
+    const moduleFactories = new Map();
+    parseModuleFactories(statement.expression).forEach(module => moduleFactories.set(module.moduleId, module));
+    return moduleFactories;
+};
+exports.parseChunkAsset = parseChunkAsset;
+const mergeUpdatePatches = (basePatch, nextPatch) => {
+    if (basePatch.toHash !== nextPatch.fromHash)
+        throw new Error(`[taro-hmr-compile] 无法合并不连续的 HMR patch：${basePatch.toHash} !== ${nextPatch.fromHash}`);
+    const moduleFactories = new Map(basePatch.moduleFactories.map(moduleFactory => [moduleFactory.moduleId, moduleFactory]));
+    const removedModules = new Set(basePatch.removedModules);
+    nextPatch.moduleFactories.forEach(moduleFactory => {
+        const { moduleId } = moduleFactory;
+        moduleFactories.set(moduleId, moduleFactory);
+        removedModules.delete(moduleId);
+    });
+    nextPatch.removedModules.forEach(moduleId => {
+        moduleFactories.delete(moduleId);
+        removedModules.add(moduleId);
+    });
+    return {
+        type: 'update',
+        fromHash: basePatch.fromHash,
+        toHash: nextPatch.toHash,
+        moduleFactories: [...moduleFactories.values()],
+        removedModules: [...removedModules],
+    };
+};
+exports.mergeUpdatePatches = mergeUpdatePatches;
+const generatePatchAssetSource = (opt) => {
+    const { bootstrapFactories, recentUpdatePatches } = opt;
+    const buildBootstrapPatch = template_1.default.expression(`({
+        type: 'bootstrap',
+        modules: MODULES
+    })`);
+    const buildUpdatePatch = template_1.default.expression(`({
+        type: 'update',
+        fromHash: "FROM_HASH",
+        toHash: "TO_HASH",
+        modules: MODULES,
+        removedModules: REMOVED_MODULES
+    })`);
+    const buildPatchAsset = template_1.default.program('module.exports = PATCHES;');
+    const bootstrapModules = Array.from(bootstrapFactories.values()).map((moduleFactory) => {
+        const { moduleId, factory } = moduleFactory;
+        return t.objectProperty(t.stringLiteral(moduleId), factory);
+    });
+    const patchNodes = [
+        buildBootstrapPatch({ MODULES: t.objectExpression(bootstrapModules) }),
+        ...recentUpdatePatches.map(patch => {
+            const updateModules = patch.moduleFactories.map((moduleFactory) => {
+                const { moduleId, factory } = moduleFactory;
+                return t.objectProperty(t.stringLiteral(moduleId), factory);
+            });
+            return buildUpdatePatch({
+                FROM_HASH: patch.fromHash,
+                TO_HASH: patch.toHash,
+                MODULES: t.objectExpression(updateModules),
+                REMOVED_MODULES: t.arrayExpression(patch.removedModules.map(moduleId => t.stringLiteral(moduleId))),
+            });
+        }),
+    ];
+    return (0, generator_1.default)(buildPatchAsset({ PATCHES: t.arrayExpression(patchNodes) })).code;
+};
+exports.generatePatchAssetSource = generatePatchAssetSource;
+//# sourceMappingURL=utils.js.map

package/dist/patch/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/patch/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taro-hmr-compile/plugin-webpack",
-  "version": "0.0.1-alpha.7",
+  "version": "0.0.1-alpha.8",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -44,7 +44,7 @@
     "@babel/template": "^7.29.7",
     "@babel/traverse": "^7.29.8",
     "@babel/types": "^7.29.8",
-    "@taro-hmr-compile/core": "0.0.1-alpha.7",
+    "@taro-hmr-compile/core": "0.0.1-alpha.8",
     "debug": "^4.4.3",
     "tapable": "^2.3.3",
     "webpack-sources": "^3.5.1"

package/src/compile/hmr-compiler-plugin.ts

@@ -29,12 +29,16 @@ export interface HmrCompilerPluginOptions {
     debugNamespaces?: string
 }
 
+type CompileRequested = SyncHook<[page: string]>
+
+type ChunkModulesRendered = SyncHook<[source: string, isPageChunk: boolean]>
+
 export interface HmrCompilerHooks {
-    compileRequested: SyncHook<[page: string]>
+    compileRequested: CompileRequested
 }
 
 export interface HmrCompilationHooks {
-    pageChunkModules: SyncHook<[source: string]>
+    chunkModulesRendered: ChunkModulesRendered
 }
 
 export const applyPatchBeforeStartup = (source: Source, request: string) => {
@@ -67,21 +71,19 @@ export class HmrCompilerPlugin {
     }
 
     static getCompilerHooks(compiler: Compiler): HmrCompilerHooks {
-        let hooks = HmrCompilerPlugin.compilerHooksMap.get(compiler)
-        if (!hooks) {
-            hooks = {compileRequested: new SyncHook(['page'])}
-            HmrCompilerPlugin.compilerHooksMap.set(compiler, hooks)
+        if (!HmrCompilerPlugin.compilerHooksMap.get(compiler)) {
+            const compileRequested: CompileRequested = new SyncHook(['page'])
+            HmrCompilerPlugin.compilerHooksMap.set(compiler, {compileRequested})
         }
-        return hooks
+        return HmrCompilerPlugin.compilerHooksMap.get(compiler)!
     }
 
     static getCompilationHooks(compilation: Compilation): HmrCompilationHooks {
-        let hooks = HmrCompilerPlugin.compilationHooksMap.get(compilation)
-        if (!hooks) {
-            hooks = {pageChunkModules: new SyncHook(['source'])}
-            HmrCompilerPlugin.compilationHooksMap.set(compilation, hooks)
+        if (!HmrCompilerPlugin.compilationHooksMap.get(compilation)) {
+            const chunkModulesRendered: ChunkModulesRendered = new SyncHook(['source', 'isBootstrapChunk'])
+            HmrCompilerPlugin.compilationHooksMap.set(compilation, {chunkModulesRendered})
         }
-        return hooks
+        return HmrCompilerPlugin.compilationHooksMap.get(compilation)!
     }
 
     apply(compiler: Compiler) {
@@ -124,16 +126,16 @@ export class HmrCompilerPlugin {
 
                     const loaderOptions = {miniType: normalModule.miniType, debugNamespaces: this.options.debugNamespaces}
                     // Loader 从右向左执行；插到 taro-loader 左侧才能处理它生成的入口注册代码。
-                    normalModule.loaders.splice(taroLoaderIndex, 0, { loader: HMR_COMPILER_LOADER, options: loaderOptions})
+                    normalModule.loaders.splice(taroLoaderIndex, 0, {loader: HMR_COMPILER_LOADER, options: loaderOptions})
                 },
             )
 
             // 只修改 Page Chunk 的 JS transport。Webpack 的 ModuleGraph / ChunkGraph 保持不变，
             // 因而 hash、HMR diff 和 hot-update 仍以完整模块图为准。
             javascriptHooks.renderChunk.tap({name: PLUGIN_NAME, stage: -10_000}, (source, {chunk}) => {
-                if (!isPageChunk(chunk)) return source
-                hmrHooks.pageChunkModules.call(source.source().toString())
-                return new RawSource('{}')
+                const isBootstrapChunk = isPageChunk(chunk)
+                hmrHooks.chunkModulesRendered.call(source.source().toString(), isBootstrapChunk)
+                return isBootstrapChunk ? new RawSource('{}') : source
             })
 
             javascriptHooks.renderStartup.tap(PLUGIN_NAME, (source, _module, {chunk}) => {

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

@@ -1,217 +1,90 @@
-import generator from '@babel/generator'
-import {parse} from '@babel/parser'
-import template from '@babel/template'
-import traverse from '@babel/traverse'
-import * as t from '@babel/types'
 import type {Compilation, Compiler} from 'webpack'
 import {RawSource} from 'webpack-sources'
-import {DEFAULT_HMR_PATCH_HISTORY_LIMIT, HMR_PATCH_ASSET} from '../constants'
+import {HMR_PATCH_ASSET} from '../constants'
 import {HmrCompilerPlugin} from '../compile/hmr-compiler-plugin'
-import {HmrPatchManager} from './hmr-patch-manager'
-import type {PatchSource, UpdatePatchSource} from './hmr-patch-manager'
 import {HmrPatchRuntimePlugin} from './hmr-patch-runtime-plugin'
+import {HmrPatchProcessor, HmrPatchProcessorOptions} from "./hmr-patch-processor";
 
 const PLUGIN_NAME = 'HmrPatchPlugin'
 const HOT_UPDATE_MANIFEST_SUFFIX = '.hot-update.json'
 const HOT_UPDATE_SCRIPT_SUFFIX = '.hot-update.js'
-const HOT_UPDATE_HASH_PATTERN = /\.([0-9a-f]+)\.hot-update\.json$/i
 const STYLE_ASSET_PATTERN = /\.(?:css|wxss|acss|ttss|qss|jxss)(?:\.map)?$/i
 const TEMPLATE_RUNTIME_ASSET_PATTERN = /(?:^|\/)(?:base\.wxml|utils\.wxs)$/i
 
-interface HotUpdateManifest {
-    m?: Array<string | number>
-}
-
-type CompilationAsset = ReturnType<Compilation['getAssets']>[number]
-
-interface HotUpdateAssets {
-    manifests: CompilationAsset[]
-    scripts: CompilationAsset[]
-}
-
-export interface HmrPatchPluginOptions {
-    patchHistoryLimit?: number
-}
-
-const collectModuleFactories = (source: string, moduleFactories: Map<string, t.Expression>) => {
-    const ast = parse(`(${source})`, {sourceType: 'script'})
-    const statement = ast.program.body[0]
-    if (!t.isExpressionStatement(statement) || !t.isObjectExpression(statement.expression)) {
-        throw new Error('[taro-hmr-compile] Page Chunk 模块段不是对象表达式')
-    }
-
-    statement.expression.properties.forEach(property => {
-        if (!t.isObjectProperty(property) || !t.isExpression(property.value)) {
-            throw new Error('[taro-hmr-compile] Page Chunk 模块对象包含无法识别的属性')
-        }
-
-        const {key} = property
-        let moduleId: string
-        if (t.isStringLiteral(key) || t.isNumericLiteral(key)) moduleId = String(key.value)
-        else if (t.isIdentifier(key) && !property.computed) moduleId = key.name
-        else throw new Error('[taro-hmr-compile] Page Chunk 模块对象包含无法识别的模块 ID')
-
-        moduleFactories.set(moduleId, property.value)
-    })
-}
-
-/** 将本轮 Webpack hot-update 产物转换为内部 update 表示。 */
-const createUpdatePatch = (toHash: string, assets: HotUpdateAssets): UpdatePatchSource => {
-    const manifestAsset = assets.manifests[0]
-    const hashMatch = manifestAsset.name.match(HOT_UPDATE_HASH_PATTERN)
-    if (!hashMatch) throw new Error(`[taro-hmr-compile] 无法从 ${manifestAsset.name} 提取 HMR 基线 hash`)
-
-    const moduleFactories = new Map<string, t.Expression>()
-    assets.scripts.forEach(asset => {
-        const ast = parse(asset.source.source().toString(), {sourceType: 'script'})
-
-        traverse(ast, {
-            CallExpression(nodePath) {
-                const {callee} = nodePath.node
-                if (!t.isMemberExpression(callee) || !t.isIdentifier(callee.object, {name: 'wx'})) return
-                if (!t.isStringLiteral(callee.property) || !callee.property.value.startsWith('webpackHotUpdate')) return
-
-                const modules = nodePath.node.arguments[1]
-                if (!t.isObjectExpression(modules)) return
-
-                modules.properties.forEach(property => {
-                    if (!t.isObjectProperty(property) || !t.isExpression(property.value)) {
-                        throw new Error('[taro-hmr-compile] HMR 模块对象包含无法识别的属性')
-                    }
-
-                    const {key} = property
-                    let moduleId: string
-                    if (t.isStringLiteral(key) || t.isNumericLiteral(key)) moduleId = String(key.value)
-                    else if (t.isIdentifier(key) && !property.computed) moduleId = key.name
-                    else throw new Error('[taro-hmr-compile] HMR 模块对象包含无法识别的模块 ID')
-
-                    moduleFactories.set(moduleId, property.value)
-                })
-            },
-        })
-    })
-
-    const removedModules = new Set<string>()
-    assets.manifests.forEach(asset => {
-        const manifest = JSON.parse(asset.source.source().toString()) as HotUpdateManifest
-        manifest.m?.forEach(moduleId => removedModules.add(String(moduleId)))
-    })
-
-    return {
-        type: 'update',
-        fromHash: hashMatch[1],
-        toHash,
-        moduleFactories,
-        removedModules: Array.from(removedModules),
-    }
-}
-
-/** 将内部 Patch 表示序列化为固定 patch.js。 */
-const createPatchAssetSource = (patches: PatchSource[]): string => {
-    const buildBootstrapPatchNode = template.expression(`({
-        type: 'bootstrap',
-        modules: %%MODULES%%
-    })`)
-    const buildUpdatePatchNode = template.expression(`({
-        type: 'update',
-        fromHash: %%FROM_HASH%%,
-        toHash: %%TO_HASH%%,
-        modules: %%MODULES%%,
-        removedModules: %%REMOVED_MODULES%%
-    })`)
-    const patchNodes = patches.map(patch => {
-        const modules = t.objectExpression(Array.from(
-            patch.moduleFactories,
-            ([moduleId, factory]) => t.objectProperty(t.stringLiteral(moduleId), factory),
-        ))
-        if (patch.type === 'bootstrap') return buildBootstrapPatchNode({MODULES: modules})
-
-        return buildUpdatePatchNode({
-            FROM_HASH: t.stringLiteral(patch.fromHash),
-            TO_HASH: t.stringLiteral(patch.toHash),
-            MODULES: modules,
-            REMOVED_MODULES: t.arrayExpression(patch.removedModules.map(moduleId => t.stringLiteral(moduleId))),
-        })
-    })
-
-    const statements = template.statements('module.exports = %%PATCHES%%;')({PATCHES: t.arrayExpression(patchNodes)})
-    return generator(t.program(statements)).code
-}
+ type HmrPatchPluginOptions = Partial<HmrPatchProcessorOptions>
 
 const isPassthroughAsset = (assetName: string) => {
     return STYLE_ASSET_PATTERN.test(assetName) || TEMPLATE_RUNTIME_ASSET_PATTERN.test(assetName)
 }
 
 export class HmrPatchPlugin {
-    private hasCompletedInitialBuild = false
 
-    private readonly patchManager: HmrPatchManager
+    private previousHash: string = ''
+
+    private initialBuildDone = false
+
+    private readonly patchProcessor: HmrPatchProcessor
 
     private readonly emittedAssetSources = new Map<string, string>()
 
     constructor(options: HmrPatchPluginOptions) {
-        this.patchManager = new HmrPatchManager(options.patchHistoryLimit ?? DEFAULT_HMR_PATCH_HISTORY_LIMIT)
+        this.patchProcessor = new HmrPatchProcessor(options)
     }
 
     apply(compiler: Compiler) {
         new HmrPatchRuntimePlugin().apply(compiler)
 
         compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
-            const initialPageFactories = new Map<string, t.Expression>()
-
-            HmrCompilerPlugin.getCompilationHooks(compilation).pageChunkModules.tap(PLUGIN_NAME, source => {
-                collectModuleFactories(source, initialPageFactories)
+            HmrCompilerPlugin.getCompilationHooks(compilation).chunkModulesRendered.tap(PLUGIN_NAME, (source, isBootstrapChunk) => {
+                this.patchProcessor.processChunkModules({compilation, source, isBootstrapChunk})
             })
 
             // 等 Webpack 生成完整的 hot-update assets 后，再统一转换成固定的 patch.js。
             const stage = compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT
-            compilation.hooks.processAssets.tap({name: PLUGIN_NAME, stage}, () => {
-                this.processAssets(compilation, initialPageFactories)
-            })
+            compilation.hooks.processAssets.tap({name: PLUGIN_NAME, stage}, () => this.processAssets(compilation))
         })
 
         compiler.hooks.afterEmit.tap(PLUGIN_NAME, compilation => {
             const isSuccessful = compilation.errors.length === 0 && Boolean(compilation.hash)
-            this.hasCompletedInitialBuild = this.hasCompletedInitialBuild || isSuccessful
+            this.initialBuildDone = this.initialBuildDone || isSuccessful
         })
 
         compiler.hooks.watchClose.tap(PLUGIN_NAME, () => this.reset())
     }
 
-    private processAssets(compilation: Compilation, initialPageFactories: Map<string, t.Expression>) {
-        if (!compilation.hash || compilation.errors.length > 0) return
-
-        const originalAssets = compilation.getAssets()
-        if (!this.hasCompletedInitialBuild) {
-            this.patchManager.clear()
-            this.emittedAssetSources.clear()
-            originalAssets.forEach(asset => {
-                if (isPassthroughAsset(asset.name)) {
-                    this.emittedAssetSources.set(asset.name, asset.source.source().toString())
-                }
+    private processAssets(compilation: Compilation) {
+        const {previousHash: fromHash, initialBuildDone} = this
+
+        const {hash: toHash, errors: compilationErrors} = compilation
+
+        if (!toHash || compilationErrors.length > 0) return
+        // 首次编译完成过滤文件输出
+        if (!initialBuildDone) {
+            this.patchProcessor.commitBootstrapFactories(compilation)
+            compilation.getAssets().forEach(asset => {
+                if (!isPassthroughAsset(asset.name)) return
+                this.emittedAssetSources.set(asset.name, asset.source.source().toString())
             })
-            this.patchManager.setBootstrap(initialPageFactories)
-            this.emitPatchAsset(compilation, false)
-            return
+            this.previousHash = toHash
+            return this.emitPatchAsset(compilation, false)
         }
 
-        const hotUpdateAssets: HotUpdateAssets = {
-            manifests: originalAssets.filter(asset => asset.name.endsWith(HOT_UPDATE_MANIFEST_SUFFIX)),
-            scripts: originalAssets.filter(asset => asset.name.endsWith(HOT_UPDATE_SCRIPT_SUFFIX)),
-        }
+        const manifests = compilation.getAssets().filter(asset => asset.name.endsWith(HOT_UPDATE_MANIFEST_SUFFIX))
 
-        if (hotUpdateAssets.manifests.length) {
-            this.patchManager.appendUpdate(createUpdatePatch(compilation.hash, hotUpdateAssets))
-            this.emitPatchAsset(compilation, true)
-        }
+        const scripts = compilation.getAssets().filter(asset => asset.name.endsWith(HOT_UPDATE_SCRIPT_SUFFIX))
+
+        this.patchProcessor.processUpdate({toHash, fromHash, manifests, scripts})
+
+        this.emitPatchAsset(compilation, true)
+
+        this.removeSupersededAssets(compilation)
 
-        // 增量 compilation 仍可能包含普通 chunk 资产，不能让它们覆盖初始 PageShell。
-        this.removeSupersededAssets(compilation, originalAssets)
+        this.previousHash = toHash
     }
 
     /** 热更新转换完成后，保留固定 patch 与发生变化的模板、平台样式资产。 */
-    private removeSupersededAssets(compilation: Compilation, assets: CompilationAsset[]) {
-        assets.forEach(asset => {
+    private removeSupersededAssets(compilation: Compilation) {
+        compilation.getAssets().forEach(asset => {
             if (asset.name === HMR_PATCH_ASSET) return
             if (!isPassthroughAsset(asset.name)) return compilation.deleteAsset(asset.name)
 
@@ -223,15 +96,16 @@ export class HmrPatchPlugin {
     }
 
     private emitPatchAsset(compilation: Compilation, isHotUpdate: boolean) {
-        const source = new RawSource(createPatchAssetSource(this.patchManager.getPatches()))
+        const source = new RawSource(this.patchProcessor.generate())
         const assetInfo = {hotModuleReplacement: isHotUpdate}
         if (compilation.getAsset(HMR_PATCH_ASSET)) compilation.updateAsset(HMR_PATCH_ASSET, source, assetInfo)
         else compilation.emitAsset(HMR_PATCH_ASSET, source, assetInfo)
     }
 
     private reset() {
-        this.hasCompletedInitialBuild = false
+        this.previousHash = ''
+        this.initialBuildDone = false
         this.emittedAssetSources.clear()
-        this.patchManager.clear()
+        this.patchProcessor.reset()
     }
 }