@modern-js/module-tools 0.0.0-nightly-20231211170643 → 0.0.0-nightly-20231212170634

package/dist/builder/clear.js

@@ -23,6 +23,7 @@ __export(clear_exports, {
 module.exports = __toCommonJS(clear_exports);
 var import_utils = require("@modern-js/utils");
 var import_locale = require("../locale");
+var import_utils2 = require("../utils");
 const clearBuildConfigPaths = async (configs, projectAbsRootPath) => {
   for (const config of configs) {
     if (projectAbsRootPath === config.outDir) {
@@ -30,6 +31,22 @@ const clearBuildConfigPaths = async (configs, projectAbsRootPath) => {
     } else {
       await import_utils.fs.remove(config.outDir);
     }
+    if (config.buildType === "bundleless" && config.dts && // keep it same as https://github.com/web-infra-dev/modern.js/blob/main/packages/solutions/module-tools/src/builder/build.ts#L37
+    await import_utils.fs.pathExists(config.tsconfig)) {
+      const tscBinFile = await (0, import_utils2.getTscBinPath)(projectAbsRootPath);
+      const childProgress = (0, import_utils.execa)(tscBinFile, [
+        "--build",
+        "--clean"
+      ], {
+        stdio: "pipe",
+        cwd: projectAbsRootPath
+      });
+      try {
+        await childProgress;
+      } catch (e) {
+        import_utils.logger.error(e);
+      }
+    }
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/builder/dts/tsc.js

@@ -61,18 +61,33 @@ const runTscBin = async (api, config) => {
   const tscBinFile = await (0, import_utils2.getTscBinPath)(appDirectory);
   const params = [];
   if (userTsconfig.references) {
-    var _userTsconfig;
     params.push("-b", tsconfigPath);
-    var _compilerOptions;
-    (_compilerOptions = (_userTsconfig = userTsconfig).compilerOptions) !== null && _compilerOptions !== void 0 ? _compilerOptions : _userTsconfig.compilerOptions = {};
-    const { baseUrl = ".", outDir = "dist" } = userTsconfig.compilerOptions;
+    var _userTsconfig_compilerOptions;
+    const { baseUrl = ".", outDir, emitDeclarationOnly, declaration } = (_userTsconfig_compilerOptions = userTsconfig.compilerOptions) !== null && _userTsconfig_compilerOptions !== void 0 ? _userTsconfig_compilerOptions : {};
     const abosultBaseUrl = import_path.default.isAbsolute(baseUrl) ? baseUrl : import_path.default.join(import_path.default.dirname(tsconfigPath), baseUrl);
-    if (import_path.default.resolve(abosultBaseUrl, outDir) !== distPath) {
-      userTsconfig.compilerOptions.outDir = import_path.default.relative(abosultBaseUrl, distPath);
-      import_utils.fs.writeFileSync(tsconfigPath, JSON.stringify(userTsconfig, null, 2));
+    if (!outDir || import_path.default.resolve(abosultBaseUrl, outDir) !== distPath) {
+      const correctOutDir = import_path.default.relative(abosultBaseUrl, distPath);
+      throw new Error(`Please set outDir: "${correctOutDir}" in ${import_utils.chalk.underline(tsconfigPath)} to keep it same as buildConfig.`);
+    }
+    const tsVersion = await (0, import_utils2.detectTSVersion)(appDirectory);
+    if (tsVersion !== 5) {
+      if (!declaration || !emitDeclarationOnly) {
+        throw new Error(`Please set declaration: true and emitDeclaration: true in ${import_utils.chalk.underline(tsconfigPath)}`);
+      }
+    } else {
+      params.push("--declaration", "--emitDeclarationOnly");
     }
   } else {
-    params.push("-p", tsconfigPath, "--outDir", distPath);
+    params.push(
+      "-p",
+      tsconfigPath,
+      // Same as dts.distPath
+      "--outDir",
+      distPath,
+      // Only emit d.ts files
+      "--declaration",
+      "--emitDeclarationOnly"
+    );
   }
   if (watch) {
     params.push("-w");
@@ -82,10 +97,7 @@ const runTscBin = async (api, config) => {
     /* Required parameter, use it stdout have color */
     "--pretty",
     // https://github.com/microsoft/TypeScript/issues/21824
-    "--preserveWatchOutput",
-    // Only emit d.ts files
-    "--declaration",
-    "--emitDeclarationOnly"
+    "--preserveWatchOutput"
   ], {
     stdio: "pipe",
     cwd: appDirectory

package/dist/utils/dts.d.ts

@@ -1,5 +1,6 @@
 import type { ITsconfig, GeneratorDtsConfig, BuildType, TsTarget } from '../types';
 export declare const getProjectTsconfig: (tsconfigPath: string) => Promise<ITsconfig>;
+export declare function detectTSVersion(appDirectory?: string): Promise<number | undefined>;
 export declare const getTscBinPath: (appDirectory: string) => Promise<string>;
 export declare const processDtsFilesAfterTsc: (config: GeneratorDtsConfig) => Promise<void>;
 export declare const printOrThrowDtsErrors: (error: unknown, options: {

package/dist/utils/dts.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dts_exports = {};
 __export(dts_exports, {
+  detectTSVersion: () => detectTSVersion,
   getProjectTsconfig: () => getProjectTsconfig,
   getTscBinPath: () => getTscBinPath,
   printOrThrowDtsErrors: () => printOrThrowDtsErrors,
@@ -47,6 +48,15 @@ const getProjectTsconfig = async (tsconfigPath) => {
   }
   return import_utils.json5.parse(import_utils.fs.readFileSync(tsconfigPath, "utf-8"));
 };
+async function detectTSVersion(appDirectory) {
+  const cwd = appDirectory !== null && appDirectory !== void 0 ? appDirectory : process.cwd();
+  const typescriptPath = (0, import_path.join)(cwd, "node_modules", "typescript");
+  if (await import_utils.fs.pathExists(typescriptPath)) {
+    const typescriptPkg = await import_utils.fs.readJson((0, import_path.join)(typescriptPath, "package.json"));
+    const version = Number(typescriptPkg.version.split(".")[0]);
+    return version;
+  }
+}
 const getTscBinPath = async (appDirectory) => {
   const { default: findUp, exists: pathExists } = await Promise.resolve().then(() => __toESM(require("../../compiled/find-up")));
   const tscBinFile = await findUp(async (directory) => {
@@ -161,6 +171,7 @@ const printOrThrowDtsErrors = async (error, options) => {
 const tsTargetAtOrAboveES2022 = (target) => target === "es2022" || target === "esnext";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  detectTSVersion,
   getProjectTsconfig,
   getTscBinPath,
   printOrThrowDtsErrors,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "0.0.0-nightly-20231211170643",
+  "version": "0.0.0-nightly-20231212170634",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -67,24 +67,24 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "0.0.0-nightly-20231211170643",
-    "@modern-js/plugin-changeset": "0.0.0-nightly-20231211170643",
-    "@modern-js/new-action": "0.0.0-nightly-20231211170643",
-    "@modern-js/plugin": "0.0.0-nightly-20231211170643",
-    "@modern-js/plugin-lint": "0.0.0-nightly-20231211170643",
-    "@modern-js/types": "0.0.0-nightly-20231211170643",
-    "@modern-js/upgrade": "0.0.0-nightly-20231211170643",
-    "@modern-js/plugin-i18n": "0.0.0-nightly-20231211170643",
-    "@modern-js/utils": "0.0.0-nightly-20231211170643"
+    "@modern-js/core": "0.0.0-nightly-20231212170634",
+    "@modern-js/new-action": "0.0.0-nightly-20231212170634",
+    "@modern-js/plugin": "0.0.0-nightly-20231212170634",
+    "@modern-js/plugin-i18n": "0.0.0-nightly-20231212170634",
+    "@modern-js/plugin-changeset": "0.0.0-nightly-20231212170634",
+    "@modern-js/plugin-lint": "0.0.0-nightly-20231212170634",
+    "@modern-js/upgrade": "0.0.0-nightly-20231212170634",
+    "@modern-js/types": "0.0.0-nightly-20231212170634",
+    "@modern-js/utils": "0.0.0-nightly-20231212170634"
   },
   "devDependencies": {
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/self": "npm:@modern-js/module-tools@0.0.0-nightly-20231211170643",
-    "@modern-js/builder-webpack-provider": "0.0.0-nightly-20231211170643",
-    "@scripts/build": "0.0.0-nightly-20231211170643",
-    "@scripts/vitest-config": "0.0.0-nightly-20231211170643"
+    "@modern-js/builder-webpack-provider": "0.0.0-nightly-20231212170634",
+    "@scripts/build": "0.0.0-nightly-20231212170634",
+    "@modern-js/self": "npm:@modern-js/module-tools@0.0.0-nightly-20231212170634",
+    "@scripts/vitest-config": "0.0.0-nightly-20231212170634"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"