@rsdoctor/core 0.3.4 → 0.3.5

package/dist/build-utils/build/utils/loader.d.ts

@@ -14,6 +14,8 @@ export declare function loadLoaderModule(loaderPath: string, cwd?: string): {
 export declare function getLoaderOptions<T>(loaderContext: Plugin.LoaderContext<T>): T;
 export declare function extractLoaderName(loaderPath: string, cwd?: string): string;
 export declare function mapEachRules<T extends Plugin.BuildRuleSetRule>(rules: T[], callback: (rule: T) => T): T[];
-export declare function addProbeLoader2Rules<T extends Plugin.BuildRuleSetRule>(rules: T[], loaderName: string, appendRules: (rule: T, index: number) => T, strict?: boolean): T[];
+export declare function isESMLoader(r: Plugin.BuildRuleSetRule): boolean;
+export declare function getLoaderNameMatch(r: Plugin.BuildRuleSetRule, loaderName: string, strict?: boolean): boolean;
+export declare function addProbeLoader2Rules<T extends Plugin.BuildRuleSetRule>(rules: T[], appendRules: (rule: T, index: number) => T, fn: (r: Plugin.BuildRuleSetRule) => boolean): T[];
 export declare function createLoaderContextTrap(this: Plugin.LoaderContext<Common.PlainObject>, final: (err: Error | null | undefined, res: string | Buffer | null, sourceMap?: WebpackSourceMapInput) => void): Plugin.LoaderContext<Common.PlainObject<any>>;
 //# sourceMappingURL=loader.d.ts.map

package/dist/build-utils/build/utils/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/utils/loader.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAQ,cAAc,IAAI,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAO/E,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAOA;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,GAAG,SAAgB,GAClB;IACD,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACzD,KAAK,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAC5C,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;CACrB,CAiBA;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,KAQzE;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,SAAK,GAAG,MAAM,CAqBtE;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EAC5D,KAAK,EAAE,CAAC,EAAE,EACV,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GACvB,CAAC,EAAE,CAgFL;AAyBD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EACpE,KAAK,EAAE,CAAC,EAAE,EACV,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,EAC1C,MAAM,CAAC,EAAE,OAAO,GACf,CAAC,EAAE,CAgEL;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAC9C,KAAK,EAAE,CACL,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC3B,SAAS,CAAC,EAAE,qBAAqB,KAC9B,IAAI,iDAsFV"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/build-utils/build/utils/loader.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAQ,cAAc,IAAI,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAQ/E,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAOA;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,GAAG,SAAgB,GAClB;IACD,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACzD,KAAK,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAC5C,GAAG,EAAE,OAAO,GAAG,IAAI,CAAC;CACrB,CAiBA;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,KAQzE;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,SAAK,GAAG,MAAM,CAqBtE;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EAC5D,KAAK,EAAE,CAAC,EAAE,EACV,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GACvB,CAAC,EAAE,CAgFL;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,gBAAgB,WA2BrD;AAED,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,MAAM,CAAC,gBAAgB,EAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,UAAO,WAiBd;AAGD,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EACpE,KAAK,EAAE,CAAC,EAAE,EACV,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC,EAC1C,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,gBAAgB,KAAK,OAAO,GAC1C,CAAC,EAAE,CAsDL;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAC9C,KAAK,EAAE,CACL,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC3B,SAAS,CAAC,EAAE,qBAAqB,KAC9B,IAAI,iDAsFV"}

package/dist/build-utils/build/utils/loader.js

