@rsdoctor/core 1.0.0-beta.2 → 1.0.0-rc.0

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

@@ -51,8 +51,8 @@ const parseBundle = (bundlePath, modulesData) => {
     const tagMatchResult = getStringBetween(
       content,
       0,
-      /([a-z|A-Z]+\.[a-z]+)\(\SRSDOCTOR_START::(.*?);/,
-      /([a-z|A-Z]+\.[a-z]+)\(\SRSDOCTOR_END::(.*?)\)/
+      /([a-z|A-Z|_]+\.[a-z]+)\(\SRSDOCTOR_START::(.*?);/,
+      /([a-z|A-Z|_]+\.[a-z]+)\(\SRSDOCTOR_END::(.*?)\)/
     );
     content = tagMatchResult.result?.trim() || content;
     tagCache.set(bundlePath, tagMatchResult.loc);

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

@@ -137,7 +137,7 @@ function normalizeUserConfig(config = {}) {
     mode,
     brief
   };
-  if (!output.compressData && (output.reportCodeType && !output.reportCodeType?.noAssetsAndModuleSource || !output.reportCodeType)) {
+  if (output.compressData === false && (output.reportCodeType && !output.reportCodeType?.noAssetsAndModuleSource || !output.reportCodeType)) {
     import_logger.logger.info(
       import_logger.chalk.yellow(
         `[RSDOCTOR]: When you use compressData: false, it is recommended to set output.reportCodeType to { noAssetsAndModuleSource: true }.`

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

@@ -171,7 +171,7 @@ async function reportLoader(ctx, start, startHRTime, isPitch, sync, code, err, r
     mappings: data.mappings,
     file: loaderData[0].resource.path
   };
-  const sdk = (0, import_sdk.getSDK)();
+  const sdk = (0, import_sdk.getSDK)(ctx._compilation?.name);
   if (sdk?.reportLoader && !("parent" in sdk && sdk.parent)) {
     sdk.reportLoader(loaderData);
     sdk.reportSourceMap(sourceMapData);

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

@@ -1 +1 @@
-{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/utils/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAAE,MAAM,eAAe,CAAC;AAIhE,wBAAgB,MAAM,CAAC,CAAC,EAAE,WAAW,QAEpC;AAED,wBAAgB,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,0FAS1C"}
+{"version":3,"file":"sdk.d.ts","sourceRoot":"","sources":["../../../src/inner-plugins/utils/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAAE,MAAM,eAAe,CAAC;AAKhE,wBAAgB,MAAM,CAAC,CAAC,EAAE,WAAW,QAGpC;AAED,wBAAgB,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,0FAY1C"}

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

@@ -22,11 +22,16 @@ __export(sdk_exports, {
   setSDK: () => setSDK
 });
 module.exports = __toCommonJS(sdk_exports);
+let sdks = [];
 let sdk;
 function setSDK(t) {
+  sdks.push(t);
   sdk = t;
 }
 function getSDK(builderName) {
+  if (sdk && sdk.name !== builderName) {
+    sdk = builderName ? sdks.find((s) => s.name === builderName) || sdk : sdk;
+  }
   if (sdk && builderName && "parent" in sdk) {
     const _sdk = sdk;
     const slaveSDK = _sdk.parent.slaves.find(

package/dist/rules/rules/loader-performance-optimization/index.js

@@ -40,12 +40,14 @@ const rule = (0, import_rule.defineRule)(() => {
       }
     },
     check({ loader, configs, root, ruleConfig, report }) {
-      const { extensions, ignore, threshold } = ruleConfig;
-      if (extensions.length === 0)
+      const { extensions, ignore = [], threshold = 5e3 } = ruleConfig;
+      if (!extensions || extensions?.length === 0)
         return;
       if (loader.length === 0)
         return;
-      const { config } = configs.find((e) => e.name === "webpack") || { config: void 0 };
+      const { config } = configs.find((e) => e.name === "webpack") || {
+        config: void 0
+      };
       if (!config) {
         return;
       }
@@ -81,7 +83,7 @@ const rule = (0, import_rule.defineRule)(() => {
           null,
           arr.map((e) => e.endAt)
         ) - Math.min.apply(arr.map((e) => e.startAt));
-        if (v2 >= v1)
+        if (v2 >= v1 || v2 === -Infinity)
           return v1;
         return v2;
       };
@@ -109,8 +111,6 @@ const rule = (0, import_rule.defineRule)(() => {
             detail: {
               description: message,
               type: "link"
-              // nodeModulesFiles,
-              // outofCwdFiles,
             }
           });
         }

package/dist/rules/rules/loader-performance-optimization/types.d.ts

@@ -3,18 +3,18 @@ export interface Config {
     /**
      * loaders which should be ignore.
      */
-    ignore: (string | RegExp)[];
+    ignore?: (string | RegExp)[];
     /**
      * threshold which the loader total costs.
      * @unit millisecond
      * @default 5000
      */
-    threshold: number;
+    threshold?: number;
     /**
      * the file extensions which will be match in rule check.
      * @default ["js", "css", "jpg", "jpeg", "png", "gif", "webp", "svg"]
      */
-    extensions: (string | RegExp)[];
+    extensions?: (string | RegExp)[];
 }
 export interface LoaderMapValue extends SDK.LoaderTransformData {
     __resource__: SDK.ResourceData;

package/dist/rules/rules/loader-performance-optimization/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/rules/rules/loader-performance-optimization/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC5B;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,UAAU,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,cAAe,SAAQ,GAAG,CAAC,mBAAmB;IAC7D,YAAY,EAAE,GAAG,CAAC,YAAY,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/rules/rules/loader-performance-optimization/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC7B;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CAClC;AAED,MAAM,WAAW,cAAe,SAAQ,GAAG,CAAC,mBAAmB;IAC7D,YAAY,EAAE,GAAG,CAAC,YAAY,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;CACnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/core",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-rc.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -73,15 +73,15 @@
     "webpack-bundle-analyzer": "^4.10.2",
     "@rsbuild/plugin-check-syntax": "1.2.2",
     "browserslist-load-config": "^1.0.0",
-    "@rsdoctor/graph": "1.0.0-beta.2",
-    "@rsdoctor/types": "1.0.0-beta.2",
-    "@rsdoctor/utils": "1.0.0-beta.2",
-    "@rsdoctor/sdk": "1.0.0-beta.2"
+    "@rsdoctor/graph": "1.0.0-rc.0",
+    "@rsdoctor/sdk": "1.0.0-rc.0",
+    "@rsdoctor/utils": "1.0.0-rc.0",
+    "@rsdoctor/types": "1.0.0-rc.0"
   },
   "devDependencies": {
-    "@rspack/core": "^1.2.5",
+    "@rspack/core": "^1.2.7",
     "@types/fs-extra": "^11.0.4",
-    "@types/lodash": "^4.17.15",
+    "@types/lodash": "^4.17.16",
     "@types/node": "^16",
     "@types/node-fetch": "^2.6.12",
     "@types/path-browserify": "1.0.3",