From 0808b46fe39fa56bfb56d54b36a1f55108a3703f Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 17 Oct 2024 19:10:39 +0800 Subject: [PATCH] fix: use `getCompilationHooks` of HTML plugin --- packages/core/package.json | 2 +- packages/core/src/rspack/RsbuildHtmlPlugin.ts | 2 +- .../preload/HtmlPreloadOrPrefetchPlugin.ts | 4 ++-- pnpm-lock.yaml | 22 +++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 8575b558ee..ac8ee9a5d0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -73,7 +73,7 @@ "dotenv": "16.4.5", "dotenv-expand": "11.0.6", "fs-extra": "^11.2.0", - "html-rspack-plugin": "6.0.1", + "html-rspack-plugin": "6.0.2", "http-proxy-middleware": "^2.0.6", "jiti": "^1.21.6", "launch-editor-middleware": "^2.9.1", diff --git a/packages/core/src/rspack/RsbuildHtmlPlugin.ts b/packages/core/src/rspack/RsbuildHtmlPlugin.ts index 40886b20a7..b0b5a9b99e 100644 --- a/packages/core/src/rspack/RsbuildHtmlPlugin.ts +++ b/packages/core/src/rspack/RsbuildHtmlPlugin.ts @@ -310,7 +310,7 @@ export class RsbuildHtmlPlugin { compiler.hooks.compilation.tap(this.name, (compilation: Compilation) => { getHTMLPlugin() - .getHooks(compilation) + .getCompilationHooks(compilation) .alterAssetTagGroups.tapPromise(this.name, async (data) => { const entryName = data.plugin.options?.entryName; diff --git a/packages/core/src/rspack/preload/HtmlPreloadOrPrefetchPlugin.ts b/packages/core/src/rspack/preload/HtmlPreloadOrPrefetchPlugin.ts index 7acb17278a..e14619c16e 100644 --- a/packages/core/src/rspack/preload/HtmlPreloadOrPrefetchPlugin.ts +++ b/packages/core/src/rspack/preload/HtmlPreloadOrPrefetchPlugin.ts @@ -189,7 +189,7 @@ export class HtmlPreloadOrPrefetchPlugin implements RspackPluginInstance { apply(compiler: Compiler): void { compiler.hooks.compilation.tap(this.constructor.name, (compilation) => { getHTMLPlugin() - .getHooks(compilation) + .getCompilationHooks(compilation) .beforeAssetTagGeneration.tap( `HTML${upperFirst(this.type)}Plugin`, (htmlPluginData) => { @@ -206,7 +206,7 @@ export class HtmlPreloadOrPrefetchPlugin implements RspackPluginInstance { ); getHTMLPlugin() - .getHooks(compilation) + .getCompilationHooks(compilation) .alterAssetTags.tap( `HTML${upperFirst(this.type)}Plugin`, (htmlPluginData) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f7ce7af62..fa21be483c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -251,7 +251,7 @@ importers: dependencies: '@rsbuild/plugin-styled-components': specifier: ^1.0.1 - version: 1.0.1(@rsbuild/core@1.0.14) + version: 1.0.1(@rsbuild/core@1.0.15) styled-components: specifier: ^6.1.13 version: 6.1.13(react-dom@19.0.0-rc-fb9a90fa48-20240614(react@19.0.0-rc-fb9a90fa48-20240614))(react@19.0.0-rc-fb9a90fa48-20240614) @@ -661,8 +661,8 @@ importers: specifier: ^11.2.0 version: 11.2.0 html-rspack-plugin: - specifier: 6.0.1 - version: 6.0.1(@rspack/core@1.0.13(@swc/helpers@0.5.13)) + specifier: 6.0.2 + version: 6.0.2(@rspack/core@1.0.13(@swc/helpers@0.5.13)) http-proxy-middleware: specifier: ^2.0.6 version: 2.0.6 @@ -2828,8 +2828,8 @@ packages: engines: {node: '>=16.7.0'} hasBin: true - '@rsbuild/core@1.0.14': - resolution: {integrity: sha512-00d0DzRUK2CncKK+dHGG8AZuiXzltVzt58BbTba2AKyLHIb2nwYW4ah33sNrDAbYzdz1kPNfsWrmQvY7z71LfA==} + '@rsbuild/core@1.0.15': + resolution: {integrity: sha512-LIOgs4UzfFeT3sZnPMww1JbqF7zkGNMZdMJ6vV8xEXGOU4t8Z6QAtM5A0FGRfb2mYW5u2+XnMog+JAbo2RrN/A==} engines: {node: '>=16.7.0'} hasBin: true @@ -4869,8 +4869,8 @@ packages: engines: {node: ^14.13.1 || >=16.0.0} hasBin: true - html-rspack-plugin@6.0.1: - resolution: {integrity: sha512-7RAFL+4T9C9XUm0x7H9ZRvatRygc5MCAc4XqU+T+NYHRncwPS8G/r64/lcaUBWkE0Gjws27lxJZBpudTB6z6vA==} + html-rspack-plugin@6.0.2: + resolution: {integrity: sha512-34ICP1ULwi9uFq0QJzT3jdnIp6RmZozp9PUPaH6YLaM69cy1r7WvSh1Mjqk5XEG2XQoktjbGz2WQPdW5O6jELw==} engines: {node: '>=16.0.0'} peerDependencies: '@rspack/core': 0.x || 1.x @@ -9398,7 +9398,7 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - '@rsbuild/core@1.0.14': + '@rsbuild/core@1.0.15': dependencies: '@rspack/core': 1.0.13(@swc/helpers@0.5.13) '@rspack/lite-tapable': 1.0.1 @@ -9460,12 +9460,12 @@ snapshots: reduce-configs: 1.0.0 sass-embedded: 1.79.5 - '@rsbuild/plugin-styled-components@1.0.1(@rsbuild/core@1.0.14)': + '@rsbuild/plugin-styled-components@1.0.1(@rsbuild/core@1.0.15)': dependencies: '@swc/plugin-styled-components': 2.0.11 reduce-configs: 1.0.0 optionalDependencies: - '@rsbuild/core': 1.0.14 + '@rsbuild/core': 1.0.15 '@rsbuild/plugin-vue-jsx@1.0.1(@babel/core@7.25.8)(@rsbuild/core@packages+core)': dependencies: @@ -11773,7 +11773,7 @@ snapshots: relateurl: 0.2.7 terser: 5.35.0 - html-rspack-plugin@6.0.1(@rspack/core@1.0.13(@swc/helpers@0.5.13)): + html-rspack-plugin@6.0.2(@rspack/core@1.0.13(@swc/helpers@0.5.13)): dependencies: '@rspack/lite-tapable': 1.0.1 optionalDependencies: