@rsdoctor/webpack-plugin 1.3.5 → 1.3.6

package/dist/index.cjs

@@ -148,6 +148,7 @@ class RsdoctorWebpackPlugin {
     _bootstrapTask;
     browserIsOpened = !1;
     chunkGraph;
+    outsideInstance;
     constructor(options){
         this.options = (0, plugins_namespaceObject.normalizeUserConfig)(options);
         const { port, output, innerClientPath, printLog, sdkInstance } = this.options;
@@ -170,7 +171,7 @@ class RsdoctorWebpackPlugin {
         ]), common_namespaceObject.Loader.isVue(compiler) || new plugins_namespaceObject.InternalLoaderPlugin(this).apply(compiler)), this.options.features.resolver && new InternalResolverPlugin(this).apply(compiler), this.options.features.plugins && new plugins_namespaceObject.InternalPluginsPlugin(this).apply(compiler), this.options.features.bundle && (new plugins_namespaceObject.InternalBundlePlugin(this).apply(compiler), new plugins_namespaceObject.InternalBundleTagPlugin(this).apply(compiler)), new plugins_namespaceObject.InternalErrorReporterPlugin(this).apply(compiler), new plugins_namespaceObject.InternalRulesPlugin(this).apply(compiler), new plugins_namespaceObject.InternalProgressPlugin(this).apply(compiler), compiler.hooks.afterPlugins.tap(pluginTapPostOptions, this.afterPlugins), compiler.hooks.watchRun.tapPromise(pluginTapPostOptions, this.beforeRun), compiler.hooks.beforeRun.tapPromise(pluginTapPostOptions, this.beforeRun), compiler.hooks.done.tapPromise({
             ...pluginTapPostOptions,
             stage: pluginTapPostOptions.stage + 100
-        }, this.done.bind(this));
+        }, this.done.bind(this, compiler));
     }
     afterPlugins = (compiler)=>{
         if (compiler.isChild()) return;
@@ -190,9 +191,9 @@ class RsdoctorWebpackPlugin {
     ensureModulesChunksGraphApplied(compiler) {
         (0, plugins_namespaceObject.ensureModulesChunksGraphFn)(compiler, this);
     }
-    done = async ()=>{
+    done = async (compiler)=>{
         try {
-            this.sdk.server.broadcast(), logger_namespaceObject.logger.debug(`${build_namespaceObject.Process.getMemoryUsageMessage()}, '[Before Write Manifest]'`), await this.sdk.writeStore(), logger_namespaceObject.logger.debug(`${build_namespaceObject.Process.getMemoryUsageMessage()}, '[After Write Manifest]'`), this.options.disableClientServer ? (await this.sdk.dispose(), logger_namespaceObject.logger.debug(`${build_namespaceObject.Process.getMemoryUsageMessage()}, '[After SDK Dispose]'`)) : this.options.output.mode !== types_namespaceObject.SDK.IMode[types_namespaceObject.SDK.IMode.brief] || this.options.disableClientServer || (0, plugins_namespaceObject.handleBriefModeReport)(this.sdk, this.options, this.options.disableClientServer);
+            this.sdk.server.broadcast(), logger_namespaceObject.logger.debug(`${build_namespaceObject.Process.getMemoryUsageMessage()}, '[Before Write Manifest]'`), this.outsideInstance && 'parent' in this.sdk && this.sdk.parent.master.setOutputDir(external_path_default().resolve(this.options.output.reportDir || compiler.outputPath, this.options.output.mode === types_namespaceObject.SDK.IMode[types_namespaceObject.SDK.IMode.brief] ? '' : `./${types_namespaceObject.Constants.RsdoctorOutputFolder}`)), this.sdk.setOutputDir(external_path_default().resolve(this.options.output.reportDir || compiler.outputPath, this.options.output.mode === types_namespaceObject.SDK.IMode[types_namespaceObject.SDK.IMode.brief] ? '' : `./${types_namespaceObject.Constants.RsdoctorOutputFolder}`)), await this.sdk.writeStore(), logger_namespaceObject.logger.debug(`${build_namespaceObject.Process.getMemoryUsageMessage()}, '[After Write Manifest]'`), this.options.disableClientServer ? (await this.sdk.dispose(), logger_namespaceObject.logger.debug(`${build_namespaceObject.Process.getMemoryUsageMessage()}, '[After SDK Dispose]'`)) : this.options.output.mode !== types_namespaceObject.SDK.IMode[types_namespaceObject.SDK.IMode.brief] || this.options.disableClientServer || (0, plugins_namespaceObject.handleBriefModeReport)(this.sdk, this.options, this.options.disableClientServer);
         } catch (e) {
             console.error("[Rsdoctor] Webpack plugin this.done error", e);
         }

package/dist/index.js

@@ -3,7 +3,7 @@ import { Loader } from "@rsdoctor/core/build-utils";
 import { InternalBasePlugin, InternalBundlePlugin, InternalBundleTagPlugin, InternalErrorReporterPlugin, InternalLoaderPlugin, InternalPluginsPlugin, InternalProgressPlugin, InternalRulesPlugin, InternalSummaryPlugin, ensureModulesChunksGraphFn, handleBriefModeReport, normalizeUserConfig, processCompilerConfig, setSDK } from "@rsdoctor/core/plugins";
 import { ChunkGraph, ModuleGraph } from "@rsdoctor/graph";
 import { RsdoctorSDK, RsdoctorSDKController, findRoot } from "@rsdoctor/sdk";
-import { Manifest, SDK } from "@rsdoctor/types";
+import { Constants, Manifest, SDK } from "@rsdoctor/types";
 import { Process } from "@rsdoctor/utils/build";
 import { Loader as common_Loader, Time } from "@rsdoctor/utils/common";
 import { logger } from "@rsdoctor/utils/logger";
@@ -124,6 +124,7 @@ class RsdoctorWebpackPlugin {
     _bootstrapTask;
     browserIsOpened = !1;
     chunkGraph;
+    outsideInstance;
     constructor(options){
         this.options = normalizeUserConfig(options);
         let { port, output, innerClientPath, printLog, sdkInstance } = this.options;
@@ -146,7 +147,7 @@ class RsdoctorWebpackPlugin {
         ]), common_Loader.isVue(compiler) || new InternalLoaderPlugin(this).apply(compiler)), this.options.features.resolver && new InternalResolverPlugin(this).apply(compiler), this.options.features.plugins && new InternalPluginsPlugin(this).apply(compiler), this.options.features.bundle && (new InternalBundlePlugin(this).apply(compiler), new InternalBundleTagPlugin(this).apply(compiler)), new InternalErrorReporterPlugin(this).apply(compiler), new InternalRulesPlugin(this).apply(compiler), new InternalProgressPlugin(this).apply(compiler), compiler.hooks.afterPlugins.tap(pluginTapPostOptions, this.afterPlugins), compiler.hooks.watchRun.tapPromise(pluginTapPostOptions, this.beforeRun), compiler.hooks.beforeRun.tapPromise(pluginTapPostOptions, this.beforeRun), compiler.hooks.done.tapPromise({
             ...pluginTapPostOptions,
             stage: pluginTapPostOptions.stage + 100
-        }, this.done.bind(this));
+        }, this.done.bind(this, compiler));
     }
     afterPlugins = (compiler)=>{
         if (compiler.isChild()) return;
@@ -166,9 +167,9 @@ class RsdoctorWebpackPlugin {
     ensureModulesChunksGraphApplied(compiler) {
         ensureModulesChunksGraphFn(compiler, this);
     }
-    done = async ()=>{
+    done = async (compiler)=>{
         try {
-            this.sdk.server.broadcast(), logger.debug(`${Process.getMemoryUsageMessage()}, '[Before Write Manifest]'`), await this.sdk.writeStore(), logger.debug(`${Process.getMemoryUsageMessage()}, '[After Write Manifest]'`), this.options.disableClientServer ? (await this.sdk.dispose(), logger.debug(`${Process.getMemoryUsageMessage()}, '[After SDK Dispose]'`)) : this.options.output.mode !== SDK.IMode[SDK.IMode.brief] || this.options.disableClientServer || handleBriefModeReport(this.sdk, this.options, this.options.disableClientServer);
+            this.sdk.server.broadcast(), logger.debug(`${Process.getMemoryUsageMessage()}, '[Before Write Manifest]'`), this.outsideInstance && 'parent' in this.sdk && this.sdk.parent.master.setOutputDir(path_0.resolve(this.options.output.reportDir || compiler.outputPath, this.options.output.mode === SDK.IMode[SDK.IMode.brief] ? '' : `./${Constants.RsdoctorOutputFolder}`)), this.sdk.setOutputDir(path_0.resolve(this.options.output.reportDir || compiler.outputPath, this.options.output.mode === SDK.IMode[SDK.IMode.brief] ? '' : `./${Constants.RsdoctorOutputFolder}`)), await this.sdk.writeStore(), logger.debug(`${Process.getMemoryUsageMessage()}, '[After Write Manifest]'`), this.options.disableClientServer ? (await this.sdk.dispose(), logger.debug(`${Process.getMemoryUsageMessage()}, '[After SDK Dispose]'`)) : this.options.output.mode !== SDK.IMode[SDK.IMode.brief] || this.options.disableClientServer || handleBriefModeReport(this.sdk, this.options, this.options.disableClientServer);
         } catch (e) {
             console.error("[Rsdoctor] Webpack plugin this.done error", e);
         }

package/dist/plugin.d.ts

@@ -1,16 +1,18 @@
 import type { RsdoctorPluginInstance } from '@rsdoctor/core/types';
 import { ChunkGraph, ModuleGraph } from '@rsdoctor/graph';
+import { RsdoctorPrimarySDK } from '@rsdoctor/sdk';
 import { Linter, SDK, Plugin } from '@rsdoctor/types';
 import type { Compiler } from 'webpack';
 export declare class RsdoctorWebpackPlugin<Rules extends Linter.ExtendRuleData[]> implements RsdoctorPluginInstance<Compiler, Rules> {
     readonly name = "RsdoctorWebpackPlugin";
     readonly options: Plugin.RsdoctorPluginOptionsNormalized<Rules>;
-    readonly sdk: SDK.RsdoctorBuilderSDKInstance;
+    readonly sdk: SDK.RsdoctorBuilderSDKInstance | RsdoctorPrimarySDK;
     readonly isRsdoctorPlugin: boolean;
     modulesGraph: ModuleGraph;
     _bootstrapTask: Promise<unknown>;
     protected browserIsOpened: boolean;
     chunkGraph: ChunkGraph;
+    outsideInstance: boolean | undefined;
     constructor(options?: Plugin.RsdoctorWebpackPluginOptions<Rules>);
     apply(compiler: unknown): unknown;
     afterPlugins: (compiler: Compiler) => void;
@@ -22,5 +24,5 @@ export declare class RsdoctorWebpackPlugin<Rules extends Linter.ExtendRuleData[]
      * @memberof RsdoctorWebpackPlugin
      */
     ensureModulesChunksGraphApplied(compiler: Compiler): void;
-    done: () => Promise<void>;
+    done: (compiler: Plugin.BaseCompilerType<"webpack">) => Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/webpack-plugin",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -21,11 +21,11 @@
     }
   },
   "dependencies": {
-    "@rsdoctor/core": "1.3.5",
-    "@rsdoctor/sdk": "1.3.5",
-    "@rsdoctor/graph": "1.3.5",
-    "@rsdoctor/types": "1.3.5",
-    "@rsdoctor/utils": "1.3.5"
+    "@rsdoctor/core": "1.3.6",
+    "@rsdoctor/sdk": "1.3.6",
+    "@rsdoctor/types": "1.3.6",
+    "@rsdoctor/utils": "1.3.6",
+    "@rsdoctor/graph": "1.3.6"
   },
   "devDependencies": {
     "@types/node": "^22.8.1",