@rsdoctor/rspack-plugin 0.4.2 → 0.4.3

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAEL,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,eAAe,CAAC;AAcvB,OAAO,KAAK,EACV,4BAA4B,EAC5B,+BAA+B,EAC/B,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,MAAM,EAEN,MAAM,EAEP,MAAM,iBAAiB,CAAC;AAQzB,qBAAa,oBAAoB,CAAC,KAAK,SAAS,MAAM,CAAC,cAAc,EAAE,CACrE,YAAW,4BAA4B,CAAC,KAAK,CAAC;IAE9C,SAAgB,IAAI,0BAAiB;IAErC,SAAgB,GAAG,EAAE,kBAAkB,GAAG,gBAAgB,CAAC;IAE3D,SAAgB,gBAAgB,EAAE,OAAO,CAAC;IAEnC,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;IAiCxD,KAAK,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO;IAyDjC;;;;;OAKG;IACI,+BAA+B,CACpC,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC;IAKtC,IAAI,aACC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAC1C,OAAO,CAAC,IAAI,CAAC,CA6Cd;IAEK,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC;CA8BnE"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAEL,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,eAAe,CAAC;AAcvB,OAAO,KAAK,EACV,4BAA4B,EAC5B,+BAA+B,EAC/B,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAEL,MAAM,EAGN,MAAM,EAEP,MAAM,iBAAiB,CAAC;AAQzB,qBAAa,oBAAoB,CAAC,KAAK,SAAS,MAAM,CAAC,cAAc,EAAE,CACrE,YAAW,4BAA4B,CAAC,KAAK,CAAC;IAE9C,SAAgB,IAAI,0BAAiB;IAErC,SAAgB,GAAG,EAAE,kBAAkB,GAAG,gBAAgB,CAAC;IAE3D,SAAgB,gBAAgB,EAAE,OAAO,CAAC;IAEnC,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;IAiCxD,KAAK,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO;IAgEjC;;;;;OAKG;IACI,+BAA+B,CACpC,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC;IAKtC,IAAI,aACC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAC1C,OAAO,CAAC,IAAI,CAAC,CA6Cd;IAEK,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC;CA8BnE"}

package/dist/plugin.js

@@ -34,11 +34,11 @@ module.exports = __toCommonJS(plugin_exports);
 var import_graph = require("@rsdoctor/graph");
 var import_sdk = require("@rsdoctor/sdk");
 var import_plugins = require("@rsdoctor/core/plugins");
+var import_build_utils = require("@rsdoctor/core/build-utils");
 var import_types = require("@rsdoctor/types");
 var import_path = __toESM(require("path"));
 var import_constants = require("./constants");
 var import_lodash = require("lodash");
