@rsdoctor/rspack-plugin 0.3.1 → 0.3.3

package/dist/plugin.d.ts

@@ -1,4 +1,4 @@
-import type { Compiler, Stats } from '@rspack/core';
+import type { Compiler } from '@rspack/core';
 import { ModuleGraph } from '@rsdoctor/graph';
 import { RsdoctorSlaveSDK, RsdoctorWebpackSDK } from '@rsdoctor/sdk';
 import type { RsdoctorPluginInstance, RsdoctorPluginOptionsNormalized, RsdoctorRspackPluginOptions } from '@rsdoctor/core';
@@ -20,7 +20,7 @@ export declare class RsdoctorRspackPlugin<Rules extends Linter.ExtendRuleData[]>
      * @memberof RsdoctorWebpackPlugin
      */
     ensureModulesChunksGraphApplied(compiler: Compiler): void;
-    done: (compiler: Compiler, stats: Stats) => Promise<void>;
-    getRspackConfig(compiler: Compiler, version: string): void;
+    done: (compiler: Compiler) => Promise<void>;
+    getRspackConfig(compiler: Compiler): void;
 }
 //# sourceMappingURL=plugin.d.ts.map

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAA8B,KAAK,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAcrE,OAAO,KAAK,EACV,sBAAsB,EACtB,+BAA+B,EAC/B,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,MAAM,EAIP,MAAM,iBAAiB,CAAC;AAOzB,qBAAa,oBAAoB,CAAC,KAAK,SAAS,MAAM,CAAC,cAAc,EAAE,CACrE,YAAW,sBAAsB,CAAC,QAAQ,EAAE,KAAK,CAAC;IAElD,SAAgB,IAAI,0BAAiB;IAErC,SAAgB,GAAG,EAAE,kBAAkB,GAAG,gBAAgB,CAAC;IAEpD,cAAc,EAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEzC,SAAS,CAAC,eAAe,UAAS;IAE3B,YAAY,EAAE,WAAW,CAAC;IAE1B,OAAO,EAAE,+BAA+B,CAAC,KAAK,CAAC,CAAC;IAEhD,eAAe,EAAE,OAAO,CAAC;gBAEpB,OAAO,CAAC,EAAE,2BAA2B,CAAC,KAAK,CAAC;IAgBxD,KAAK,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO;IA+CjC;;;;;OAKG;IACI,+BAA+B,CAAC,QAAQ,EAAE,QAAQ;IAIlD,IAAI,aAAoB,QAAQ,SAAS,KAAK,KAAG,QAAQ,IAAI,CAAC,CAwCnE;IAEK,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM;CAwB3D"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAA8B,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAcrE,OAAO,KAAK,EACV,sBAAsB,EACtB,+BAA+B,EAC/B,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAa,MAAM,EAA4B,MAAM,iBAAiB,CAAC;AAO9E,qBAAa,oBAAoB,CAAC,KAAK,SAAS,MAAM,CAAC,cAAc,EAAE,CACrE,YAAW,sBAAsB,CAAC,QAAQ,EAAE,KAAK,CAAC;IAElD,SAAgB,IAAI,0BAAiB;IAErC,SAAgB,GAAG,EAAE,kBAAkB,GAAG,gBAAgB,CAAC;IAEpD,cAAc,EAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEzC,SAAS,CAAC,eAAe,UAAS;IAE3B,YAAY,EAAE,WAAW,CAAC;IAE1B,OAAO,EAAE,+BAA+B,CAAC,KAAK,CAAC,CAAC;IAEhD,eAAe,EAAE,OAAO,CAAC;gBAEpB,OAAO,CAAC,EAAE,2BAA2B,CAAC,KAAK,CAAC;IAiBxD,KAAK,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO;IA+CjC;;;;;OAKG;IACI,+BAA+B,CAAC,QAAQ,EAAE,QAAQ;IAIlD,IAAI,aAAoB,QAAQ,KAAG,QAAQ,IAAI,CAAC,CA6BrD;IAEK,eAAe,CAAC,QAAQ,EAAE,QAAQ;CA2B1C"}

package/dist/plugin.js

@@ -44,18 +44,8 @@ class RsdoctorRspackPlugin {
   constructor(options) {
     this.name = import_constants.pluginTapName;
     this.browserIsOpened = false;
-    this.done = async (compiler, stats) => {
-      const json = stats.toJson({
-        all: false,
-        version: true,
-        chunks: true,
-        modules: true,
-        chunkModules: true,
-        assets: true,
-        builtAt: true,
-        chunkRelations: true
-      });
-      this.getRspackConfig(compiler, json.rspackVersion || "");
+    this.done = async (compiler) => {
+      this.getRspackConfig(compiler);
       await this.sdk.bootstrap();
       this.sdk.addClientRoutes([
         import_types.Manifest.RsdoctorManifestClientRoutes.Overall
@@ -81,9 +71,10 @@ class RsdoctorRspackPlugin {
     };
     this.options = (0, import_plugins.normalizeUserConfig)(options);
     this.sdk = this.options.sdkInstance ?? new import_sdk.RsdoctorWebpackSDK({
+      port: this.options.port,
       name: import_constants.pluginTapName,
       root: process.cwd(),
-      type: import_types.SDK.ToDataType.Normal,
+      type: this.options.reportCodeType,
       config: { disableTOSUpload: this.options.disableTOSUpload },
       innerClientPath: this.options.innerClientPath
     });
@@ -129,7 +120,7 @@ class RsdoctorRspackPlugin {
   ensureModulesChunksGraphApplied(compiler) {
     (0, import_plugins.ensureModulesChunksGraphFn)(compiler, this);
   }
-  getRspackConfig(compiler, version) {
+  getRspackConfig(compiler) {
     if (compiler.isChild())
       return;
     const { plugins, infrastructureLogging, ...rest } = compiler.options;
@@ -140,9 +131,11 @@ class RsdoctorRspackPlugin {
       ..._rest,
       plugins: plugins.map((e) => e?.constructor.name)
     };
+    const rspackVersion = compiler.webpack?.rspackVersion;
+    const webpackVersion = compiler.webpack?.version;
     this.sdk.reportConfiguration({
-      name: "rspack",
-      version: version || "unknown",
+      name: rspackVersion ? "rspack" : "webpack",
+      version: rspackVersion || webpackVersion || "unknown",
       config: configuration
     });
     this.sdk.setOutputDir(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/rspack-plugin",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -15,11 +15,11 @@
   "dependencies": {
     "loader-utils": "^2.0.4",
     "lodash": "^4.17.21",
-    "@rsdoctor/core": "0.3.1",
-    "@rsdoctor/graph": "0.3.1",
-    "@rsdoctor/sdk": "0.3.1",
-    "@rsdoctor/utils": "0.3.1",
-    "@rsdoctor/types": "0.3.1"
+    "@rsdoctor/core": "0.3.3",
+    "@rsdoctor/graph": "0.3.3",
+    "@rsdoctor/sdk": "0.3.3",
+    "@rsdoctor/utils": "0.3.3",
+    "@rsdoctor/types": "0.3.3"
   },
   "devDependencies": {
     "@rspack/core": "0.6.5",
@@ -31,7 +31,7 @@
     "typescript": "^5.2.2"
   },
   "peerDependencies": {
-    "@rspack/core": "^0.6.5"
+    "@rspack/core": "0.x"
   },
   "publishConfig": {
     "access": "public",