@@ -31,7 +31,9 @@ __export(loader_exports, {
   addProbeLoader2Rules: () => addProbeLoader2Rules,
   createLoaderContextTrap: () => createLoaderContextTrap,
   extractLoaderName: () => extractLoaderName,
+  getLoaderNameMatch: () => getLoaderNameMatch,
   getLoaderOptions: () => getLoaderOptions,
+  isESMLoader: () => isESMLoader,
   loadLoaderModule: () => loadLoaderModule,
   mapEachRules: () => mapEachRules,
   parsePathQueryFragment: () => parsePathQueryFragment
@@ -39,8 +41,10 @@ __export(loader_exports, {
 module.exports = __toCommonJS(loader_exports);
 var import_loader_utils = require("loader-utils");
 var import_path = __toESM(require("path"));
+var import_fs_extra = __toESM(require("fs-extra"));
 var import_lodash = require("lodash");
 var import_common = require("@rsdoctor/utils/common");
+var import_graph = require("@rsdoctor/graph");
 const PATH_QUERY_FRAGMENT_REGEXP = /^((?:\0.|[^?#\0])*)(\?(?:\0.|[^#\0])*)?(#.*)?$/;
 function parsePathQueryFragment(str) {
   const match = PATH_QUERY_FRAGMENT_REGEXP.exec(str);
@@ -153,17 +157,34 @@ function mapEachRules(rules, callback) {
     return rule;
   });
 }
-function getLoaderNameMatch(_r, loaderName, strict = true) {
+function isESMLoader(r) {
+  let _loaderName = typeof r === "object" && typeof r?.loader === "string" ? r.loader : typeof r === "string" ? r : "";
+  if (!_loaderName)
+    return false;
+  const isPath = _loaderName.startsWith("/") || _loaderName.startsWith("./") || _loaderName.startsWith("../");
+  if (isPath) {
+    const packageJsonData = (0, import_graph.readPackageJson)(_loaderName, (file) => {
+      try {
+        return import_fs_extra.default.readJsonSync(file, { encoding: "utf8" });
+      } catch (e) {
+      }
+    });
+    if (packageJsonData?.type === "module")
+      return true;
+  }
+  return false;
+}
+function getLoaderNameMatch(r, loaderName, strict = true) {
   if (!strict) {
-    return typeof _r === "object" && typeof _r?.loader === "string" && _r.loader.includes(loaderName) || typeof _r === "string" && _r.includes(loaderName);
+    return typeof r === "object" && typeof r?.loader === "string" && r.loader.includes(loaderName) || typeof r === "string" && r.includes(loaderName);
   }
-  return typeof _r === "object" && typeof _r?.loader === "string" && _r.loader === loaderName || typeof _r === "string" && _r === loaderName;
+  return typeof r === "object" && typeof r?.loader === "string" && r.loader === loaderName || typeof r === "string" && r === loaderName;
 }
-function addProbeLoader2Rules(rules, loaderName, appendRules, strict) {
+function addProbeLoader2Rules(rules, appendRules, fn) {
   return rules.map((rule) => {
     if (!rule || typeof rule === "string")
       return rule;
-    if (getLoaderNameMatch(rule, loaderName, strict)) {
+    if (fn(rule)) {
       const _rule = {
         ...rule,
         use: [
@@ -179,10 +200,7 @@ function addProbeLoader2Rules(rules, loaderName, appendRules, strict) {
     }
     if (rule.use) {
       if (Array.isArray(rule.use)) {
-        const _index = (0, import_lodash.findIndex)(
-          rule.use,
-          (_r) => getLoaderNameMatch(_r, loaderName, strict)
-        );
+        const _index = (0, import_lodash.findIndex)(rule.use, (_r) => fn(_r));
         if (_index > -1) {
           return appendRules(rule, _index);
         }
@@ -198,21 +216,13 @@ function addProbeLoader2Rules(rules, loaderName, appendRules, strict) {
     if ("oneOf" in rule && rule.oneOf) {
       return {
         ...rule,
-        oneOf: addProbeLoader2Rules(
-          rule.oneOf,
-          loaderName,
-          appendRules
-        )
+        oneOf: addProbeLoader2Rules(rule.oneOf, appendRules, fn)
       };
     }
     if ("rules" in rule && rule.rules) {
       return {
         ...rule,
-        rules: addProbeLoader2Rules(
-          rule.rules,
-          loaderName,
-          appendRules
-        )
+        rules: addProbeLoader2Rules(rule.rules, appendRules, fn)
       };
     }
     return rule;
@@ -292,7 +302,9 @@ function createLoaderContextTrap(final) {
   addProbeLoader2Rules,
   createLoaderContextTrap,
   extractLoaderName,
+  getLoaderNameMatch,
   getLoaderOptions,
+  isESMLoader,
   loadLoaderModule,
   mapEachRules,
   parsePathQueryFragment

package/dist/inner-plugins/plugins/loader.d.ts

@@ -1,12 +1,11 @@
 import { Plugin } from '@rsdoctor/types';
-import { RuleSetRule } from 'webpack';
 import { InternalBasePlugin } from './base';
 export declare class InternalLoaderPlugin<T extends Plugin.BaseCompiler> extends InternalBasePlugin<T> {
     readonly name = "loader";
     readonly internalLoaderPath: string;
     apply(compiler: T): void;
-    afterPlugins: (compiler: Plugin.BaseCompiler) => void;
-    compilation(compiler: Plugin.BaseCompiler, compilation: Plugin.BaseCompilation): void;
-    getInterceptRules(compiler: Plugin.BaseCompiler, rules: RuleSetRule[]): RuleSetRule[];
+    afterPlugins: (compiler: T) => void;
+    compilation(compiler: T, compilation: Plugin.BaseCompilation): void;
+    getInterceptRules(compiler: T, rules: Plugin.BuildRuleSetRules): Plugin.BuildRuleSetRule[];
 }
 //# sourceMappingURL=loader.d.ts.map

package/dist/inner-plugins/plugins/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAInD,OAAO,EAA+B,WAAW,EAAE,MAAM,SAAS,CAAC;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAG5C,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,YAAY;IAEhC,SAAgB,kBAAkB,SAAuC;IAElE,KAAK,CAAC,QAAQ,EAAE,CAAC;IAUjB,YAAY,aAAc,OAAO,YAAY,UAYlD;IAEK,WAAW,CAChB,QAAQ,EAAE,MAAM,CAAC,YAAY,EAC7B,WAAW,EAAE,MAAM,CAAC,eAAe;IA4G9B,iBAAiB,CACtB,QAAQ,EAAE,MAAM,CAAC,YAAY,EAC7B,KAAK,EAAE,WAAW,EAAE;CAcvB"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAMnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAG5C,qBAAa,oBAAoB,CAC/B,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,YAAY;IAEhC,SAAgB,kBAAkB,SAAuC;IAElE,KAAK,CAAC,QAAQ,EAAE,CAAC;IAcjB,YAAY,aAAc,CAAC,UAYhC;IAEK,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,eAAe;IA4G5D,iBAAiB,CACtB,QAAQ,EAAE,CAAC,EACX,KAAK,EAAE,MAAM,CAAC,iBAAiB,GAC9B,MAAM,CAAC,gBAAgB,EAAE;CAa7B"}

package/dist/inner-plugins/plugins/loader.js

@@ -54,10 +54,13 @@ class InternalLoaderPlugin extends import_base.InternalBasePlugin {
     };
   }
   apply(compiler) {
-    compiler.hooks.afterPlugins.tap(this.tapPostOptions, this.afterPlugins);
+    compiler.hooks.afterPlugins.tap(
+      this.tapPostOptions,
+      this.afterPlugins.bind(this, compiler)
+    );
     compiler.hooks.compilation.tap(
       this.tapPreOptions,
-      this.compilation.bind(this, compiler)
+      (compilation) => this.compilation(compiler, compilation)
     );
   }
   compilation(compiler, compilation) {

package/dist/inner-plugins/plugins/plugins.d.ts

@@ -2,7 +2,7 @@ import { Plugin } from '@rsdoctor/types';
 import { InternalBasePlugin } from './base';
 export declare class InternalPluginsPlugin<T extends Plugin.BaseCompiler> extends InternalBasePlugin<T> {
     readonly name = "plugins";
-    apply(compiler: T): void;
+    apply(compiler: Plugin.BaseCompiler): void;
     afterPlugins: (compiler: Plugin.BaseCompiler) => void;
     compilation: (compilation: Plugin.BaseCompilation) => void;
 }

package/dist/inner-plugins/plugins/plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAE5C,qBAAa,qBAAqB,CAChC,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,aAAa;IAE1B,KAAK,CAAC,QAAQ,EAAE,CAAC;IAKjB,YAAY,aAAc,OAAO,YAAY,UAYlD;IAEK,WAAW,gBAAiB,OAAO,eAAe,KAAG,IAAI,CAO9D;CACH"}
+{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/plugins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAE5C,qBAAa,qBAAqB,CAChC,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,aAAa;IAE1B,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY;IAQnC,YAAY,aAAc,OAAO,YAAY,UAYlD;IAEK,WAAW,gBAAiB,OAAO,eAAe,KAAG,IAAI,CAO9D;CACH"}

package/dist/inner-plugins/plugins/plugins.js

@@ -50,7 +50,10 @@ class InternalPluginsPlugin extends import_base.InternalBasePlugin {
     };
   }
   apply(compiler) {
-    compiler.hooks.afterPlugins.tap(this.tapPostOptions, this.afterPlugins);
+    compiler.hooks.afterPlugins.tap(
+      this.tapPostOptions,
+      this.afterPlugins.bind(this, compiler)
+    );
     compiler.hooks.compilation.tap(this.tapPostOptions, this.compilation);
   }
 }

package/dist/inner-plugins/plugins/progress.d.ts

@@ -1,7 +1,7 @@
 import { SDK } from '@rsdoctor/types';
 import type { Plugin } from '@rsdoctor/types';
 import { InternalBasePlugin } from './base';
-export declare class InternalProgressPlugin<T extends Plugin.BaseCompiler> extends InternalBasePlugin<T> {
+export declare class InternalProgressPlugin<T extends Plugin.BaseCompilerType<'webpack'>> extends InternalBasePlugin<T> {
     readonly name = "progress";
     protected currentProgress: SDK.ServerAPI.InferResponseType<SDK.ServerAPI.APIExtends.GetCompileProgess>;
     apply(compiler: T): void;

package/dist/inner-plugins/plugins/progress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAE5C,qBAAa,sBAAsB,CACjC,CAAC,SAAS,MAAM,CAAC,YAAY,CAC7B,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,cAAc;IAElC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAIlG;IAEG,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI;CAqBhC"}
+{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/plugins/progress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAE5C,qBAAa,sBAAsB,CACjC,CAAC,SAAS,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAC5C,SAAQ,kBAAkB,CAAC,CAAC,CAAC;IAC7B,SAAgB,IAAI,cAAc;IAElC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAIlG;IAEG,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI;CAqBhC"}

package/dist/inner-plugins/utils/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/utils/loader.ts"],"names":[],"mappings":";;AAYA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAK9C,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACzE,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEjE,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,GACtD,0BAA0B,CAI5B;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,sDAiBxD;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,GACtD,UAAU,CAAC,OAAO,UAAU,CAAC,gBAAgB,CAAC,CAGhD;AAED,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAgBxD;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EAC/D,KAAK,EAAE,CAAC,EAAE,EACV,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,IAAI,CAAC,0BAA0B,EAAE,QAAQ,GAAG,YAAY,CAAC,EAClE,GAAG,SAAgB,EACnB,aAAa,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,GAC9C,CAAC,EAAE,CAkDL;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAC7C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,cAAc,2BAoFjC"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/utils/loader.ts"],"names":[],"mappings":";;AAYA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAK9C,OAAO,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACzE,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjE,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,GACtD,0BAA0B,CAI5B;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,sDAiBxD;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,GACtD,UAAU,CAAC,OAAO,UAAU,CAAC,gBAAgB,CAAC,CAGhD;AAED,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAgBxD;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,gBAAgB,EAC/D,KAAK,EAAE,CAAC,EAAE,EACV,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,IAAI,CAAC,0BAA0B,EAAE,QAAQ,GAAG,YAAY,CAAC,EAClE,GAAG,SAAgB,EACnB,aAAa,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,GAC9C,CAAC,EAAE,CAsDL;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAC7C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC3B,SAAS,CAAC,EAAE,KAAK,CAAC,cAAc,2BAoFjC"}

package/dist/inner-plugins/utils/loader.js

@@ -50,6 +50,7 @@ var import_error = require("@rsdoctor/utils/error");
 var import_sdk = require("./sdk");
 var import_circleDetect = require("./circleDetect");
 var import_build = require("../../build-utils/build");
+var import_utils = require("../../build-utils/build/utils");
 function getInternalLoaderOptions(loaderContext) {
   const options = import_build.Utils.getLoaderOptions(loaderContext);
   return options[import_common.Loader.LoaderInternalPropertyName];
@@ -107,7 +108,7 @@ function interceptLoader(rules, loaderPath, options, cwd = process.cwd(), resolv
     return target;
   };
   return import_build.Utils.mapEachRules(rules, (rule) => {
-    if (rule.loader?.startsWith("builtin:") || rule.loader?.endsWith(".mjs")) {
+    if (rule.loader?.startsWith("builtin:") || rule.loader?.endsWith(".mjs") || (0, import_utils.isESMLoader)(rule)) {
       return rule;
     }
     const opts = {

package/dist/types/plugin.d.ts

@@ -90,6 +90,8 @@ export interface RsdoctorPluginInstance<T extends Plugin.BaseCompiler, Rules ext
     modulesGraph: ModuleGraph;
     ensureModulesChunksGraphApplied(compiler: T): void;
 }
+export interface RsdoctorRspackPluginInstance<Rules extends LinterType.ExtendRuleData[] = []> extends RsdoctorPluginInstance<Plugin.BaseCompilerType<'rspack'>, Rules> {
+}
 export interface RsdoctorRspackPluginOptions<Rules extends LinterType.ExtendRuleData[]> extends RsdoctorWebpackPluginOptions<Rules> {
 }
 export {};

package/dist/types/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/types/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/types/plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -73,13 +73,13 @@
     "source-map": "^0.7.4",
     "webpack-bundle-analyzer": "^4.9.1",
     "webpack-sources": "^3.2.3",
-    "@rsdoctor/graph": "0.3.4",
-    "@rsdoctor/sdk": "0.3.4",
-    "@rsdoctor/types": "0.3.4",
-    "@rsdoctor/utils": "0.3.4"
+    "@rsdoctor/graph": "0.3.5",
+    "@rsdoctor/sdk": "0.3.5",
+    "@rsdoctor/types": "0.3.5",
+    "@rsdoctor/utils": "0.3.5"
   },
   "devDependencies": {
-    "@rspack/core": "0.6.5",
+    "@rspack/core": "0.7.5",
     "@types/fs-extra": "^11.0.2",
     "@types/loader-utils": "^2.0.5",
     "@types/lodash": "^4.17.0",