-var import_probeLoaderPlugin = require("./probeLoaderPlugin");
 var import_common = require("@rsdoctor/utils/common");
 var import_logger = require("@rsdoctor/utils/logger");
 class RsdoctorRspackPlugin {
@@ -128,11 +128,16 @@ 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.loader) {
+      new import_build_utils.Loader.ProbeLoaderPlugin().apply(compiler);
+      this.sdk.addClientRoutes([
+        import_types.Manifest.RsdoctorManifestClientRoutes.WebpackLoaders
+      ]);
+      if (!import_common.Loader.isVue(compiler)) {
+        new import_plugins.InternalLoaderPlugin(this).apply(
+          compiler
+        );
+      }
     }
     if (this.options.features.plugins) {
       new import_plugins.InternalPluginsPlugin(this).apply(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/rspack-plugin",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -13,17 +13,15 @@
     "dist"
   ],
   "dependencies": {
-    "loader-utils": "^2.0.4",
     "lodash": "^4.17.21",
-    "@rsdoctor/core": "0.4.2",
-    "@rsdoctor/graph": "0.4.2",
-    "@rsdoctor/sdk": "0.4.2",
-    "@rsdoctor/utils": "0.4.2",
-    "@rsdoctor/types": "0.4.2"
+    "@rsdoctor/core": "0.4.3",
+    "@rsdoctor/graph": "0.4.3",
+    "@rsdoctor/sdk": "0.4.3",
+    "@rsdoctor/utils": "0.4.3",
+    "@rsdoctor/types": "0.4.3"
   },
   "devDependencies": {
     "@rspack/core": "0.7.5",
-    "@types/loader-utils": "^2.0.6",
     "@types/lodash": "^4.17.7",
     "@types/node": "^16",
     "@types/tapable": "2.2.7",

package/dist/probeLoader.d.ts

@@ -1,5 +0,0 @@
-import { Plugin } from '@rsdoctor/types';
-import type { LoaderDefinitionFunction } from '@rspack/core';
-declare const loaderModule: Plugin.LoaderDefinition<Parameters<LoaderDefinitionFunction>, {}>;
-export default loaderModule;
-//# sourceMappingURL=probeLoader.d.ts.map

package/dist/probeLoader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"probeLoader.d.ts","sourceRoot":"","sources":["../src/probeLoader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAO,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAK7D,QAAA,MAAM,YAAY,EAAE,MAAM,CAAC,gBAAgB,CACzC,UAAU,CAAC,wBAAwB,CAAC,EACpC,EAAE,CAwCH,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/probeLoader.js

@@ -1,71 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var probeLoader_exports = {};
-__export(probeLoader_exports, {
-  default: () => probeLoader_default
-});
-module.exports = __toCommonJS(probeLoader_exports);
-var import_plugins = require("@rsdoctor/core/plugins");
-var import_loader_utils = require("loader-utils");
-var import_lodash = require("lodash");
-var import_path = __toESM(require("path"));
-const loaderModule = function(...args) {
-  const time = Date.now();
-  const code = args[0];
-  const _options = this.getOptions();
-  const sdk = (0, import_plugins.getSDK)(_options.builderName);
-  const loaderData = {
-    resource: {
-      path: this.resourcePath,
-      query: (0, import_loader_utils.parseQuery)(this.resourceQuery || "?"),
-      queryRaw: this.resourceQuery,
-      ext: import_path.default.extname(this.resourcePath).slice(1)
-    },
-    loaders: [
-      {
-        loader: _options.loader,
-        loaderIndex: this.loaderIndex,
-        path: _options.loader,
-        input: _options.type === "start" ? code : null,
-        result: _options.type === "end" ? code : null,
-        startAt: _options.type === "start" ? time : 0,
-        endAt: _options.type === "end" ? time : 0,
-        options: (0, import_lodash.omit)(_options.options, "type"),
-        isPitch: false,
-        sync: false,
-        errors: [],
-        pid: process.pid,
-        ppid: process.ppid
-      }
-    ]
-  };
-  sdk.reportLoaderStartOrEnd(loaderData);
-  this.callback(null, ...args);
-};
-var probeLoader_default = loaderModule;

package/dist/probeLoaderPlugin.d.ts

@@ -1,6 +0,0 @@
-import { Plugin } from '@rsdoctor/types';
-export declare class ProbeLoaderPlugin {
-    apply(compiler: Plugin.BaseCompiler): void;
-    private addProbeLoader;
-}
-//# sourceMappingURL=probeLoaderPlugin.d.ts.map

package/dist/probeLoaderPlugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"probeLoaderPlugin.d.ts","sourceRoot":"","sources":["../src/probeLoaderPlugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAOzC,qBAAa,iBAAiB;IAC5B,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY;IAoBnC,OAAO,CAAC,cAAc;CA+CvB"}

package/dist/probeLoaderPlugin.js

@@ -1,100 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var probeLoaderPlugin_exports = {};
-__export(probeLoaderPlugin_exports, {
-  ProbeLoaderPlugin: () => ProbeLoaderPlugin
-});
-module.exports = __toCommonJS(probeLoaderPlugin_exports);
-var import_build_utils = require("@rsdoctor/core/build-utils");
-var import_path = __toESM(require("path"));
-var import_core = require("@rsdoctor/core");
-const BuiltinLoaderName = "builtin:swc-loader";
-const ESMLoaderFile = ".mjs";
-class ProbeLoaderPlugin {
-  apply(compiler) {
-    compiler.hooks.beforeRun.tap(
-      {
-        name: "ProbeLoaderPlugin"
-      },
-      () => {
-        this.addProbeLoader(compiler);
-      }
-    );
-    compiler.hooks.watchRun.tap(
-      {
-        name: "ProbeLoaderPlugin"
-      },
-      () => {
-        this.addProbeLoader(compiler);
-      }
-    );
-  }
-  addProbeLoader(compiler) {
-    const rules = compiler.options.module.rules;
-    const appendRule = (rule, index) => {
-      if ("use" in rule && Array.isArray(rule.use)) {
-        const _builtinRule = rule.use[index];
-        const _options = typeof _builtinRule.options === "string" ? {} : { ..._builtinRule };
-        rule.use.splice(index, 0, {
-          loader: import_path.default.join(__dirname, "./probeLoader.js"),
-          options: {
-            ..._options,
-            type: "end",
-            builderName: compiler.options.name
-          }
-        });
-        rule.use.splice(index + 2, 0, {
-          loader: import_path.default.join(__dirname, "./probeLoader.js"),
-          options: {
-            ..._options,
-            type: "start",
-            builderName: compiler.options.name
-          }
-        });
-      }
-      return rule;
-    };
-    compiler.options.module.rules = import_build_utils.Utils.addProbeLoader2Rules(
-      rules,
-      appendRule,
-      (r) => import_core.Build.Utils.getLoaderNameMatch(r, BuiltinLoaderName, true)
-    );
-    compiler.options.module.rules = import_build_utils.Utils.addProbeLoader2Rules(
-      rules,
-      appendRule,
-      (r) => {
-        return import_core.Build.Utils.getLoaderNameMatch(r, ESMLoaderFile, false) || import_core.Build.Utils.isESMLoader(r);
-      }
-    );
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ProbeLoaderPlugin
-});