@modern-js/builder 2.36.0 → 2.37.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/cli/provider.js +13 -0
  2. package/dist/plugins/tsChecker.js +2 -2
  3. package/package.json +10 -9
package/dist/cli/provider.js CHANGED
@@ -34,8 +34,21 @@ __export(provider_exports, {
34
34
  module.exports = __toCommonJS(provider_exports);
35
35
  var import_builder_shared = require("@modern-js/builder-shared");
36
36
  var import_utils = require("@modern-js/utils");
37
+ var import_path = __toESM(require("path"));
37
38
  function getProviderType() {
38
39
  const root = process.cwd();
40
+ const pkgJsonPath = import_path.default.join(root, "package.json");
41
+ const pkgJson = import_utils.fs.readJSONSync(pkgJsonPath);
42
+ const deps = {
43
+ ...pkgJson.dependencies,
44
+ ...pkgJson.devDependencies
45
+ };
46
+ if (deps[import_builder_shared.RSPACK_PROVIDER]) {
47
+ return "rspack";
48
+ }
49
+ if (deps[import_builder_shared.WEBPACK_PROVIDER]) {
50
+ return "webpack";
51
+ }
39
52
  if ((0, import_utils.isPackageInstalled)(import_builder_shared.RSPACK_PROVIDER, root)) {
40
53
  return "rspack";
41
54
  }
package/dist/plugins/tsChecker.js CHANGED
@@ -31,7 +31,7 @@ __export(tsChecker_exports, {
31
31
  builderPluginTsChecker: () => builderPluginTsChecker
32
32
  });
33
33
  module.exports = __toCommonJS(tsChecker_exports);
34
- var import_lodash = require("@modern-js/utils/lodash");
34
+ var import_deepmerge = __toESM(require("deepmerge"));
35
35
  const builderPluginTsChecker = () => {
36
36
  return {
37
37
  name: "builder-plugin-ts-checker",
@@ -91,7 +91,7 @@ const builderPluginTsChecker = () => {
91
91
  console.error(message.replace(/ERROR/g, "Type Error"));
92
92
  }
93
93
  }
94
- }, config.tools.tsChecker, void 0, import_lodash.merge);
94
+ }, config.tools.tsChecker, void 0, import_deepmerge.default);
95
95
  if (api.context.bundlerType === "rspack" && chain.get("mode") === "production") {
96
96
  logger.info("ts checker running...");
97
97
  logger.info("ts checker is running slowly and will block builds until it is complete, please be patient and wait.");
package/package.json CHANGED
@@ -18,7 +18,7 @@
18
18
  "engines": {
19
19
  "node": ">=14.0.0"
20
20
  },
21
- "version": "2.36.0",
21
+ "version": "2.37.0",
22
22
  "jsnext:source": "./src/index.ts",
23
23
  "types": "./dist/index.d.ts",
24
24
  "main": "./dist/index.js",
@@ -51,21 +51,22 @@
51
51
  }
52
52
  },
53
53
  "dependencies": {
54
- "@rsbuild/monorepo-utils": "0.0.3",
54
+ "@rsbuild/monorepo-utils": "0.0.7",
55
55
  "@svgr/webpack": "8.0.1",
56
56
  "@swc/helpers": "0.5.1",
57
+ "deepmerge": "^4.3.1",
57
58
  "jiti": "^1.20.0",
58
- "@modern-js/builder-shared": "2.36.0",
59
- "@modern-js/utils": "2.36.0"
59
+ "@modern-js/builder-shared": "2.37.0",
60
+ "@modern-js/utils": "2.37.0"
60
61
  },
61
62
  "devDependencies": {
62
63
  "@types/babel__core": "^7.20.0",
63
64
  "@types/node": "^14",
64
65
  "typescript": "^5",
65
- "@modern-js/builder-webpack-provider": "2.36.0",
66
- "@modern-js/builder-rspack-provider": "2.36.0",
67
- "@scripts/build": "2.36.0",
68
- "@scripts/vitest-config": "2.36.0"
66
+ "@modern-js/builder-rspack-provider": "2.37.0",
67
+ "@modern-js/builder-webpack-provider": "2.37.0",
68
+ "@scripts/build": "2.37.0",
69
+ "@scripts/vitest-config": "2.37.0"
69
70
  },
70
71
  "publishConfig": {
71
72
  "registry": "https://registry.npmjs.org/",
@@ -77,7 +78,7 @@
77
78
  "build": "modern-lib build",
78
79
  "dev": "modern-lib build --watch",
79
80
  "test": "vitest run",
80
- "test:watch": "vitest dev --no-coverage",
81
+ "test:watch": "vitest dev",
81
82
  "test:ui": "vitest --ui"
82
83
  }
83
84
  }