@rsdoctor/rspack-plugin 0.2.2 → 0.2.3

package/dist/plugin.d.ts

@@ -10,6 +10,7 @@ export declare class RsdoctorRspackPlugin<Rules extends Linter.ExtendRuleData[]>
     protected browserIsOpened: boolean;
     modulesGraph: ModuleGraph;
     options: RsdoctorPluginOptionsNormalized<Rules>;
+    outsideInstance: boolean;
     constructor(options?: RsdoctorRspackPluginOptions<Rules>);
     apply(compiler: unknown): unknown;
     /**

package/dist/plugin.js

@@ -38,7 +38,7 @@ var import_types = require("@rsdoctor/types");
 var import_path = __toESM(require("path"));
 var import_constants = require("./constants");
 var import_lodash = require("lodash");
-var import_builtinLoaderPlugin = require("./builtinLoaderPlugin");
+var import_probeLoaderPlugin = require("./probeLoaderPlugin");
 var import_common = require("@rsdoctor/utils/common");
 class RsdoctorRspackPlugin {
   constructor(options) {
@@ -60,8 +60,15 @@ class RsdoctorRspackPlugin {
       this.sdk.addClientRoutes([
         import_types.Manifest.RsdoctorManifestClientRoutes.Overall
       ]);
-      const _sdk = (0, import_plugins.getSDK)(compiler.options.name);
-      _sdk.setOutputDir(
+      if (this.outsideInstance && "parent" in this.sdk) {
+        this.sdk.parent.master.setOutputDir(
+          import_path.default.resolve(
+            compiler.outputPath,
+            `./${import_types.Constants.RsdoctorOutputFolder}`
+          )
+        );
+      }
+      this.sdk.setOutputDir(
         import_path.default.resolve(compiler.outputPath, `./${import_types.Constants.RsdoctorOutputFolder}`)
       );
       await this.sdk.writeStore();
@@ -80,6 +87,7 @@ class RsdoctorRspackPlugin {
       config: { disableTOSUpload: this.options.disableTOSUpload },
       innerClientPath: this.options.innerClientPath
     });
+    this.outsideInstance = Boolean(this.options.sdkInstance);
     this.modulesGraph = new import_graph.ModuleGraph();
   }
   apply(compiler) {
@@ -99,6 +107,7 @@ class RsdoctorRspackPlugin {
     );
     new import_plugins.InternalSummaryPlugin(this).apply(compiler);
     if (this.options.features.loader && !import_common.Loader.isVue(compiler)) {
+      new import_probeLoaderPlugin.ProbeLoaderPlugin().apply(compiler);
       new import_plugins.InternalLoaderPlugin(this).apply(compiler);
     }
     if (this.options.features.plugins) {
@@ -108,9 +117,7 @@ class RsdoctorRspackPlugin {
       new import_plugins.InternalBundlePlugin(this).apply(compiler);
     }
     new import_plugins.InternalRulesPlugin(this).apply(compiler);
-    if (!import_common.Loader.isVue(compiler)) {
-      new import_builtinLoaderPlugin.BuiltinLoaderPlugin().apply(compiler);
-    }
+    new import_plugins.InternalErrorReporterPlugin(this).apply(compiler);
   }
   /**
    * @description Generate ModuleGraph and ChunkGraph from stats and webpack module apis;

package/dist/{builtinLoaderPlugin.d.ts → probeLoaderPlugin.d.ts}

@@ -1,5 +1,5 @@
 import type { Compiler } from '@rspack/core';
-export declare class BuiltinLoaderPlugin {
+export declare class ProbeLoaderPlugin {
     apply(compiler: Compiler): void;
     private addProbeLoader;
 }

package/dist/{builtinLoaderPlugin.js → probeLoaderPlugin.js}

@@ -26,19 +26,20 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var builtinLoaderPlugin_exports = {};
-__export(builtinLoaderPlugin_exports, {
-  BuiltinLoaderPlugin: () => BuiltinLoaderPlugin
+var probeLoaderPlugin_exports = {};
+__export(probeLoaderPlugin_exports, {
+  ProbeLoaderPlugin: () => ProbeLoaderPlugin
 });
-module.exports = __toCommonJS(builtinLoaderPlugin_exports);
+module.exports = __toCommonJS(probeLoaderPlugin_exports);
 var import_build_utils = require("@rsdoctor/core/build-utils");
 var import_path = __toESM(require("path"));
 const BuiltinLoaderName = "builtin:swc-loader";
-class BuiltinLoaderPlugin {
+const ESMLoaderFile = ".mjs";
+class ProbeLoaderPlugin {
   apply(compiler) {
     compiler.hooks.beforeRun.tap(
       {
-        name: "BuiltinLoaderPlugin"
+        name: "ProbeLoaderPlugin"
       },
       () => {
         this.addProbeLoader(compiler);
@@ -46,7 +47,7 @@ class BuiltinLoaderPlugin {
     );
     compiler.hooks.watchRun.tap(
       {
-        name: "BuiltinLoaderPlugin"
+        name: "ProbeLoaderPlugin"
       },
       () => {
         this.addProbeLoader(compiler);
@@ -78,14 +79,20 @@ class BuiltinLoaderPlugin {
       }
       return rule;
     };
-    compiler.options.module.rules = import_build_utils.Utils.changeBuiltinLoader(
+    compiler.options.module.rules = import_build_utils.Utils.addProbeLoader2Rules(
       rules,
       BuiltinLoaderName,
       appendRule
     );
+    compiler.options.module.rules = import_build_utils.Utils.addProbeLoader2Rules(
+      rules,
+      ESMLoaderFile,
+      appendRule,
+      false
+    );
   }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  BuiltinLoaderPlugin
+  ProbeLoaderPlugin
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/rspack-plugin",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -15,10 +15,10 @@
   "dependencies": {
     "loader-utils": "^2.0.4",
     "lodash": "^4.17.21",
-    "@rsdoctor/core": "0.2.2",
-    "@rsdoctor/graph": "0.2.2",
-    "@rsdoctor/utils": "0.2.2",
-    "@rsdoctor/sdk": "0.2.2"
+    "@rsdoctor/core": "0.2.3",
+    "@rsdoctor/graph": "0.2.3",
+    "@rsdoctor/utils": "0.2.3",
+    "@rsdoctor/sdk": "0.2.3"
   },
   "devDependencies": {
     "@rspack/core": "0.5.1",
@@ -28,7 +28,7 @@
     "@types/tapable": "2.2.2",
     "tslib": "2.4.1",
     "typescript": "^5.2.2",
-    "@rsdoctor/types": "0.2.2"
+    "@rsdoctor/types": "0.2.3"
   },
   "peerDependencies": {
     "@rspack/core": "^0.5.1"