@modern-js/module-tools 2.2.0 → 2.2.1-beta.0

package/dist/builder/build.d.ts

@@ -14,7 +14,7 @@ export declare const buildInJsProject: (options: {
   buildCmdOptions: BuildCommandOptions;
   context: ModuleContext;
 }, api: PluginAPI<ModuleTools>) => Promise<void>;
-export declare const generatorDts: (config: BaseBuildConfig, api: PluginAPI, options: {
+export declare const generatorDts: (config: BaseBuildConfig, api: PluginAPI<ModuleTools>, options: {
   watch: boolean;
   dts: DTSOptions;
 }) => Promise<void>;

package/dist/builder/build.js

@@ -114,7 +114,7 @@ const generatorDts = (config, api, options) => __async(void 0, null, function* (
   if (buildType === "bundle") {
     const { getFinalExternals } = yield Promise.resolve().then(() => __toESM(require("../utils/builder")));
     const finalExternals = yield getFinalExternals(config, { appDirectory });
-    yield runRollup({
+    yield runRollup(api, {
       distDir: distPath,
       watch,
       externals: finalExternals,
@@ -122,7 +122,7 @@ const generatorDts = (config, api, options) => __async(void 0, null, function* (
       tsconfigPath
     });
   } else {
-    yield runTsc({
+    yield runTsc(api, {
       appDirectory,
       alias,
       distAbsPath: distPath,
@@ -190,7 +190,7 @@ const buildLib = (config, api, options) => __async(void 0, null, function* () {
     plugins.push(svgrPlugin(options2));
   }
   const { watchPlugin, externalPlugin } = yield Promise.resolve().then(() => __toESM(require("../utils/libuild-plugins")));
-  plugins.push(watchPlugin(config));
+  plugins.push(watchPlugin(api, config));
   plugins.push(externalPlugin(config, { appDirectory }));
   const buildConfig = {
     root,

package/dist/builder/build.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAqB;AAWd,MAAM,eAAe,CAC1B,SAKA,QACG;AACH,QAAM,EAAE,aAAa,QAAQ,IAAI;AACjC,QAAM,EAAE,cAAc,YAAY,IAAI;AAEtC,MAAI,aAAa;AACf,UAAM,iBAAiB,SAAS,GAAG;AAAA,EACrC,OAAO;AACL,UAAM,iBAAiB,SAAS,GAAG;AAAA,EACrC;AAEA,QAAM,EAAE,SAAS,IAAI,MAAM,6CAAO;AAClC,QAAM,SAAS,aAAa,EAAE,aAAa,CAAC;AAC9C;AAEO,MAAM,mBAAmB,CAC9B,SAKA,QACG;AAvCL;AAwCE,QAAM,EAAE,aAAa,gBAAgB,IAAI;AACzC,QAAM,MAAM,gBAAgB,MAAM,YAAY,MAAM;AACpD,QAAM,eAAe,YAAY,MAAM,YAAY,IAAI,OAAO;AAC9D,QAAM,SAAQ,qBAAgB,UAAhB,YAAyB;AAEvC,MAAI,QAAQ,OAAO;AAEjB,KAAC,iBAAiB,MAAM,SAAS,aAAa,KAAK,EAAE,MAAM,CAAC;AAAA,EAC9D,OAAO;AACL,UAAM,QAAQ,IAAI,OAAO,CAAC,YAAY,IAAI,CAAC,UAAU,YAAY;AACjE,UAAM,EAAE,SAAS,KAAK,IAAI,MAAM,6CAAO;AACvC,UAAM,KAAK,OAAO,CAAM,SAAQ;AAC9B,YAAM,KAAK,aAAa,KAAY,EAAE,OAAO,IAAI,CAAC;AAAA,IACpD,EAAC;AAAA,EACH;AACF;AAEO,MAAM,mBAAmB,CAC9B,SAKA,QACG;AAhEL;AAiEE,QAAM,EAAE,aAAa,gBAAgB,IAAI;AACzC,QAAM,MAAM,gBAAgB,MAAM,YAAY,MAAM;AACpD,QAAM,SAAQ,qBAAgB,UAAhB,YAAyB;AAEvC,MAAI,QAAQ,SAAS,IAAI,MAAM;AAC7B;AAAA,EACF;AAEA,QAAM,SAAS,aAAa,KAAK,EAAE,MAAM,CAAC;AAC5C;AAEO,MAAM,eAAe,CAC1B,QACA,KACA,YAIG;AACH,QAAM,EAAE,WAAW,OAAO,IAAI,MAAM,6CAAO;AAC3C,QAAM,EAAE,OAAO,IAAI,IAAI;AACvB,QAAM,EAAE,WAAW,OAAO,WAAW,MAAM,IAAI;AAC/C,QAAM,EAAE,aAAa,IAAI,IAAI,cAAc;AAC3C,QAAM,EAAE,cAAc,SAAS,IAAI;AACnC,MAAI,cAAc,UAAU;AAC1B,UAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,UAAM,iBAAiB,MAAM,kBAAkB,QAAQ,EAAE,aAAa,CAAC;AAEvE,UAAM,UAAU;AAAA,MACd,SAAS;AAAA,MACT;AAAA,MACA,WAAW;AAAA,MACX;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,UAAM,OAAO;AAAA,MACX;AAAA,MACA;AAAA,MACA,aAAa;AAAA,MACb;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AACF;AAEO,MAAM,WAAW,CACtB,QACA,KACA,YAGG;AAtHL;AAuHE,QAAM,EAAE,MAAM,IAAI;AAClB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,QAAQ;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AACJ,QAAM,EAAE,aAAa,IAAI,IAAI,cAAc;AAC3C,QAAM,EAAE,MAAM,IAAI,MAAM,6CAAO;AAC/B,QAAM,OAAO,MAAM,YAAY;AAC/B,QAAM,SAAS,MAAM,QAAQ;AAC7B,QAAM,cAAc,MAAM,OAAO,MAAM,MAAM,IAAI,IAAI,MAAM;AAC3D,QAAM,EAAE,MAAM,MAAM,SAAS,QAAQ,SAAS,YAAY,IAAI;AAG9D,QAAM,EAAE,WAAW,WAAW,gBAAgB,IAAI,MAAM,6CACtD;AAEF,QAAM,UAAU,WAAW,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;AACpD,MAAI,WAAW,OAAO;AACpB,YAAQ,KAAK,UAAU,aAAa,CAAC;AAAA,EACvC;AACA,QAAM,EAAE,mBAAmB,IAAI,MAAM,6CAAO;AAC5C,QAAM,eAAe,MACjB,IAAI,mBACJ,kBAAK,cAAc,iBAAiB;AACxC,QAAM,eAAe,MAAM,mBAAmB,YAAY;AAC1D,OAAI,kDAAc,oBAAd,mBAA+B,uBAAuB;AACxD,YAAQ;AAAA,MACN,gBAAgB;AAAA,QACd,KAAK;AAAA,UACH,WAAW;AAAA,YACT,iBAAiB;AAAA,YACjB,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACF;AAGA,MAAI,MAAM,MAAM;AACd,UAAM,EAAE,WAAW,IAAI,MAAM,6CAAO;AACpC,UAAMA,WAAU,OAAO,MAAM,SAAS,YAAY,CAAC,IAAI,MAAM;AAC7D,YAAQ,KAAK,WAAWA,QAAO,CAAC;AAAA,EAClC;AAGA,QAAM,EAAE,aAAa,eAAe,IAAI,MAAM,6CAC5C;AAEF,UAAQ,KAAK,YAAY,MAAM,CAAC;AAChC,UAAQ,KAAK,eAAe,QAAQ,EAAE,aAAa,CAAC,CAAC;AAErD,QAAM,cAAyB;AAAA,IAC7B;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,SAAS;AAAA,MACP;AAAA,IACF;AAAA,IACA,OAAO,iCACF,QADE;AAAA,MAEL,QAAQ;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,UAAU,YAAY,cAAc;AAAA,IACpC,SAAS;AAAA,IACT,UAAU;AAAA,IACV;AAAA,IACA,QAAQ,cAAc;AAAA,IAEtB,SAAS;AAAA,IACT,UAAU;AAAA,IACV,gBAAgB,CAACA,aAAkB,iCAC9BA,WAD8B;AAAA,MAEjC,WAAW;AAAA,QACT,kBAAkB,EAChB,CAAC,OAAO,KAAK,EAAE,SAAS,MAAM,KAAK,cAAc;AAAA,MAErD;AAAA,IACF;AAAA,EACF;AAEA,MAAI;AACF,UAAM,EAAE,UAAU,IAAI,MAAM,6CAAO;AAEnC,UAAM,SAAS,IAAI,eAAe;AAClC,UAAM,sBAAsB,MAAM,OAAO,cAAc,aAAa;AAAA,MAClE,QAAQ,OAAK;AAAA,IACf,CAAC;AAED,UAAM,UAAU,MAAM,UAAU,OAAO,mBAAmB;AAC1D,UAAM,QAAQ,MAAM;AAEpB,QAAI,OAAO;AACT,YAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,YAAM,EAAE,mBAAmB,IAAI,MAAM,6CAAO;AAC5C,YAAM,YAAY,IAChB,cAAc,WAAW,WAAW,iBACjC,UAAU;AAEf,cAAQ;AAAA,QACN,MAAM,kBAAkB,WAAW,mBAAmB,OAAO;AAAA,MAC/D;AAAA,IACF;AAAA,EACF,SAAS,GAAP;AACA,UAAM,EAAE,mBAAmB,IAAI,MAAM,6CAAO;AAC5C,UAAM,IAAI,mBAAmB,GAAG;AAAA,MAC9B;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AACF;;;;;;;;;","names":["options"],"sources":["../../src/builder/build.ts"],"sourcesContent":["import { join } from 'path';\nimport type { CLIConfig } from '@modern-js/libuild';\nimport type {\n  BuildCommandOptions,\n  BaseBuildConfig,\n  ModuleTools,\n  PluginAPI,\n  DTSOptions,\n  ModuleContext,\n} from '../types';\n\nexport const runBuildTask = async (\n  options: {\n    buildConfig: BaseBuildConfig;\n    buildCmdOptions: BuildCommandOptions;\n    context: ModuleContext;\n  },\n  api: PluginAPI<ModuleTools>,\n) => {\n  const { buildConfig, context } = options;\n  const { appDirectory, isTsProject } = context;\n\n  if (isTsProject) {\n    await buildInTsProject(options, api);\n  } else {\n    await buildInJsProject(options, api);\n  }\n\n  const { copyTask } = await import('./copy');\n  await copyTask(buildConfig, { appDirectory });\n};\n\nexport const buildInTsProject = async (\n  options: {\n    buildConfig: BaseBuildConfig;\n    buildCmdOptions: BuildCommandOptions;\n    context: ModuleContext;\n  },\n  api: PluginAPI<ModuleTools>,\n) => {\n  const { buildConfig, buildCmdOptions } = options;\n  const dts = buildCmdOptions.dts ? buildConfig.dts : false;\n  const skipBuildLib = buildConfig.dts ? buildConfig.dts.only : false;\n  const watch = buildCmdOptions.watch ?? false;\n\n  if (dts === false) {\n    // --no-dts and buildConfig is `{ dts: { only: true } }`, then skip.\n    !skipBuildLib && (await buildLib(buildConfig, api, { watch }));\n  } else {\n    const tasks = dts.only ? [generatorDts] : [buildLib, generatorDts];\n    const { default: pMap } = await import('../../compiled/p-map');\n    await pMap(tasks, async task => {\n      await task(buildConfig, api as any, { watch, dts });\n    });\n  }\n};\n\nexport const buildInJsProject = async (\n  options: {\n    buildConfig: BaseBuildConfig;\n    buildCmdOptions: BuildCommandOptions;\n    context: ModuleContext;\n  },\n  api: PluginAPI<ModuleTools>,\n) => {\n  const { buildConfig, buildCmdOptions } = options;\n  const dts = buildCmdOptions.dts ? buildConfig.dts : false;\n  const watch = buildCmdOptions.watch ?? false;\n\n  if (dts !== false && dts.only) {\n    return;\n  }\n\n  await buildLib(buildConfig, api, { watch });\n};\n\nexport const generatorDts = async (\n  config: BaseBuildConfig,\n  api: PluginAPI,\n  options: {\n    watch: boolean;\n    dts: DTSOptions;\n  },\n) => {\n  const { runRollup, runTsc } = await import('./dts');\n  const { watch, dts } = options;\n  const { buildType, input, sourceDir, alias } = config;\n  const { appDirectory } = api.useAppContext();\n  const { tsconfigPath, distPath } = dts;\n  if (buildType === 'bundle') {\n    const { getFinalExternals } = await import('../utils/builder');\n    const finalExternals = await getFinalExternals(config, { appDirectory });\n\n    await runRollup({\n      distDir: distPath,\n      watch,\n      externals: finalExternals,\n      input,\n      tsconfigPath,\n    });\n  } else {\n    await runTsc({\n      appDirectory,\n      alias,\n      distAbsPath: distPath,\n      watch,\n      tsconfigPath,\n      sourceDir,\n    });\n  }\n};\n\nexport const buildLib = async (\n  config: BaseBuildConfig,\n  api: PluginAPI<ModuleTools>,\n  options: {\n    watch: boolean;\n  },\n) => {\n  const { watch } = options;\n  const {\n    target,\n    buildType,\n    sourceMap,\n    format,\n    outDir: distPath,\n    asset,\n    jsx,\n    input,\n    platform,\n    splitting,\n    minify,\n    sourceDir,\n    umdGlobals,\n    umdModuleName,\n    define,\n    alias,\n    style,\n    externals,\n    autoExternal,\n    dts,\n    metafile,\n  } = config;\n  const { appDirectory } = api.useAppContext();\n  const { slash } = await import('@modern-js/utils');\n  const root = slash(appDirectory);\n  const outdir = slash(distPath);\n  const assetOutDir = asset.path ? slash(asset.path) : asset.path;\n  const { less, sass, postcss, inject, modules, autoModules } = style;\n\n  // support es5,umd and emitDecoratorMetadata by swc\n  const { es5Plugin, umdPlugin, transformPlugin } = await import(\n    '@modern-js/libuild-plugin-swc'\n  );\n  const plugins = target === 'es5' ? [es5Plugin()] : [];\n  if (format === 'umd') {\n    plugins.push(umdPlugin(umdModuleName));\n  }\n  const { getProjectTsconfig } = await import('./dts/tsc');\n  const tsconfigPath = dts\n    ? dts.tsconfigPath\n    : join(appDirectory, './tsconfig.json');\n  const userTsconfig = await getProjectTsconfig(tsconfigPath);\n  if (userTsconfig?.compilerOptions?.emitDecoratorMetadata) {\n    plugins.push(\n      transformPlugin({\n        jsc: {\n          transform: {\n            legacyDecorator: true,\n            decoratorMetadata: true,\n          },\n        },\n      }),\n    );\n  }\n\n  // support svgr\n  if (asset.svgr) {\n    const { svgrPlugin } = await import('@modern-js/libuild-plugin-svgr');\n    const options = typeof asset.svgr === 'boolean' ? {} : asset.svgr;\n    plugins.push(svgrPlugin(options));\n  }\n\n  // adapt module tools\n  const { watchPlugin, externalPlugin } = await import(\n    '../utils/libuild-plugins'\n  );\n  plugins.push(watchPlugin(config));\n  plugins.push(externalPlugin(config, { appDirectory }));\n\n  const buildConfig: CLIConfig = {\n    root,\n    watch,\n    target,\n    sourceMap,\n    format,\n    outdir,\n    define,\n    style: {\n      less,\n      sass,\n      postcss,\n      inject,\n      modules,\n      autoModules,\n    },\n    resolve: {\n      alias,\n    },\n    asset: {\n      ...asset,\n      outdir: assetOutDir,\n    },\n    plugins,\n    jsx,\n    input,\n    platform,\n    splitting,\n    minify,\n    sourceDir,\n    metafile: metafile && buildType === 'bundle',\n    globals: umdGlobals,\n    external: externals,\n    autoExternal,\n    bundle: buildType === 'bundle',\n    // outbase for [dir]/[name]\n    outbase: sourceDir,\n    logLevel: 'error',\n    esbuildOptions: (options: any) => ({\n      ...options,\n      supported: {\n        'dynamic-import': !(\n          ['cjs', 'umd'].includes(format) && buildType === 'bundleless'\n        ),\n      },\n    }),\n  };\n\n  try {\n    const { Libuilder } = await import('@modern-js/libuild');\n\n    const runner = api.useHookRunners();\n    const modifiedBuildConfig = await runner.modifyLibuild(buildConfig, {\n      onLast: c => c,\n    });\n\n    const builder = await Libuilder.create(modifiedBuildConfig);\n    await builder.build();\n\n    if (watch) {\n      const { watchSectionTitle } = await import('../utils/log');\n      const { SectionTitleStatus } = await import('../constants/log');\n      const titleText = `[${\n        buildType === 'bundle' ? 'Bundle' : 'Bundleless'\n      }: ${format}_${target}]`;\n\n      console.info(\n        await watchSectionTitle(titleText, SectionTitleStatus.Success),\n      );\n    }\n  } catch (e: any) {\n    const { InternalBuildError } = await import('../error');\n    throw new InternalBuildError(e, {\n      target,\n      format,\n      buildType,\n    });\n  }\n};\n"]}
+{"version":3,"file":null,"mappings":"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","names":["options"],"sources":["../../src/builder/build.ts"],"sourcesContent":["import { join } from 'path';\nimport type { CLIConfig } from '@modern-js/libuild';\nimport type {\n  BuildCommandOptions,\n  BaseBuildConfig,\n  ModuleTools,\n  PluginAPI,\n  DTSOptions,\n  ModuleContext,\n} from '../types';\n\nexport const runBuildTask = async (\n  options: {\n    buildConfig: BaseBuildConfig;\n    buildCmdOptions: BuildCommandOptions;\n    context: ModuleContext;\n  },\n  api: PluginAPI<ModuleTools>,\n) => {\n  const { buildConfig, context } = options;\n  const { appDirectory, isTsProject } = context;\n\n  if (isTsProject) {\n    await buildInTsProject(options, api);\n  } else {\n    await buildInJsProject(options, api);\n  }\n\n  const { copyTask } = await import('./copy');\n  await copyTask(buildConfig, { appDirectory });\n};\n\nexport const buildInTsProject = async (\n  options: {\n    buildConfig: BaseBuildConfig;\n    buildCmdOptions: BuildCommandOptions;\n    context: ModuleContext;\n  },\n  api: PluginAPI<ModuleTools>,\n) => {\n  const { buildConfig, buildCmdOptions } = options;\n  const dts = buildCmdOptions.dts ? buildConfig.dts : false;\n  const skipBuildLib = buildConfig.dts ? buildConfig.dts.only : false;\n  const watch = buildCmdOptions.watch ?? false;\n\n  if (dts === false) {\n    // --no-dts and buildConfig is `{ dts: { only: true } }`, then skip.\n    !skipBuildLib && (await buildLib(buildConfig, api, { watch }));\n  } else {\n    const tasks = dts.only ? [generatorDts] : [buildLib, generatorDts];\n    const { default: pMap } = await import('../../compiled/p-map');\n    await pMap(tasks, async task => {\n      await task(buildConfig, api as any, { watch, dts });\n    });\n  }\n};\n\nexport const buildInJsProject = async (\n  options: {\n    buildConfig: BaseBuildConfig;\n    buildCmdOptions: BuildCommandOptions;\n    context: ModuleContext;\n  },\n  api: PluginAPI<ModuleTools>,\n) => {\n  const { buildConfig, buildCmdOptions } = options;\n  const dts = buildCmdOptions.dts ? buildConfig.dts : false;\n  const watch = buildCmdOptions.watch ?? false;\n\n  if (dts !== false && dts.only) {\n    return;\n  }\n\n  await buildLib(buildConfig, api, { watch });\n};\n\nexport const generatorDts = async (\n  config: BaseBuildConfig,\n  api: PluginAPI<ModuleTools>,\n  options: {\n    watch: boolean;\n    dts: DTSOptions;\n  },\n) => {\n  const { runRollup, runTsc } = await import('./dts');\n  const { watch, dts } = options;\n  const { buildType, input, sourceDir, alias } = config;\n  const { appDirectory } = api.useAppContext();\n  const { tsconfigPath, distPath } = dts;\n  if (buildType === 'bundle') {\n    const { getFinalExternals } = await import('../utils/builder');\n    const finalExternals = await getFinalExternals(config, { appDirectory });\n\n    await runRollup(api, {\n      distDir: distPath,\n      watch,\n      externals: finalExternals,\n      input,\n      tsconfigPath,\n    });\n  } else {\n    await runTsc(api, {\n      appDirectory,\n      alias,\n      distAbsPath: distPath,\n      watch,\n      tsconfigPath,\n      sourceDir,\n    });\n  }\n};\n\nexport const buildLib = async (\n  config: BaseBuildConfig,\n  api: PluginAPI<ModuleTools>,\n  options: {\n    watch: boolean;\n  },\n) => {\n  const { watch } = options;\n  const {\n    target,\n    buildType,\n    sourceMap,\n    format,\n    outDir: distPath,\n    asset,\n    jsx,\n    input,\n    platform,\n    splitting,\n    minify,\n    sourceDir,\n    umdGlobals,\n    umdModuleName,\n    define,\n    alias,\n    style,\n    externals,\n    autoExternal,\n    dts,\n    metafile,\n  } = config;\n  const { appDirectory } = api.useAppContext();\n  const { slash } = await import('@modern-js/utils');\n  const root = slash(appDirectory);\n  const outdir = slash(distPath);\n  const assetOutDir = asset.path ? slash(asset.path) : asset.path;\n  const { less, sass, postcss, inject, modules, autoModules } = style;\n\n  // support es5,umd and emitDecoratorMetadata by swc\n  const { es5Plugin, umdPlugin, transformPlugin } = await import(\n    '@modern-js/libuild-plugin-swc'\n  );\n  const plugins = target === 'es5' ? [es5Plugin()] : [];\n  if (format === 'umd') {\n    plugins.push(umdPlugin(umdModuleName));\n  }\n  const { getProjectTsconfig } = await import('./dts/tsc');\n  const tsconfigPath = dts\n    ? dts.tsconfigPath\n    : join(appDirectory, './tsconfig.json');\n  const userTsconfig = await getProjectTsconfig(tsconfigPath);\n  if (userTsconfig?.compilerOptions?.emitDecoratorMetadata) {\n    plugins.push(\n      transformPlugin({\n        jsc: {\n          transform: {\n            legacyDecorator: true,\n            decoratorMetadata: true,\n          },\n        },\n      }),\n    );\n  }\n\n  // support svgr\n  if (asset.svgr) {\n    const { svgrPlugin } = await import('@modern-js/libuild-plugin-svgr');\n    const options = typeof asset.svgr === 'boolean' ? {} : asset.svgr;\n    plugins.push(svgrPlugin(options));\n  }\n\n  // adapt module tools\n  const { watchPlugin, externalPlugin } = await import(\n    '../utils/libuild-plugins'\n  );\n  plugins.push(watchPlugin(api, config));\n  plugins.push(externalPlugin(config, { appDirectory }));\n\n  const buildConfig: CLIConfig = {\n    root,\n    watch,\n    target,\n    sourceMap,\n    format,\n    outdir,\n    define,\n    style: {\n      less,\n      sass,\n      postcss,\n      inject,\n      modules,\n      autoModules,\n    },\n    resolve: {\n      alias,\n    },\n    asset: {\n      ...asset,\n      outdir: assetOutDir,\n    },\n    plugins,\n    jsx,\n    input,\n    platform,\n    splitting,\n    minify,\n    sourceDir,\n    metafile: metafile && buildType === 'bundle',\n    globals: umdGlobals,\n    external: externals,\n    autoExternal,\n    bundle: buildType === 'bundle',\n    // outbase for [dir]/[name]\n    outbase: sourceDir,\n    logLevel: 'error',\n    esbuildOptions: (options: any) => ({\n      ...options,\n      supported: {\n        'dynamic-import': !(\n          ['cjs', 'umd'].includes(format) && buildType === 'bundleless'\n        ),\n      },\n    }),\n  };\n\n  try {\n    const { Libuilder } = await import('@modern-js/libuild');\n\n    const runner = api.useHookRunners();\n    const modifiedBuildConfig = await runner.modifyLibuild(buildConfig, {\n      onLast: c => c,\n    });\n\n    const builder = await Libuilder.create(modifiedBuildConfig);\n    await builder.build();\n\n    if (watch) {\n      const { watchSectionTitle } = await import('../utils/log');\n      const { SectionTitleStatus } = await import('../constants/log');\n      const titleText = `[${\n        buildType === 'bundle' ? 'Bundle' : 'Bundleless'\n      }: ${format}_${target}]`;\n\n      console.info(\n        await watchSectionTitle(titleText, SectionTitleStatus.Success),\n      );\n    }\n  } catch (e: any) {\n    const { InternalBuildError } = await import('../error');\n    throw new InternalBuildError(e, {\n      target,\n      format,\n      buildType,\n    });\n  }\n};\n"]}

package/dist/builder/dts/rollup.d.ts

@@ -1,5 +1,5 @@
 import type { RollupWatcher } from '../../../compiled/rollup';
-import type { BaseBuildConfig, Input } from '../../types';
+import type { BaseBuildConfig, Input, PluginAPI, ModuleTools } from '../../types';
 export type { RollupWatcher };
 type Config = {
   distDir: string;
@@ -8,7 +8,7 @@ type Config = {
   input: Input;
   watch: boolean;
 };
-export declare const runRollup: ({
+export declare const runRollup: (api: PluginAPI<ModuleTools>, {
   distDir,
   tsconfigPath,
   externals,

package/dist/builder/dts/rollup.js

@@ -64,13 +64,7 @@ __export(rollup_exports, {
 });
 module.exports = __toCommonJS(rollup_exports);
 var import_path = __toESM(require("path"));
-const runRollup = (_0) => __async(void 0, [_0], function* ({
-  distDir,
-  tsconfigPath,
-  externals,
-  input,
-  watch
-}) {
+const runRollup = (_0, _1) => __async(void 0, [_0, _1], function* (api, { distDir, tsconfigPath, externals, input, watch }) {
   const ignoreFiles = {
     name: "ignore-files",
     load(id) {
@@ -123,6 +117,7 @@ const runRollup = (_0) => __async(void 0, [_0], function* ({
     const { watch: watch2 } = yield Promise.resolve().then(() => __toESM(require("../../../compiled/rollup")));
     const { watchSectionTitle } = yield Promise.resolve().then(() => __toESM(require("../../utils/log")));
     const { SectionTitleStatus, BundleDtsLogPrefix } = yield Promise.resolve().then(() => __toESM(require("../../constants/log")));
+    const runner = api.useHookRunners();
     const watcher = watch2(__spreadProps(__spreadValues({}, inputConfig), {
       plugins: inputConfig.plugins,
       output: outputConfig
@@ -138,6 +133,7 @@ const runRollup = (_0) => __async(void 0, [_0], function* ({
             SectionTitleStatus.Success
           )
         );
+        runner.buildWatchDts({ buildType: "bundle" });
       } else if (event.code === "ERROR") {
       }
     }));

package/dist/builder/dts/rollup.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAmBV,MAAM,YAAY,CAAO,OAMlB,iBANkB,KAMlB,WANkB;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAc;AACZ,QAAM,cAAsB;AAAA,IAC1B,MAAM;AAAA,IACN,KAAK,IAAI;AACP,UAAI,CAAC,0BAA0B,KAAK,EAAE,GAAG;AACvC,eAAO;AAAA,MACT;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAM,KAAK,MAAM,6CAAO;AACxB,QAAM,aAAa,GAAG,eAAe,cAAc,GAAG,IAAI,QAAQ;AAClE,QAAM,EAAE,QAAQ,IAAI,GAAG;AAAA,IACrB,WAAW;AAAA,IACX,GAAG;AAAA,IACH;AAAA,EACF;AAEA,QAAM,EAAE,SAAS,WAAW,IAAI,MAAM,6CACpC;AAEF,QAAM,EAAE,SAAS,UAAU,IAAI,MAAM,6CACnC;AAEF,QAAM,UAAU,oBAAK,WAAW,QAAQ,WAAW,GAAG,IAClD,QAAQ,UACR,oBAAK,KAAK,oBAAK,QAAQ,YAAY,GAAG,QAAQ,WAAW,GAAG;AAChE,QAAM,cAA4B;AAAA,IAChC;AAAA,IACA,UAAU;AAAA,IACV,SAAS;AAAA,MACP,WAAW;AAAA,MACX;AAAA,MACA,UAAU;AAAA,QAER,iBAAiB;AAAA,QACjB,iBAAiB;AAAA,UACf,gBAAgB;AAAA,UAChB,cAAc;AAAA,UACd,kBAAkB;AAAA,WACf,UAJY;AAAA,UAMf;AAAA,UAEA,aAAa;AAAA,UAEb,QAAQ;AAAA,UACR,qBAAqB;AAAA,UAErB,eAAe;AAAA,UAEf,SAAS;AAAA,UAET,QAAQ,GAAG,aAAa;AAAA,QAC1B;AAAA,MACF,CAAC;AAAA,IACH,EAAE,OAAO,OAAO;AAAA,EAClB;AACA,QAAM,eAA8B;AAAA,IAClC,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,SAAS;AAAA,EACX;AACA,MAAI,OAAO;AACT,UAAM,EAAE,cAAM,IAAI,MAAM,6CAAO;AAC/B,UAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,UAAM,EAAE,oBAAoB,mBAAmB,IAAI,MAAM,6CACvD;AAEF,UAAM,UAAUA,OAAM,iCACjB,cADiB;AAAA,MAEpB,SAAS,YAAY;AAAA,MACrB,QAAQ;AAAA,IACV,EAAC,EAAE,GAAG,SAAS,CAAM,UAAS;AAC5B,UAAI,MAAM,SAAS,SAAS;AAC1B,gBAAQ;AAAA,UACN,MAAM,kBAAkB,oBAAoB,mBAAmB,GAAG;AAAA,QACpE;AAAA,MACF,WAAW,MAAM,SAAS,cAAc;AACtC,gBAAQ;AAAA,UACN,MAAM;AAAA,YACJ;AAAA,YACA,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF,WAAW,MAAM,SAAS,SAAS;AAAA,MAEnC;AAAA,IACF,EAAC;AACD,WAAO;AAAA,EACT,OAAO;AACL,QAAI;AACF,YAAM,EAAE,OAAO,IAAI,MAAM,6CAAO;AAChC,YAAM,SAAS,MAAM,OAAO,WAAW;AACvC,YAAM,OAAO,MAAM,YAAY;AAC/B,aAAO;AAAA,IACT,SAAS,GAAP;AACA,UAAI,aAAa,OAAO;AACtB,cAAM,EAAE,iBAAiB,IAAI,MAAM,6CAAO;AAC1C,cAAM,IAAI,iBAAiB,GAAG;AAAA,UAC5B,WAAW;AAAA,QACb,CAAC;AAAA,MACH;AACA,YAAM;AAAA,IACR;AAAA,EACF;AACF;;;;;","names":["watch"],"sources":["../../../src/builder/dts/rollup.ts"],"sourcesContent":["import path from 'path';\nimport type {\n  InputOptions,\n  OutputOptions,\n  Plugin,\n  RollupWatcher,\n} from '../../../compiled/rollup';\nimport type { BaseBuildConfig, Input } from '../../types';\n\nexport type { RollupWatcher };\n\ntype Config = {\n  distDir: string;\n  tsconfigPath: string;\n  externals: BaseBuildConfig['externals'];\n  input: Input;\n  watch: boolean;\n};\n\nexport const runRollup = async ({\n  distDir,\n  tsconfigPath,\n  externals,\n  input,\n  watch,\n}: Config) => {\n  const ignoreFiles: Plugin = {\n    name: 'ignore-files',\n    load(id) {\n      if (!/\\.(js|jsx|ts|tsx|json)$/.test(id)) {\n        return '';\n      }\n      return null;\n    },\n  };\n  const ts = await import('typescript');\n  const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);\n  const { options } = ts.parseJsonConfigFileContent(\n    configFile.config,\n    ts.sys,\n    './',\n  );\n\n  const { default: jsonPlugin } = await import(\n    '../../../compiled/@rollup/plugin-json'\n  );\n  const { default: dtsPlugin } = await import(\n    '../../../compiled/rollup-plugin-dts'\n  );\n  const baseUrl = path.isAbsolute(options.baseUrl || '.')\n    ? options.baseUrl\n    : path.join(path.dirname(tsconfigPath), options.baseUrl || '.');\n  const inputConfig: InputOptions = {\n    input,\n    external: externals,\n    plugins: [\n      jsonPlugin(),\n      ignoreFiles,\n      dtsPlugin({\n        // use external to prevent them which come from node_modules from be bundled.\n        respectExternal: true,\n        compilerOptions: {\n          declarationMap: false,\n          skipLibCheck: true,\n          preserveSymlinks: false,\n          ...options,\n          // isAbsolute\n          baseUrl,\n          // Ensure \".d.ts\" modules are generated\n          declaration: true,\n          // Skip \".js\" generation\n          noEmit: false,\n          emitDeclarationOnly: true,\n          // Skip code generation when error occurs\n          noEmitOnError: true,\n          // Avoid extra work\n          checkJs: false,\n          // Ensure we can parse the latest code\n          target: ts.ScriptTarget.ESNext,\n        },\n      }),\n    ].filter(Boolean),\n  };\n  const outputConfig: OutputOptions = {\n    dir: distDir,\n    format: 'esm',\n    exports: 'named',\n  };\n  if (watch) {\n    const { watch } = await import('../../../compiled/rollup');\n    const { watchSectionTitle } = await import('../../utils/log');\n    const { SectionTitleStatus, BundleDtsLogPrefix } = await import(\n      '../../constants/log'\n    );\n    const watcher = watch({\n      ...inputConfig,\n      plugins: inputConfig.plugins,\n      output: outputConfig,\n    }).on('event', async event => {\n      if (event.code === 'START') {\n        console.info(\n          await watchSectionTitle(BundleDtsLogPrefix, SectionTitleStatus.Log),\n        );\n      } else if (event.code === 'BUNDLE_END') {\n        console.info(\n          await watchSectionTitle(\n            BundleDtsLogPrefix,\n            SectionTitleStatus.Success,\n          ),\n        );\n      } else if (event.code === 'ERROR') {\n        // this is dts rollup plugin bug, error not complete message\n      }\n    });\n    return watcher;\n  } else {\n    try {\n      const { rollup } = await import('../../../compiled/rollup');\n      const bundle = await rollup(inputConfig);\n      await bundle.write(outputConfig);\n      return bundle;\n    } catch (e) {\n      if (e instanceof Error) {\n        const { InternalDTSError } = await import('../../error');\n        throw new InternalDTSError(e, {\n          buildType: 'bundle',\n        });\n      }\n      throw e;\n    }\n  }\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAwBV,MAAM,YAAY,CACvB,IACA,OACG,iBAFH,IACA,KACG,WAFH,KACA,EAAE,SAAS,cAAc,WAAW,OAAO,MAAM,GAC9C;AACH,QAAM,cAAsB;AAAA,IAC1B,MAAM;AAAA,IACN,KAAK,IAAI;AACP,UAAI,CAAC,0BAA0B,KAAK,EAAE,GAAG;AACvC,eAAO;AAAA,MACT;AACA,aAAO;AAAA,IACT;AAAA,EACF;AACA,QAAM,KAAK,MAAM,6CAAO;AACxB,QAAM,aAAa,GAAG,eAAe,cAAc,GAAG,IAAI,QAAQ;AAClE,QAAM,EAAE,QAAQ,IAAI,GAAG;AAAA,IACrB,WAAW;AAAA,IACX,GAAG;AAAA,IACH;AAAA,EACF;AAEA,QAAM,EAAE,SAAS,WAAW,IAAI,MAAM,6CACpC;AAEF,QAAM,EAAE,SAAS,UAAU,IAAI,MAAM,6CACnC;AAEF,QAAM,UAAU,oBAAK,WAAW,QAAQ,WAAW,GAAG,IAClD,QAAQ,UACR,oBAAK,KAAK,oBAAK,QAAQ,YAAY,GAAG,QAAQ,WAAW,GAAG;AAChE,QAAM,cAA4B;AAAA,IAChC;AAAA,IACA,UAAU;AAAA,IACV,SAAS;AAAA,MACP,WAAW;AAAA,MACX;AAAA,MACA,UAAU;AAAA,QAER,iBAAiB;AAAA,QACjB,iBAAiB;AAAA,UACf,gBAAgB;AAAA,UAChB,cAAc;AAAA,UACd,kBAAkB;AAAA,WACf,UAJY;AAAA,UAMf;AAAA,UAEA,aAAa;AAAA,UAEb,QAAQ;AAAA,UACR,qBAAqB;AAAA,UAErB,eAAe;AAAA,UAEf,SAAS;AAAA,UAET,QAAQ,GAAG,aAAa;AAAA,QAC1B;AAAA,MACF,CAAC;AAAA,IACH,EAAE,OAAO,OAAO;AAAA,EAClB;AACA,QAAM,eAA8B;AAAA,IAClC,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,SAAS;AAAA,EACX;AACA,MAAI,OAAO;AACT,UAAM,EAAE,cAAM,IAAI,MAAM,6CAAO;AAC/B,UAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,UAAM,EAAE,oBAAoB,mBAAmB,IAAI,MAAM,6CACvD;AAEF,UAAM,SAAS,IAAI,eAAe;AAClC,UAAM,UAAUA,OAAM,iCACjB,cADiB;AAAA,MAEpB,SAAS,YAAY;AAAA,MACrB,QAAQ;AAAA,IACV,EAAC,EAAE,GAAG,SAAS,CAAM,UAAS;AAC5B,UAAI,MAAM,SAAS,SAAS;AAC1B,gBAAQ;AAAA,UACN,MAAM,kBAAkB,oBAAoB,mBAAmB,GAAG;AAAA,QACpE;AAAA,MACF,WAAW,MAAM,SAAS,cAAc;AACtC,gBAAQ;AAAA,UACN,MAAM;AAAA,YACJ;AAAA,YACA,mBAAmB;AAAA,UACrB;AAAA,QACF;AACA,eAAO,cAAc,EAAE,WAAW,SAAS,CAAC;AAAA,MAC9C,WAAW,MAAM,SAAS,SAAS;AAAA,MAEnC;AAAA,IACF,EAAC;AACD,WAAO;AAAA,EACT,OAAO;AACL,QAAI;AACF,YAAM,EAAE,OAAO,IAAI,MAAM,6CAAO;AAChC,YAAM,SAAS,MAAM,OAAO,WAAW;AACvC,YAAM,OAAO,MAAM,YAAY;AAC/B,aAAO;AAAA,IACT,SAAS,GAAP;AACA,UAAI,aAAa,OAAO;AACtB,cAAM,EAAE,iBAAiB,IAAI,MAAM,6CAAO;AAC1C,cAAM,IAAI,iBAAiB,GAAG;AAAA,UAC5B,WAAW;AAAA,QACb,CAAC;AAAA,MACH;AACA,YAAM;AAAA,IACR;AAAA,EACF;AACF;;;;;","names":["watch"],"sources":["../../../src/builder/dts/rollup.ts"],"sourcesContent":["import path from 'path';\nimport type {\n  InputOptions,\n  OutputOptions,\n  Plugin,\n  RollupWatcher,\n} from '../../../compiled/rollup';\nimport type {\n  BaseBuildConfig,\n  Input,\n  PluginAPI,\n  ModuleTools,\n} from '../../types';\n\nexport type { RollupWatcher };\n\ntype Config = {\n  distDir: string;\n  tsconfigPath: string;\n  externals: BaseBuildConfig['externals'];\n  input: Input;\n  watch: boolean;\n};\n\nexport const runRollup = async (\n  api: PluginAPI<ModuleTools>,\n  { distDir, tsconfigPath, externals, input, watch }: Config,\n) => {\n  const ignoreFiles: Plugin = {\n    name: 'ignore-files',\n    load(id) {\n      if (!/\\.(js|jsx|ts|tsx|json)$/.test(id)) {\n        return '';\n      }\n      return null;\n    },\n  };\n  const ts = await import('typescript');\n  const configFile = ts.readConfigFile(tsconfigPath, ts.sys.readFile);\n  const { options } = ts.parseJsonConfigFileContent(\n    configFile.config,\n    ts.sys,\n    './',\n  );\n\n  const { default: jsonPlugin } = await import(\n    '../../../compiled/@rollup/plugin-json'\n  );\n  const { default: dtsPlugin } = await import(\n    '../../../compiled/rollup-plugin-dts'\n  );\n  const baseUrl = path.isAbsolute(options.baseUrl || '.')\n    ? options.baseUrl\n    : path.join(path.dirname(tsconfigPath), options.baseUrl || '.');\n  const inputConfig: InputOptions = {\n    input,\n    external: externals,\n    plugins: [\n      jsonPlugin(),\n      ignoreFiles,\n      dtsPlugin({\n        // use external to prevent them which come from node_modules from be bundled.\n        respectExternal: true,\n        compilerOptions: {\n          declarationMap: false,\n          skipLibCheck: true,\n          preserveSymlinks: false,\n          ...options,\n          // isAbsolute\n          baseUrl,\n          // Ensure \".d.ts\" modules are generated\n          declaration: true,\n          // Skip \".js\" generation\n          noEmit: false,\n          emitDeclarationOnly: true,\n          // Skip code generation when error occurs\n          noEmitOnError: true,\n          // Avoid extra work\n          checkJs: false,\n          // Ensure we can parse the latest code\n          target: ts.ScriptTarget.ESNext,\n        },\n      }),\n    ].filter(Boolean),\n  };\n  const outputConfig: OutputOptions = {\n    dir: distDir,\n    format: 'esm',\n    exports: 'named',\n  };\n  if (watch) {\n    const { watch } = await import('../../../compiled/rollup');\n    const { watchSectionTitle } = await import('../../utils/log');\n    const { SectionTitleStatus, BundleDtsLogPrefix } = await import(\n      '../../constants/log'\n    );\n    const runner = api.useHookRunners();\n    const watcher = watch({\n      ...inputConfig,\n      plugins: inputConfig.plugins,\n      output: outputConfig,\n    }).on('event', async event => {\n      if (event.code === 'START') {\n        console.info(\n          await watchSectionTitle(BundleDtsLogPrefix, SectionTitleStatus.Log),\n        );\n      } else if (event.code === 'BUNDLE_END') {\n        console.info(\n          await watchSectionTitle(\n            BundleDtsLogPrefix,\n            SectionTitleStatus.Success,\n          ),\n        );\n        runner.buildWatchDts({ buildType: 'bundle' });\n      } else if (event.code === 'ERROR') {\n        // this is dts rollup plugin bug, error not complete message\n      }\n    });\n    return watcher;\n  } else {\n    try {\n      const { rollup } = await import('../../../compiled/rollup');\n      const bundle = await rollup(inputConfig);\n      await bundle.write(outputConfig);\n      return bundle;\n    } catch (e) {\n      if (e instanceof Error) {\n        const { InternalDTSError } = await import('../../error');\n        throw new InternalDTSError(e, {\n          buildType: 'bundle',\n        });\n      }\n      throw e;\n    }\n  }\n};\n"]}

package/dist/builder/dts/tsc-node.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/builder/dts/tsc.d.ts

@@ -1,3 +1,3 @@
-import type { BundlelessGeneratorDtsConfig, ITsconfig } from '../../types';
+import type { BundlelessGeneratorDtsConfig, ITsconfig, PluginAPI, ModuleTools } from '../../types';
 export declare const getProjectTsconfig: (tsconfigPath: string) => Promise<ITsconfig>;
-export declare const runTsc: (config: BundlelessGeneratorDtsConfig) => Promise<void>;
+export declare const runTsc: (api: PluginAPI<ModuleTools>, config: BundlelessGeneratorDtsConfig) => Promise<void>;

package/dist/builder/dts/tsc.js

@@ -97,7 +97,7 @@ const resolveLog = (childProgress, options) => __async(void 0, null, function* (
     console.error(chunk.toString());
   });
 });
-const generatorDts = (config) => __async(void 0, null, function* () {
+const generatorDts = (api, config) => __async(void 0, null, function* () {
   const { execa } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
   const { InternalDTSError } = yield Promise.resolve().then(() => __toESM(require("../../error")));
   const { generatorTsConfig } = yield Promise.resolve().then(() => __toESM(require("../../utils/dts")));
@@ -121,11 +121,13 @@ const generatorDts = (config) => __async(void 0, null, function* () {
       cwd: appDirectory
     }
   );
+  const runner = api.useHookRunners();
   resolveLog(childProgress, {
     watch,
     watchFn: () => __async(void 0, null, function* () {
       const { resolveAlias } = yield Promise.resolve().then(() => __toESM(require("../../utils/dts")));
       yield resolveAlias(config, __spreadProps(__spreadValues({}, result), { userTsconfig }));
+      runner.buildWatchDts({ buildType: "bundleless" });
     })
   });
   try {
@@ -139,9 +141,9 @@ const generatorDts = (config) => __async(void 0, null, function* () {
   }
   return __spreadProps(__spreadValues({}, result), { userTsconfig });
 });
-const runTsc = (config) => __async(void 0, null, function* () {
+const runTsc = (api, config) => __async(void 0, null, function* () {
   const { resolveAlias } = yield Promise.resolve().then(() => __toESM(require("../../utils/dts")));
-  const result = yield generatorDts(config);
+  const result = yield generatorDts(api, config);
   yield resolveAlias(config, result);
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/builder/dts/tsc.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,qBAAqB,CAChC,iBACuB;AACvB,QAAM,EAAE,OAAO,GAAG,IAAI,MAAM,6CAAO;AACnC,MAAI,CAAC,GAAG,WAAW,YAAY,GAAG;AAChC,WAAO,CAAC;AAAA,EACV;AAEA,SAAO,MAAM,MAAM,GAAG,aAAa,cAAc,OAAO,CAAC;AAC3D;AAEA,MAAM,aAAa,CACjB,eACA,YAIG;AApBL;AAqBE,QAAM,EAAE,QAAQ,OAAO,UAAU,MAAS;AAAG;AAAA,KAAU,IAAI;AAC3D,QAAM,EAAE,oBAAoB,uBAAuB,IAAI,MAAM,6CAC3D;AAEF,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,QAAM,EAAE,cAAc,IAAI,MAAM,6CAAO;AAOvC,sBAAc,WAAd,mBAAsB,GAAG,QAAQ,CAAM,SAAQ;AAC7C,QAAI,OAAO;AACT,cAAQ;AAAA,QACN,MAAM,kBAAkB,wBAAwB,mBAAmB,GAAG;AAAA,MACxE;AACA,cAAQ,KAAK,KAAK,SAAS,CAAC;AAC5B,UAAI,KAAK,SAAS,EAAE,SAAS,aAAa,GAAG;AAC3C,cAAM,QAAQ;AAAA,MAChB;AAAA,IACF;AAAA,EACF;AAEA,sBAAc,WAAd,mBAAsB,GAAG,SAAS,WAAS;AACzC,YAAQ,MAAM,MAAM,OAAO;AAAA,EAC7B;AACA,sBAAc,WAAd,mBAAsB,GAAG,QAAQ,WAAS;AACxC,YAAQ,MAAM,MAAM,SAAS,CAAC;AAAA,EAChC;AACF;AAEA,MAAM,eAAe,CAAO,WAAyC;AACnE,QAAM,EAAE,MAAM,IAAI,MAAM,6CAAO;AAC/B,QAAM,EAAE,iBAAiB,IAAI,MAAM,6CAAO;AAC1C,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,QAAM,EAAE,cAAc,IAAI,MAAM,6CAAO;AACvC,QAAM,EAAE,cAAc,cAAc,QAAQ,MAAM,IAAI;AACtD,QAAM,eAAe,MAAM,mBAAmB,YAAY;AAC1D,QAAM,SAAS,MAAM,kBAAkB,MAAM;AAE7C,QAAM,aAAa,MAAM,cAAc,YAAY;AAEnD,QAAM,cAAc,QAAQ,CAAC,IAAI,IAAI,CAAC;AACtC,QAAM,gBAAgB;AAAA,IACpB;AAAA,IACA;AAAA,MACE;AAAA,MACA,OAAO;AAAA,MAEP;AAAA,MAEA;AAAA,MACA,GAAG;AAAA,IACL;AAAA,IACA;AAAA,MACE,OAAO;AAAA,MACP,KAAK;AAAA,IACP;AAAA,EACF;AAEA,aAAW,eAAe;AAAA,IACxB;AAAA,IACA,SAAS,MAAY;AACnB,YAAM,EAAE,aAAa,IAAI,MAAM,6CAAO;AACtC,YAAM,aAAa,QAAQ,iCAAK,SAAL,EAAa,aAAa,EAAC;AAAA,IACxD;AAAA,EACF,CAAC;AAED,MAAI;AACF,UAAM;AAAA,EACR,SAAS,GAAP;AACA,QAAI,aAAa,OAAO;AACtB,YAAM,IAAI,iBAAiB,GAAG;AAAA,QAC5B,WAAW;AAAA,MACb,CAAC;AAAA,IACH;AAAA,EACF;AAEA,SAAO,iCAAK,SAAL,EAAa,aAAa;AACnC;AAEO,MAAM,SAAS,CAAO,WAAyC;AACpE,QAAM,EAAE,aAAa,IAAI,MAAM,6CAAO;AACtC,QAAM,SAAS,MAAM,aAAa,MAAM;AACxC,QAAM,aAAa,QAAQ,MAAM;AACnC;;;;;;","names":[],"sources":["../../../src/builder/dts/tsc.ts"],"sourcesContent":["import type { ChildProcess } from 'child_process';\nimport type { BundlelessGeneratorDtsConfig, ITsconfig } from '../../types';\n\nexport const getProjectTsconfig = async (\n  tsconfigPath: string,\n): Promise<ITsconfig> => {\n  const { json5, fs } = await import('@modern-js/utils');\n  if (!fs.existsSync(tsconfigPath)) {\n    return {};\n  }\n\n  return json5.parse(fs.readFileSync(tsconfigPath, 'utf-8'));\n};\n\nconst resolveLog = async (\n  childProgress: ChildProcess,\n  options: {\n    watch: boolean;\n    watchFn: () => Promise<void>;\n  },\n) => {\n  const { watch = false, watchFn = async () => undefined } = options;\n  const { SectionTitleStatus, BundlelessDtsLogPrefix } = await import(\n    '../../constants/log'\n  );\n  const { watchSectionTitle } = await import('../../utils/log');\n  const { watchDoneText } = await import('../../constants/dts');\n\n  /**\n   * tsc 所有的log信息都是从stdout data 事件中获取\n   * 正常模式下，如果有报错信息，交给 resolveLog 后面的逻辑来处理\n   * watch 模式下，则使用这里的信息\n   */\n  childProgress.stdout?.on('data', async data => {\n    if (watch) {\n      console.info(\n        await watchSectionTitle(BundlelessDtsLogPrefix, SectionTitleStatus.Log),\n      );\n      console.info(data.toString());\n      if (data.toString().includes(watchDoneText)) {\n        await watchFn();\n      }\n    }\n  });\n  // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况\n  childProgress.stdout?.on('error', error => {\n    console.error(error.message);\n  });\n  childProgress.stderr?.on('data', chunk => {\n    console.error(chunk.toString());\n  });\n};\n\nconst generatorDts = async (config: BundlelessGeneratorDtsConfig) => {\n  const { execa } = await import('@modern-js/utils');\n  const { InternalDTSError } = await import('../../error');\n  const { generatorTsConfig } = await import('../../utils/dts');\n  const { getTscBinPath } = await import('../../utils/dts');\n  const { tsconfigPath, appDirectory, watch = false } = config;\n  const userTsconfig = await getProjectTsconfig(tsconfigPath);\n  const result = await generatorTsConfig(config);\n\n  const tscBinFile = await getTscBinPath(appDirectory);\n\n  const watchParams = watch ? ['-w'] : [];\n  const childProgress = execa(\n    tscBinFile,\n    [\n      '-p',\n      result.tempTsconfigPath,\n      /* Required parameter, use it stdout have color */\n      '--pretty',\n      // https://github.com/microsoft/TypeScript/issues/21824\n      '--preserveWatchOutput',\n      ...watchParams,\n    ],\n    {\n      stdio: 'pipe',\n      cwd: appDirectory,\n    },\n  );\n\n  resolveLog(childProgress, {\n    watch,\n    watchFn: async () => {\n      const { resolveAlias } = await import('../../utils/dts');\n      await resolveAlias(config, { ...result, userTsconfig });\n    },\n  });\n\n  try {\n    await childProgress;\n  } catch (e) {\n    if (e instanceof Error) {\n      throw new InternalDTSError(e, {\n        buildType: 'bundleless',\n      });\n    }\n  }\n\n  return { ...result, userTsconfig };\n};\n\nexport const runTsc = async (config: BundlelessGeneratorDtsConfig) => {\n  const { resolveAlias } = await import('../../utils/dts');\n  const result = await generatorDts(config);\n  await resolveAlias(config, result);\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQO,MAAM,qBAAqB,CAChC,iBACuB;AACvB,QAAM,EAAE,OAAO,GAAG,IAAI,MAAM,6CAAO;AACnC,MAAI,CAAC,GAAG,WAAW,YAAY,GAAG;AAChC,WAAO,CAAC;AAAA,EACV;AAEA,SAAO,MAAM,MAAM,GAAG,aAAa,cAAc,OAAO,CAAC;AAC3D;AAEA,MAAM,aAAa,CACjB,eACA,YAIG;AAzBL;AA0BE,QAAM,EAAE,QAAQ,OAAO,UAAU,MAAS;AAAG;AAAA,KAAU,IAAI;AAC3D,QAAM,EAAE,oBAAoB,uBAAuB,IAAI,MAAM,6CAC3D;AAEF,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,QAAM,EAAE,cAAc,IAAI,MAAM,6CAAO;AAOvC,sBAAc,WAAd,mBAAsB,GAAG,QAAQ,CAAM,SAAQ;AAC7C,QAAI,OAAO;AACT,cAAQ;AAAA,QACN,MAAM,kBAAkB,wBAAwB,mBAAmB,GAAG;AAAA,MACxE;AACA,cAAQ,KAAK,KAAK,SAAS,CAAC;AAC5B,UAAI,KAAK,SAAS,EAAE,SAAS,aAAa,GAAG;AAC3C,cAAM,QAAQ;AAAA,MAChB;AAAA,IACF;AAAA,EACF;AAEA,sBAAc,WAAd,mBAAsB,GAAG,SAAS,WAAS;AACzC,YAAQ,MAAM,MAAM,OAAO;AAAA,EAC7B;AACA,sBAAc,WAAd,mBAAsB,GAAG,QAAQ,WAAS;AACxC,YAAQ,MAAM,MAAM,SAAS,CAAC;AAAA,EAChC;AACF;AAEA,MAAM,eAAe,CACnB,KACA,WACG;AACH,QAAM,EAAE,MAAM,IAAI,MAAM,6CAAO;AAC/B,QAAM,EAAE,iBAAiB,IAAI,MAAM,6CAAO;AAC1C,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,QAAM,EAAE,cAAc,IAAI,MAAM,6CAAO;AACvC,QAAM,EAAE,cAAc,cAAc,QAAQ,MAAM,IAAI;AACtD,QAAM,eAAe,MAAM,mBAAmB,YAAY;AAC1D,QAAM,SAAS,MAAM,kBAAkB,MAAM;AAE7C,QAAM,aAAa,MAAM,cAAc,YAAY;AAEnD,QAAM,cAAc,QAAQ,CAAC,IAAI,IAAI,CAAC;AACtC,QAAM,gBAAgB;AAAA,IACpB;AAAA,IACA;AAAA,MACE;AAAA,MACA,OAAO;AAAA,MAEP;AAAA,MAEA;AAAA,MACA,GAAG;AAAA,IACL;AAAA,IACA;AAAA,MACE,OAAO;AAAA,MACP,KAAK;AAAA,IACP;AAAA,EACF;AAEA,QAAM,SAAS,IAAI,eAAe;AAClC,aAAW,eAAe;AAAA,IACxB;AAAA,IACA,SAAS,MAAY;AACnB,YAAM,EAAE,aAAa,IAAI,MAAM,6CAAO;AACtC,YAAM,aAAa,QAAQ,iCAAK,SAAL,EAAa,aAAa,EAAC;AACtD,aAAO,cAAc,EAAE,WAAW,aAAa,CAAC;AAAA,IAClD;AAAA,EACF,CAAC;AAED,MAAI;AACF,UAAM;AAAA,EACR,SAAS,GAAP;AACA,QAAI,aAAa,OAAO;AACtB,YAAM,IAAI,iBAAiB,GAAG;AAAA,QAC5B,WAAW;AAAA,MACb,CAAC;AAAA,IACH;AAAA,EACF;AAEA,SAAO,iCAAK,SAAL,EAAa,aAAa;AACnC;AAEO,MAAM,SAAS,CACpB,KACA,WACG;AACH,QAAM,EAAE,aAAa,IAAI,MAAM,6CAAO;AACtC,QAAM,SAAS,MAAM,aAAa,KAAK,MAAM;AAC7C,QAAM,aAAa,QAAQ,MAAM;AACnC;;;;;;","names":[],"sources":["../../../src/builder/dts/tsc.ts"],"sourcesContent":["import type { ChildProcess } from 'child_process';\nimport type {\n  BundlelessGeneratorDtsConfig,\n  ITsconfig,\n  PluginAPI,\n  ModuleTools,\n} from '../../types';\n\nexport const getProjectTsconfig = async (\n  tsconfigPath: string,\n): Promise<ITsconfig> => {\n  const { json5, fs } = await import('@modern-js/utils');\n  if (!fs.existsSync(tsconfigPath)) {\n    return {};\n  }\n\n  return json5.parse(fs.readFileSync(tsconfigPath, 'utf-8'));\n};\n\nconst resolveLog = async (\n  childProgress: ChildProcess,\n  options: {\n    watch: boolean;\n    watchFn: () => Promise<void>;\n  },\n) => {\n  const { watch = false, watchFn = async () => undefined } = options;\n  const { SectionTitleStatus, BundlelessDtsLogPrefix } = await import(\n    '../../constants/log'\n  );\n  const { watchSectionTitle } = await import('../../utils/log');\n  const { watchDoneText } = await import('../../constants/dts');\n\n  /**\n   * tsc 所有的log信息都是从stdout data 事件中获取\n   * 正常模式下，如果有报错信息，交给 resolveLog 后面的逻辑来处理\n   * watch 模式下，则使用这里的信息\n   */\n  childProgress.stdout?.on('data', async data => {\n    if (watch) {\n      console.info(\n        await watchSectionTitle(BundlelessDtsLogPrefix, SectionTitleStatus.Log),\n      );\n      console.info(data.toString());\n      if (data.toString().includes(watchDoneText)) {\n        await watchFn();\n      }\n    }\n  });\n  // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况\n  childProgress.stdout?.on('error', error => {\n    console.error(error.message);\n  });\n  childProgress.stderr?.on('data', chunk => {\n    console.error(chunk.toString());\n  });\n};\n\nconst generatorDts = async (\n  api: PluginAPI<ModuleTools>,\n  config: BundlelessGeneratorDtsConfig,\n) => {\n  const { execa } = await import('@modern-js/utils');\n  const { InternalDTSError } = await import('../../error');\n  const { generatorTsConfig } = await import('../../utils/dts');\n  const { getTscBinPath } = await import('../../utils/dts');\n  const { tsconfigPath, appDirectory, watch = false } = config;\n  const userTsconfig = await getProjectTsconfig(tsconfigPath);\n  const result = await generatorTsConfig(config);\n\n  const tscBinFile = await getTscBinPath(appDirectory);\n\n  const watchParams = watch ? ['-w'] : [];\n  const childProgress = execa(\n    tscBinFile,\n    [\n      '-p',\n      result.tempTsconfigPath,\n      /* Required parameter, use it stdout have color */\n      '--pretty',\n      // https://github.com/microsoft/TypeScript/issues/21824\n      '--preserveWatchOutput',\n      ...watchParams,\n    ],\n    {\n      stdio: 'pipe',\n      cwd: appDirectory,\n    },\n  );\n\n  const runner = api.useHookRunners();\n  resolveLog(childProgress, {\n    watch,\n    watchFn: async () => {\n      const { resolveAlias } = await import('../../utils/dts');\n      await resolveAlias(config, { ...result, userTsconfig });\n      runner.buildWatchDts({ buildType: 'bundleless' });\n    },\n  });\n\n  try {\n    await childProgress;\n  } catch (e) {\n    if (e instanceof Error) {\n      throw new InternalDTSError(e, {\n        buildType: 'bundleless',\n      });\n    }\n  }\n\n  return { ...result, userTsconfig };\n};\n\nexport const runTsc = async (\n  api: PluginAPI<ModuleTools>,\n  config: BundlelessGeneratorDtsConfig,\n) => {\n  const { resolveAlias } = await import('../../utils/dts');\n  const result = await generatorDts(api, config);\n  await resolveAlias(config, result);\n};\n"]}

package/dist/command.js

@@ -108,16 +108,20 @@ const devCommand = (program, api) => __async(void 0, null, function* () {
     }
     for (const subCmd of meta.subCommands) {
       devProgram.command(subCmd).action((options) => __async(void 0, null, function* () {
-        var _a;
+        var _a, _b;
         const { initModuleContext } = yield Promise.resolve().then(() => __toESM(require("./utils/context")));
         const context = yield initModuleContext(api);
-        const { runBuildBeforeDevTools } = yield Promise.resolve().then(() => __toESM(require("./dev")));
-        yield runBuildBeforeDevTools(api, context, options, {
+        const { ensureFirstBuild, watchBuild } = yield Promise.resolve().then(() => __toESM(require("./dev")));
+        yield ensureFirstBuild(api, context, options, {
           disableRunBuild: (_a = meta.disableRunBuild) != null ? _a : false,
           appDirectory: context.appDirectory
         });
         yield runner.beforeDevTask(meta);
         yield meta.action(options, { isTsProject: context.isTsProject });
+        yield watchBuild(api, context, options, {
+          disableRunBuild: (_b = meta.disableRunBuild) != null ? _b : false,
+          appDirectory: context.appDirectory
+        });
       }));
     }
   }

package/dist/command.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKO,MAAM,eAAe,CAC1B,SACA,QACG;AACH,QAAM,QAAQ,MAAM,6CAAO;AAC3B,QAAM,EAAE,oBAAoB,IAAI,MAAM,6CAAO;AAE7C,UACG,QAAQ,OAAO,EACf,MAAM,WAAW,EACjB,YAAY,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,MAAM,QAAQ,CAAC,EACjE,OAAO,eAAe,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,MAAM,KAAK,CAAC,EACxE;AAAA,IACC;AAAA,IACA,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,MAAM,QAAQ;AAAA,IACpD;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,MAAM,QAAQ;AAAA,EACtD,EACC,OAAO,YAAY,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,MAAM,GAAG,CAAC,EACnE,OAAO,cAAc,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,MAAM,QAAQ,CAAC,EAC1E;AAAA,IACC;AAAA,IACA,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,MAAM,MAAM;AAAA,EACpD,EACC,OAAO,CAAO,YAAiC;AAC9C,UAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,UAAM,UAAU,MAAM,kBAAkB,GAAG;AAC3C,UAAM,EAAE,MAAM,IAAI,MAAM,6CAAO;AAC/B,UAAM,MAAM,KAAK,SAAS,OAAO;AAAA,EACnC,EAAC;AACL;AAEO,MAAM,aAAa,CACxB,SACA,QACG;AACH,QAAM,QAAQ,MAAM,6CAAO;AAC3B,QAAM,EAAE,oBAAoB,IAAI,MAAM,6CAAO;AAC7C,QAAM,SAAS,IAAI,eAAe;AAClC,QAAM,eAAe,MAAM,OAAO,YAAY;AAE9C,QAAM,OAAO,UAAU,YAAY;AAEnC,QAAM,aAAa,QAChB,QAAQ,KAAK,EACb,MAAM,WAAW,EACjB,YAAY,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,IAAI,QAAQ,CAAC,EAC/D;AAAA,IACC;AAAA,IACA,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,IAAI,QAAQ;AAAA,IAClD;AAAA,EACF,EACC,OAAO,CAAO,YAA+B;AAC5C,UAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,UAAM,UAAU,MAAM,kBAAkB,GAAG;AAC3C,UAAM,EAAE,IAAI,IAAI,MAAM,6CAAO;AAC7B,UAAM,IAAI,SAAS,cAAc,KAAK,OAAO;AAAA,EAC/C,EAAC;AAEH,aAAW,QAAQ,cAAc;AAC/B,QAAI,CAAC,KAAK,aAAa;AACrB;AAAA,IACF;AAEA,eAAW,UAAU,KAAK,aAAa;AACrC,iBAAW,QAAQ,MAAM,EAAE,OAAO,CAAO,YAA+B;AAzE9E;AA0EQ,cAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,cAAM,UAAU,MAAM,kBAAkB,GAAG;AAC3C,cAAM,EAAE,uBAAuB,IAAI,MAAM,6CAAO;AAEhD,cAAM,uBAAuB,KAAK,SAAS,SAAS;AAAA,UAClD,kBAAiB,UAAK,oBAAL,YAAwB;AAAA,UACzC,cAAc,QAAQ;AAAA,QACxB,CAAC;AAED,cAAM,OAAO,cAAc,IAAI;AAC/B,cAAM,KAAK,OAAO,SAAS,EAAE,aAAa,QAAQ,YAAY,CAAC;AAAA,MACjE,EAAC;AAAA,IACH;AAAA,EACF;AACF;AAEO,MAAM,aAAa,CAAO,YAAqB;AACpD,QAAM,QAAQ,MAAM,6CAAO;AAE3B,UACG,QAAQ,KAAK,EACb,MAAM,WAAW,EACjB,YAAY,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,IAAI,QAAQ,CAAC,EAC/D;AAAA,IACC;AAAA,IACA,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,IAAI,KAAK;AAAA,IAC/C;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,IAAI,MAAM;AAAA,EAClD,EACC;AAAA,IACC;AAAA,IACA,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,IAAI,OAAO;AAAA,EACnD,EACC,OAAO,iBAAiB,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,IAAI,IAAI,CAAC,EACvE,OAAO,cAAc,MAAM,KAAK,EAAE,MAAM,WAAW,QAAQ,IAAI,QAAQ,CAAC,EACxE,OAAO,CAAM,YAAW;AACvB,UAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO;AACzC,UAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,UAAM,SAAS,kBAAkB;AAEjC,UAAM,gBAAgB,iCAAK,UAAL,EAAc,QAAQ,QAAQ,QAAQ,OAAO,EAAC;AAAA,EACtE,EAAC;AACL;AAEO,MAAM,gBAAgB,CAAO,YAAqB;AACvD,QAAM,EAAE,cAAc,IAAI,MAAM,6CAAO;AACvC,gBAAc,QAAQ,QAAQ,SAAS,CAAC;AAC1C;;;;;;;;","names":[],"sources":["../src/command.ts"],"sourcesContent":["import type { Command } from '@modern-js/utils';\nimport type { PluginAPI } from '@modern-js/core';\nimport type { ModuleTools } from './types';\nimport type { DevCommandOptions, BuildCommandOptions } from './types/command';\n\nexport const buildCommand = async (\n  program: Command,\n  api: PluginAPI<ModuleTools>,\n) => {\n  const local = await import('./locale');\n  const { defaultTsConfigPath } = await import('./constants/dts');\n\n  program\n    .command('build')\n    .usage('[options]')\n    .description(local.i18n.t(local.localeKeys.command.build.describe))\n    .option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch))\n    .option(\n      '--tsconfig [tsconfig]',\n      local.i18n.t(local.localeKeys.command.build.tsconfig),\n      defaultTsConfigPath,\n    )\n    .option(\n      '-p, --platform [platform...]',\n      local.i18n.t(local.localeKeys.command.build.platform),\n    )\n    .option('--no-dts', local.i18n.t(local.localeKeys.command.build.dts))\n    .option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear))\n    .option(\n      '-c --config <config>',\n      local.i18n.t(local.localeKeys.command.build.config),\n    )\n    .action(async (options: BuildCommandOptions) => {\n      const { initModuleContext } = await import('./utils/context');\n      const context = await initModuleContext(api);\n      const { build } = await import('./build');\n      await build(api, options, context);\n    });\n};\n\nexport const devCommand = async (\n  program: Command,\n  api: PluginAPI<ModuleTools>,\n) => {\n  const local = await import('./locale');\n  const { defaultTsConfigPath } = await import('./constants/dts');\n  const runner = api.useHookRunners();\n  const devToolMetas = await runner.registerDev();\n\n  await runner.beforeDev(devToolMetas);\n\n  const devProgram = program\n    .command('dev')\n    .usage('[options]')\n    .description(local.i18n.t(local.localeKeys.command.dev.describe))\n    .option(\n      '--tsconfig [tsconfig]',\n      local.i18n.t(local.localeKeys.command.dev.tsconfig),\n      defaultTsConfigPath,\n    )\n    .action(async (options: DevCommandOptions) => {\n      const { initModuleContext } = await import('./utils/context');\n      const context = await initModuleContext(api);\n      const { dev } = await import('./dev');\n      await dev(options, devToolMetas, api, context);\n    });\n\n  for (const meta of devToolMetas) {\n    if (!meta.subCommands) {\n      continue;\n    }\n\n    for (const subCmd of meta.subCommands) {\n      devProgram.command(subCmd).action(async (options: DevCommandOptions) => {\n        const { initModuleContext } = await import('./utils/context');\n        const context = await initModuleContext(api);\n        const { runBuildBeforeDevTools } = await import('./dev');\n\n        await runBuildBeforeDevTools(api, context, options, {\n          disableRunBuild: meta.disableRunBuild ?? false,\n          appDirectory: context.appDirectory,\n        });\n\n        await runner.beforeDevTask(meta);\n        await meta.action(options, { isTsProject: context.isTsProject });\n      });\n    }\n  }\n};\n\nexport const newCommand = async (program: Command) => {\n  const local = await import('./locale');\n\n  program\n    .command('new')\n    .usage('[options]')\n    .description(local.i18n.t(local.localeKeys.command.new.describe))\n    .option(\n      '-d, --debug',\n      local.i18n.t(local.localeKeys.command.new.debug),\n      false,\n    )\n    .option(\n      '-c, --config <config>',\n      local.i18n.t(local.localeKeys.command.new.config),\n    )\n    .option(\n      '--dist-tag <tag>',\n      local.i18n.t(local.localeKeys.command.new.distTag),\n    )\n    .option('--lang <lang>', local.i18n.t(local.localeKeys.command.new.lang))\n    .option('--registry', local.i18n.t(local.localeKeys.command.new.registry))\n    .action(async options => {\n      const { ModuleNewAction } = await import('@modern-js/new-action');\n      const { getLocaleLanguage } = await import('./utils/language');\n      const locale = getLocaleLanguage();\n\n      await ModuleNewAction({ ...options, locale: options.lang || locale });\n    });\n};\n\nexport const upgradCommand = async (program: Command) => {\n  const { defineCommand } = await import('@modern-js/upgrade');\n  defineCommand(program.command('upgrade'));\n};\n"]}
+{"version":3,"file":null,"mappings":"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","names":[],"sources":["../src/command.ts"],"sourcesContent":["import type { Command } from '@modern-js/utils';\nimport type { PluginAPI } from '@modern-js/core';\nimport type { ModuleTools } from './types';\nimport type { DevCommandOptions, BuildCommandOptions } from './types/command';\n\nexport const buildCommand = async (\n  program: Command,\n  api: PluginAPI<ModuleTools>,\n) => {\n  const local = await import('./locale');\n  const { defaultTsConfigPath } = await import('./constants/dts');\n\n  program\n    .command('build')\n    .usage('[options]')\n    .description(local.i18n.t(local.localeKeys.command.build.describe))\n    .option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch))\n    .option(\n      '--tsconfig [tsconfig]',\n      local.i18n.t(local.localeKeys.command.build.tsconfig),\n      defaultTsConfigPath,\n    )\n    .option(\n      '-p, --platform [platform...]',\n      local.i18n.t(local.localeKeys.command.build.platform),\n    )\n    .option('--no-dts', local.i18n.t(local.localeKeys.command.build.dts))\n    .option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear))\n    .option(\n      '-c --config <config>',\n      local.i18n.t(local.localeKeys.command.build.config),\n    )\n    .action(async (options: BuildCommandOptions) => {\n      const { initModuleContext } = await import('./utils/context');\n      const context = await initModuleContext(api);\n      const { build } = await import('./build');\n      await build(api, options, context);\n    });\n};\n\nexport const devCommand = async (\n  program: Command,\n  api: PluginAPI<ModuleTools>,\n) => {\n  const local = await import('./locale');\n  const { defaultTsConfigPath } = await import('./constants/dts');\n  const runner = api.useHookRunners();\n  const devToolMetas = await runner.registerDev();\n\n  await runner.beforeDev(devToolMetas);\n\n  const devProgram = program\n    .command('dev')\n    .usage('[options]')\n    .description(local.i18n.t(local.localeKeys.command.dev.describe))\n    .option(\n      '--tsconfig [tsconfig]',\n      local.i18n.t(local.localeKeys.command.dev.tsconfig),\n      defaultTsConfigPath,\n    )\n    .action(async (options: DevCommandOptions) => {\n      const { initModuleContext } = await import('./utils/context');\n      const context = await initModuleContext(api);\n      const { dev } = await import('./dev');\n      await dev(options, devToolMetas, api, context);\n    });\n\n  for (const meta of devToolMetas) {\n    if (!meta.subCommands) {\n      continue;\n    }\n\n    for (const subCmd of meta.subCommands) {\n      devProgram.command(subCmd).action(async (options: DevCommandOptions) => {\n        const { initModuleContext } = await import('./utils/context');\n        const context = await initModuleContext(api);\n        const { ensureFirstBuild, watchBuild } = await import('./dev');\n\n        await ensureFirstBuild(api, context, options, {\n          disableRunBuild: meta.disableRunBuild ?? false,\n          appDirectory: context.appDirectory,\n        });\n\n        await runner.beforeDevTask(meta);\n        await meta.action(options, { isTsProject: context.isTsProject });\n\n        await watchBuild(api, context, options, {\n          disableRunBuild: meta.disableRunBuild ?? false,\n          appDirectory: context.appDirectory,\n        });\n      });\n    }\n  }\n};\n\nexport const newCommand = async (program: Command) => {\n  const local = await import('./locale');\n\n  program\n    .command('new')\n    .usage('[options]')\n    .description(local.i18n.t(local.localeKeys.command.new.describe))\n    .option(\n      '-d, --debug',\n      local.i18n.t(local.localeKeys.command.new.debug),\n      false,\n    )\n    .option(\n      '-c, --config <config>',\n      local.i18n.t(local.localeKeys.command.new.config),\n    )\n    .option(\n      '--dist-tag <tag>',\n      local.i18n.t(local.localeKeys.command.new.distTag),\n    )\n    .option('--lang <lang>', local.i18n.t(local.localeKeys.command.new.lang))\n    .option('--registry', local.i18n.t(local.localeKeys.command.new.registry))\n    .action(async options => {\n      const { ModuleNewAction } = await import('@modern-js/new-action');\n      const { getLocaleLanguage } = await import('./utils/language');\n      const locale = getLocaleLanguage();\n\n      await ModuleNewAction({ ...options, locale: options.lang || locale });\n    });\n};\n\nexport const upgradCommand = async (program: Command) => {\n  const { defineCommand } = await import('@modern-js/upgrade');\n  defineCommand(program.command('upgrade'));\n};\n"]}

package/dist/dev.d.ts

@@ -2,7 +2,12 @@ import type { PluginAPI } from '@modern-js/core';
 import type { DevCommandOptions } from './types/command';
 import type { ModuleContext } from './types/context';
 import type { DevToolData, ModuleTools } from './types';
-export declare const runBuildBeforeDevTools: (api: PluginAPI<ModuleTools>, context: ModuleContext, cliOptions: DevCommandOptions, options: {
+export declare const ensureFirstBuild: (api: PluginAPI<ModuleTools>, context: ModuleContext, cliOptions: DevCommandOptions, options: {
+  watch?: boolean;
+  disableRunBuild: boolean;
+  appDirectory: string;
+}) => Promise<void>;
+export declare const watchBuild: (api: PluginAPI<ModuleTools>, context: ModuleContext, cliOptions: DevCommandOptions, options: {
   disableRunBuild: boolean;
   appDirectory: string;
 }) => Promise<void>;

package/dist/dev.js

@@ -1,9 +1,26 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -44,24 +61,29 @@ var __async = (__this, __arguments, generator) => {
 var dev_exports = {};
 __export(dev_exports, {
   dev: () => dev,
-  runBuildBeforeDevTools: () => runBuildBeforeDevTools,
-  showMenu: () => showMenu
+  ensureFirstBuild: () => ensureFirstBuild,
+  showMenu: () => showMenu,
+  watchBuild: () => watchBuild
 });
 module.exports = __toCommonJS(dev_exports);
-const runBuildBeforeDevTools = (api, context, cliOptions, options) => __async(void 0, null, function* () {
+const ensureFirstBuild = (api, context, cliOptions, options) => __async(void 0, null, function* () {
+  var _a;
   if (!options.disableRunBuild) {
     const { build } = yield Promise.resolve().then(() => __toESM(require("./build")));
     const defaultCmdOptions = {
-      watch: true,
       tsconfig: cliOptions.tsconfig,
+      watch: (_a = options.watch) != null ? _a : false,
       dts: true,
       clear: true
     };
-    build(api, defaultCmdOptions, context);
+    yield build(api, defaultCmdOptions, context);
   }
 });
+const watchBuild = (api, context, cliOptions, options) => __async(void 0, null, function* () {
+  yield ensureFirstBuild(api, context, cliOptions, __spreadProps(__spreadValues({}, options), { watch: true }));
+});
 const showMenu = (metas, devCmdOptions, api, context) => __async(void 0, null, function* () {
-  var _a;
+  var _a, _b;
   const { chalk, inquirer } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
   const runner = api.useHookRunners();
   const menuTitle = chalk.rgb(255, 153, 0);
@@ -86,7 +108,7 @@ const showMenu = (metas, devCmdOptions, api, context) => __async(void 0, null, f
     }
   );
   if (currentDevTool) {
-    yield runBuildBeforeDevTools(api, context, devCmdOptions, {
+    yield ensureFirstBuild(api, context, devCmdOptions, {
       disableRunBuild: (_a = currentDevTool.disableRunBuild) != null ? _a : false,
       appDirectory: context.appDirectory
     });
@@ -94,10 +116,14 @@ const showMenu = (metas, devCmdOptions, api, context) => __async(void 0, null, f
     yield currentDevTool.action(devCmdOptions, {
       isTsProject: context.isTsProject
     });
+    yield watchBuild(api, context, devCmdOptions, {
+      disableRunBuild: (_b = currentDevTool.disableRunBuild) != null ? _b : false,
+      appDirectory: context.appDirectory
+    });
   }
 });
 const dev = (options, metas, api, context) => __async(void 0, null, function* () {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const { chalk } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
   const { purple } = yield Promise.resolve().then(() => __toESM(require("./constants/colors")));
   if (metas.length === 0) {
@@ -112,12 +138,16 @@ const dev = (options, metas, api, context) => __async(void 0, null, function* ()
       )
     );
     const meta = metas[0];
-    yield runBuildBeforeDevTools(api, context, options, {
+    yield ensureFirstBuild(api, context, options, {
       disableRunBuild: (_c = meta.disableRunBuild) != null ? _c : false,
       appDirectory: context.appDirectory
     });
     yield runner.beforeDevTask(meta);
     yield meta.action(options, { isTsProject: context.isTsProject });
+    yield watchBuild(api, context, options, {
+      disableRunBuild: (_d = meta.disableRunBuild) != null ? _d : false,
+      appDirectory: context.appDirectory
+    });
   } else if (metas.length > 1) {
     yield showMenu(metas, options, api, context);
   }
@@ -125,8 +155,9 @@ const dev = (options, metas, api, context) => __async(void 0, null, function* ()
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dev,
-  runBuildBeforeDevTools,
-  showMenu
+  ensureFirstBuild,
+  showMenu,
+  watchBuild
 });
 
 //# sourceMappingURL=dev.js.map

package/dist/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAKO,MAAM,yBAAyB,CACpC,KACA,SACA,YACA,YAIG;AACH,MAAI,CAAC,QAAQ,iBAAiB;AAC5B,UAAM,EAAE,MAAM,IAAI,MAAM,6CAAO;AAC/B,UAAM,oBAAyC;AAAA,MAC7C,OAAO;AAAA,MACP,UAAU,WAAW;AAAA,MACrB,KAAK;AAAA,MACL,OAAO;AAAA,IACT;AACA,UAAM,KAAK,mBAAmB,OAAO;AAAA,EACvC;AACF;AAEO,MAAM,WAAW,CACtB,OACA,eACA,KACA,YACG;AA/BL;AAgCE,QAAM,EAAE,OAAO,SAAS,IAAI,MAAM,6CAAO;AACzC,QAAM,SAAS,IAAI,eAAe;AAElC,QAAM,YAAY,MAAM,IAAI,KAAK,KAAK,CAAC;AACvC,QAAM,UAAU,MACb,IAAI,UAAQ,KAAK,QAAQ,EACzB,OAAO,cAAY,OAAO,aAAa,QAAQ;AAClD,QAAM,YAAY;AAAA,IAChB;AAAA,MACE,MAAM;AAAA,MACN,SAAS,UAAU,QAAQ;AAAA,MAC3B,MAAM;AAAA,MACN;AAAA,IACF;AAAA,EACF;AAEA,QAAM,eAAe,MAAM,OAAO,cAAc,SAAS;AACzD,QAAM,SAAoC,MAAM,SAAS;AAAA,IACvD,aAAa,WAAW,IAAI,eAAe;AAAA,EAC7C;AACA,QAAM,OAAO,aAAa,EAAE,QAAQ,UAAU,MAAM,CAAC;AAErD,QAAM,iBAAiB,MAAM;AAAA,IAC3B,UAAK;AAvDT;AAuDY,0BAAK,aAAL,oBAAe,WAAU,OAAO;AAAA;AAAA,EAC1C;AACA,MAAI,gBAAgB;AAClB,UAAM,uBAAuB,KAAK,SAAS,eAAe;AAAA,MACxD,kBAAiB,oBAAe,oBAAf,YAAkC;AAAA,MACnD,cAAc,QAAQ;AAAA,IACxB,CAAC;AAED,UAAM,OAAO,cAAc,cAAc;AACzC,UAAM,eAAe,OAAO,eAAe;AAAA,MACzC,aAAa,QAAQ;AAAA,IACvB,CAAC;AAAA,EACH;AACF;AAEO,MAAM,MAAM,CACjB,SACA,OACA,KACA,YACG;AA3EL;AA4EE,QAAM,EAAE,MAAM,IAAI,MAAM,6CAAO;AAC/B,QAAM,EAAE,OAAO,IAAI,MAAM,6CAAO;AAChC,MAAI,MAAM,WAAW,GAAG;AACtB,YAAQ,KAAK,8BAA8B;AAE3C,YAAQ,KAAK,CAAC;AAAA,EAChB;AAEA,QAAM,SAAS,IAAI,eAAe;AAClC,MAAI,MAAM,WAAW,GAAG;AACtB,YAAQ;AAAA,MACN,MAAM,IAAI,GAAG,MAAM;AAAA,QACjB,8EACE,iBAAM,GAAG,aAAT,mBAAmB,SAAnB,YAA2B,MAAM,GAAG;AAAA,MAExC;AAAA,IACF;AACA,UAAM,OAAO,MAAM;AAEnB,UAAM,uBAAuB,KAAK,SAAS,SAAS;AAAA,MAClD,kBAAiB,UAAK,oBAAL,YAAwB;AAAA,MACzC,cAAc,QAAQ;AAAA,IACxB,CAAC;AAED,UAAM,OAAO,cAAc,IAAI;AAC/B,UAAM,KAAK,OAAO,SAAS,EAAE,aAAa,QAAQ,YAAY,CAAC;AAAA,EACjE,WAAW,MAAM,SAAS,GAAG;AAC3B,UAAM,SAAS,OAAO,SAAS,KAAK,OAAO;AAAA,EAC7C;AACF;;;;;;;","names":[],"sources":["../src/dev.ts"],"sourcesContent":["import type { PluginAPI } from '@modern-js/core';\nimport type { DevCommandOptions, BuildCommandOptions } from './types/command';\nimport type { ModuleContext } from './types/context';\nimport type { DevToolData, ModuleTools } from './types';\n\nexport const runBuildBeforeDevTools = async (\n  api: PluginAPI<ModuleTools>,\n  context: ModuleContext,\n  cliOptions: DevCommandOptions,\n  options: {\n    disableRunBuild: boolean;\n    appDirectory: string;\n  },\n) => {\n  if (!options.disableRunBuild) {\n    const { build } = await import('./build');\n    const defaultCmdOptions: BuildCommandOptions = {\n      watch: true,\n      tsconfig: cliOptions.tsconfig,\n      dts: true,\n      clear: true,\n    };\n    build(api, defaultCmdOptions, context);\n  }\n};\n\nexport const showMenu = async (\n  metas: DevToolData[],\n  devCmdOptions: DevCommandOptions,\n  api: PluginAPI<ModuleTools>,\n  context: ModuleContext,\n) => {\n  const { chalk, inquirer } = await import('@modern-js/utils');\n  const runner = api.useHookRunners();\n\n  const menuTitle = chalk.rgb(255, 153, 0);\n  const choices = metas\n    .map(meta => meta.menuItem)\n    .filter(menuItem => typeof menuItem === 'object');\n  const questions = [\n    {\n      name: 'choiceDevTool',\n      message: menuTitle('选择调试工具'),\n      type: 'list',\n      choices,\n    },\n  ];\n\n  const newQuestions = await runner.beforeDevMenu(questions);\n  const result: { choiceDevTool: string } = await inquirer.prompt(\n    newQuestions.length !== 0 ? newQuestions : questions,\n  );\n  await runner.afterDevMenu({ result, devTools: metas });\n\n  const currentDevTool = metas.find(\n    meta => meta.menuItem?.value === result.choiceDevTool,\n  );\n  if (currentDevTool) {\n    await runBuildBeforeDevTools(api, context, devCmdOptions, {\n      disableRunBuild: currentDevTool.disableRunBuild ?? false,\n      appDirectory: context.appDirectory,\n    });\n\n    await runner.beforeDevTask(currentDevTool);\n    await currentDevTool.action(devCmdOptions, {\n      isTsProject: context.isTsProject,\n    });\n  }\n};\n\nexport const dev = async (\n  options: DevCommandOptions,\n  metas: DevToolData[],\n  api: PluginAPI<ModuleTools>,\n  context: ModuleContext,\n) => {\n  const { chalk } = await import('@modern-js/utils');\n  const { purple } = await import('./constants/colors');\n  if (metas.length === 0) {\n    console.info('No dev tools found available');\n    // eslint-disable-next-line no-process-exit\n    process.exit(0);\n  }\n\n  const runner = api.useHookRunners();\n  if (metas.length === 1) {\n    console.info(\n      chalk.rgb(...purple)(\n        `Only one dev tooling is currently detected as available, run it directly [${\n          metas[0].menuItem?.name ?? metas[0].name\n        }]`,\n      ),\n    );\n    const meta = metas[0];\n\n    await runBuildBeforeDevTools(api, context, options, {\n      disableRunBuild: meta.disableRunBuild ?? false,\n      appDirectory: context.appDirectory,\n    });\n\n    await runner.beforeDevTask(meta);\n    await meta.action(options, { isTsProject: context.isTsProject });\n  } else if (metas.length > 1) {\n    await showMenu(metas, options, api, context);\n  }\n};\n"]}
+{"version":3,"file":null,"mappings":"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","names":[],"sources":["../src/dev.ts"],"sourcesContent":["import type { PluginAPI } from '@modern-js/core';\nimport type { DevCommandOptions, BuildCommandOptions } from './types/command';\nimport type { ModuleContext } from './types/context';\nimport type { DevToolData, ModuleTools } from './types';\n\nexport const ensureFirstBuild = async (\n  api: PluginAPI<ModuleTools>,\n  context: ModuleContext,\n  cliOptions: DevCommandOptions,\n  options: {\n    watch?: boolean;\n    disableRunBuild: boolean;\n    appDirectory: string;\n  },\n) => {\n  if (!options.disableRunBuild) {\n    const { build } = await import('./build');\n    const defaultCmdOptions: BuildCommandOptions = {\n      tsconfig: cliOptions.tsconfig,\n      watch: options.watch ?? false,\n      dts: true,\n      clear: true,\n    };\n    await build(api, defaultCmdOptions, context);\n  }\n};\n\nexport const watchBuild = async (\n  api: PluginAPI<ModuleTools>,\n  context: ModuleContext,\n  cliOptions: DevCommandOptions,\n  options: {\n    disableRunBuild: boolean;\n    appDirectory: string;\n  },\n) => {\n  await ensureFirstBuild(api, context, cliOptions, { ...options, watch: true });\n};\n\nexport const showMenu = async (\n  metas: DevToolData[],\n  devCmdOptions: DevCommandOptions,\n  api: PluginAPI<ModuleTools>,\n  context: ModuleContext,\n) => {\n  const { chalk, inquirer } = await import('@modern-js/utils');\n  const runner = api.useHookRunners();\n\n  const menuTitle = chalk.rgb(255, 153, 0);\n  const choices = metas\n    .map(meta => meta.menuItem)\n    .filter(menuItem => typeof menuItem === 'object');\n  const questions = [\n    {\n      name: 'choiceDevTool',\n      message: menuTitle('选择调试工具'),\n      type: 'list',\n      choices,\n    },\n  ];\n\n  const newQuestions = await runner.beforeDevMenu(questions);\n  const result: { choiceDevTool: string } = await inquirer.prompt(\n    newQuestions.length !== 0 ? newQuestions : questions,\n  );\n  await runner.afterDevMenu({ result, devTools: metas });\n\n  const currentDevTool = metas.find(\n    meta => meta.menuItem?.value === result.choiceDevTool,\n  );\n  if (currentDevTool) {\n    await ensureFirstBuild(api, context, devCmdOptions, {\n      disableRunBuild: currentDevTool.disableRunBuild ?? false,\n      appDirectory: context.appDirectory,\n    });\n\n    await runner.beforeDevTask(currentDevTool);\n    await currentDevTool.action(devCmdOptions, {\n      isTsProject: context.isTsProject,\n    });\n\n    await watchBuild(api, context, devCmdOptions, {\n      disableRunBuild: currentDevTool.disableRunBuild ?? false,\n      appDirectory: context.appDirectory,\n    });\n  }\n};\n\nexport const dev = async (\n  options: DevCommandOptions,\n  metas: DevToolData[],\n  api: PluginAPI<ModuleTools>,\n  context: ModuleContext,\n) => {\n  const { chalk } = await import('@modern-js/utils');\n  const { purple } = await import('./constants/colors');\n  if (metas.length === 0) {\n    console.info('No dev tools found available');\n    // eslint-disable-next-line no-process-exit\n    process.exit(0);\n  }\n\n  const runner = api.useHookRunners();\n  if (metas.length === 1) {\n    console.info(\n      chalk.rgb(...purple)(\n        `Only one dev tooling is currently detected as available, run it directly [${\n          metas[0].menuItem?.name ?? metas[0].name\n        }]`,\n      ),\n    );\n    const meta = metas[0];\n\n    await ensureFirstBuild(api, context, options, {\n      disableRunBuild: meta.disableRunBuild ?? false,\n      appDirectory: context.appDirectory,\n    });\n\n    await runner.beforeDevTask(meta);\n    await meta.action(options, { isTsProject: context.isTsProject });\n\n    await watchBuild(api, context, options, {\n      disableRunBuild: meta.disableRunBuild ?? false,\n      appDirectory: context.appDirectory,\n    });\n  } else if (metas.length > 1) {\n    await showMenu(metas, options, api, context);\n  }\n};\n"]}

package/dist/hooks/build.d.ts

@@ -1,7 +1,7 @@
 import type { RegisterBuildPlatformResult } from '@modern-js/core';
 import { BuildCommandOptions } from '../types';
 import type { BuildConfig, BaseBuildConfig } from '../types/config';
-import type { BuildTaskResult, BuildResult, BuildPlatformResult } from '../types/hooks';
+import type { BuildTaskResult, BuildResult, BuildPlatformResult, WatchDtsHookContext, WatchJsHookContext } from '../types/hooks';
 export declare const buildHooks: {
   beforeBuild: import("@modern-js/plugin").ParallelWorkflow<{
     config: BuildConfig;
@@ -16,4 +16,8 @@ export declare const buildHooks: {
     platform: string;
   }, void>;
   afterBuildPlatform: import("@modern-js/plugin").ParallelWorkflow<BuildPlatformResult, void>;
+};
+export declare const buildWatchHooks: {
+  buildWatchJs: import("@modern-js/plugin").ParallelWorkflow<WatchJsHookContext, void>;
+  buildWatchDts: import("@modern-js/plugin").ParallelWorkflow<WatchDtsHookContext, void>;
 };

package/dist/hooks/build.js

@@ -17,7 +17,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var build_exports = {};
 __export(build_exports, {
-  buildHooks: () => buildHooks
+  buildHooks: () => buildHooks,
+  buildWatchHooks: () => buildWatchHooks
 });
 module.exports = __toCommonJS(build_exports);
 var import_plugin = require("@modern-js/plugin");
@@ -31,9 +32,14 @@ const buildHooks = {
   buildPlatform: (0, import_plugin.createParallelWorkflow)(),
   afterBuildPlatform: (0, import_plugin.createParallelWorkflow)()
 };
+const buildWatchHooks = {
+  buildWatchJs: (0, import_plugin.createParallelWorkflow)(),
+  buildWatchDts: (0, import_plugin.createParallelWorkflow)()
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  buildHooks
+  buildHooks,
+  buildWatchHooks
 });
 
 //# sourceMappingURL=build.js.map

package/dist/hooks/build.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAGO;AAUA,MAAM,aAAa;AAAA,EACxB,iBAAa,sCAGX;AAAA,EACF,qBAAiB,oCAAsC;AAAA,EACvD,oBAAgB,sCAA8C;AAAA,EAC9D,gBAAY,sCAA0C;AAAA,EACtD,2BAAuB,sCAGrB;AAAA,EACF,yBAAqB,sCAGnB;AAAA,EACF,mBAAe,sCAAmD;AAAA,EAClE,wBAAoB,sCAAkD;AACxE;;;;;","names":[],"sources":["../../src/hooks/build.ts"],"sourcesContent":["import {\n  createParallelWorkflow,\n  createAsyncWaterfall,\n} from '@modern-js/plugin';\nimport type { RegisterBuildPlatformResult } from '@modern-js/core';\nimport { BuildCommandOptions } from '../types';\nimport type { BuildConfig, BaseBuildConfig } from '../types/config';\nimport type {\n  BuildTaskResult,\n  BuildResult,\n  BuildPlatformResult,\n} from '../types/hooks';\n\nexport const buildHooks = {\n  beforeBuild: createParallelWorkflow<\n    { config: BuildConfig; cliOptions: BuildCommandOptions },\n    void\n  >(),\n  beforeBuildTask: createAsyncWaterfall<BaseBuildConfig>(),\n  afterBuildTask: createParallelWorkflow<BuildTaskResult, void>(),\n  afterBuild: createParallelWorkflow<BuildResult, void>(),\n  registerBuildPlatform: createParallelWorkflow<\n    void,\n    RegisterBuildPlatformResult\n  >(),\n  beforeBuildPlatform: createParallelWorkflow<\n    RegisterBuildPlatformResult[],\n    void\n  >(),\n  buildPlatform: createParallelWorkflow<{ platform: string }, void>(),\n  afterBuildPlatform: createParallelWorkflow<BuildPlatformResult, void>(),\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAGO;AAYA,MAAM,aAAa;AAAA,EACxB,iBAAa,sCAGX;AAAA,EACF,qBAAiB,oCAAsC;AAAA,EACvD,oBAAgB,sCAA8C;AAAA,EAC9D,gBAAY,sCAA0C;AAAA,EACtD,2BAAuB,sCAGrB;AAAA,EACF,yBAAqB,sCAGnB;AAAA,EACF,mBAAe,sCAAmD;AAAA,EAClE,wBAAoB,sCAAkD;AACxE;AAEO,MAAM,kBAAkB;AAAA,EAC7B,kBAAc,sCAAiD;AAAA,EAC/D,mBAAe,sCAAkD;AACnE;;;;;;","names":[],"sources":["../../src/hooks/build.ts"],"sourcesContent":["import {\n  createParallelWorkflow,\n  createAsyncWaterfall,\n} from '@modern-js/plugin';\nimport type { RegisterBuildPlatformResult } from '@modern-js/core';\nimport { BuildCommandOptions } from '../types';\nimport type { BuildConfig, BaseBuildConfig } from '../types/config';\nimport type {\n  BuildTaskResult,\n  BuildResult,\n  BuildPlatformResult,\n  WatchDtsHookContext,\n  WatchJsHookContext,\n} from '../types/hooks';\n\nexport const buildHooks = {\n  beforeBuild: createParallelWorkflow<\n    { config: BuildConfig; cliOptions: BuildCommandOptions },\n    void\n  >(),\n  beforeBuildTask: createAsyncWaterfall<BaseBuildConfig>(),\n  afterBuildTask: createParallelWorkflow<BuildTaskResult, void>(),\n  afterBuild: createParallelWorkflow<BuildResult, void>(),\n  registerBuildPlatform: createParallelWorkflow<\n    void,\n    RegisterBuildPlatformResult\n  >(),\n  beforeBuildPlatform: createParallelWorkflow<\n    RegisterBuildPlatformResult[],\n    void\n  >(),\n  buildPlatform: createParallelWorkflow<{ platform: string }, void>(),\n  afterBuildPlatform: createParallelWorkflow<BuildPlatformResult, void>(),\n};\n\nexport const buildWatchHooks = {\n  buildWatchJs: createParallelWorkflow<WatchJsHookContext, void>(),\n  buildWatchDts: createParallelWorkflow<WatchDtsHookContext, void>(),\n};\n"]}

package/dist/hooks/index.d.ts

@@ -1,4 +1,6 @@
 export declare const registerHook: {
+  buildWatchJs: import("@modern-js/plugin").ParallelWorkflow<import("..").WatchJsHookContext, void>;
+  buildWatchDts: import("@modern-js/plugin").ParallelWorkflow<import("..").WatchDtsHookContext, void>;
   addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
   modifyLibuild: import("@modern-js/plugin").AsyncPipeline<import("@modern-js/libuild").CLIConfig, import("@modern-js/libuild").CLIConfig>;
   registerDev: import("@modern-js/plugin").ParallelWorkflow<void, import("..").DevToolData>;

package/dist/hooks/index.js

@@ -37,7 +37,7 @@ module.exports = __toCommonJS(hooks_exports);
 var import_build = require("./build");
 var import_dev = require("./dev");
 var import_misc = require("./misc");
-const registerHook = __spreadValues(__spreadValues(__spreadValues({}, import_build.buildHooks), import_dev.devHooks), import_misc.miscHooks);
+const registerHook = __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, import_build.buildHooks), import_dev.devHooks), import_misc.miscHooks), import_build.buildWatchHooks);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   registerHook

package/dist/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2B;AAC3B,iBAAyB;AACzB,kBAA0B;AAEnB,MAAM,eAAe,iDACvB,0BACA,sBACA;;;;;","names":[],"sources":["../../src/hooks/index.ts"],"sourcesContent":["import { buildHooks } from './build';\nimport { devHooks } from './dev';\nimport { miscHooks } from './misc';\n\nexport const registerHook = {\n  ...buildHooks,\n  ...devHooks,\n  ...miscHooks,\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA4C;AAC5C,iBAAyB;AACzB,kBAA0B;AAEnB,MAAM,eAAe,gEACvB,0BACA,sBACA,wBACA;;;;;","names":[],"sources":["../../src/hooks/index.ts"],"sourcesContent":["import { buildHooks, buildWatchHooks } from './build';\nimport { devHooks } from './dev';\nimport { miscHooks } from './misc';\n\nexport const registerHook = {\n  ...buildHooks,\n  ...devHooks,\n  ...miscHooks,\n  ...buildWatchHooks,\n};\n"]}

package/dist/types/hooks.d.ts

@@ -1,6 +1,6 @@
 import { DevToolData as BaseDevToolData } from '@modern-js/core';
 import { registerHook } from '../hooks';
-import type { BaseBuildConfig, BuildConfig } from './config';
+import type { BaseBuildConfig, BuildConfig, BuildType } from './config';
 import type { DevCommandOptions, BuildCommandOptions } from './command';
 export interface BuildTaskResult {
   status: 'success' | 'fail';
@@ -22,4 +22,10 @@ export type DevToolData = BaseDevToolData<DevCommandOptions>;
 export type PromptResult = {
   choiceDevTool: string;
 } & Record<string, any>;
-export type ModuleToolsHooks = typeof registerHook;
+export type ModuleToolsHooks = typeof registerHook;
+export interface WatchJsHookContext {
+  buildConfig: BaseBuildConfig;
+}
+export interface WatchDtsHookContext {
+  buildType: BuildType;
+}

package/dist/types/hooks.js.map

@@ -1 +1 @@
-{"version":3,"mappings":";;;;;;;;;;;;;AAAA;AAAA;","names":[],"sources":["../../src/types/hooks.ts"],"sourcesContent":["import { DevToolData as BaseDevToolData } from '@modern-js/core';\nimport { registerHook } from '../hooks';\nimport type { BaseBuildConfig, BuildConfig } from './config';\nimport type { DevCommandOptions, BuildCommandOptions } from './command';\n\nexport interface BuildTaskResult {\n  status: 'success' | 'fail';\n  message?: string;\n  config: BaseBuildConfig;\n}\n\nexport interface BuildResult {\n  status: 'success' | 'fail';\n  message?: string;\n  config: BuildConfig;\n  commandOptions: BuildCommandOptions;\n  totalDuration: number;\n}\nexport interface BuildPlatformResult {\n  status: 'success' | 'fail';\n  message: string | Error | null;\n}\n\nexport type DevToolData = BaseDevToolData<DevCommandOptions>;\n\nexport type PromptResult = { choiceDevTool: string } & Record<string, any>;\n\nexport type ModuleToolsHooks = typeof registerHook;\n"]}
+{"version":3,"mappings":";;;;;;;;;;;;;AAAA;AAAA;","names":[],"sources":["../../src/types/hooks.ts"],"sourcesContent":["import { DevToolData as BaseDevToolData } from '@modern-js/core';\nimport { registerHook } from '../hooks';\nimport type { BaseBuildConfig, BuildConfig, BuildType } from './config';\nimport type { DevCommandOptions, BuildCommandOptions } from './command';\n\nexport interface BuildTaskResult {\n  status: 'success' | 'fail';\n  message?: string;\n  config: BaseBuildConfig;\n}\n\nexport interface BuildResult {\n  status: 'success' | 'fail';\n  message?: string;\n  config: BuildConfig;\n  commandOptions: BuildCommandOptions;\n  totalDuration: number;\n}\nexport interface BuildPlatformResult {\n  status: 'success' | 'fail';\n  message: string | Error | null;\n}\n\nexport type DevToolData = BaseDevToolData<DevCommandOptions>;\n\nexport type PromptResult = { choiceDevTool: string } & Record<string, any>;\n\nexport type ModuleToolsHooks = typeof registerHook;\n\nexport interface WatchJsHookContext {\n  buildConfig: BaseBuildConfig;\n}\n\nexport interface WatchDtsHookContext {\n  buildType: BuildType;\n}\n"]}

package/dist/utils/libuild-plugins.d.ts

@@ -1,6 +1,6 @@
 import type { LibuildPlugin } from '@modern-js/libuild';
-import type { BaseBuildConfig } from '../types';
-export declare const watchPlugin: (config: BaseBuildConfig) => LibuildPlugin;
+import type { BaseBuildConfig, PluginAPI, ModuleTools } from '../types';
+export declare const watchPlugin: (api: PluginAPI<ModuleTools>, config: BaseBuildConfig) => LibuildPlugin;
 export declare const externalPlugin: (config: BaseBuildConfig, options: {
   appDirectory: string;
 }) => LibuildPlugin;

package/dist/utils/libuild-plugins.js

@@ -47,7 +47,7 @@ __export(libuild_plugins_exports, {
   watchPlugin: () => watchPlugin
 });
 module.exports = __toCommonJS(libuild_plugins_exports);
-const watchPlugin = (config) => {
+const watchPlugin = (api, config) => {
   return {
     name: "watch-plugin",
     apply(compiler) {
@@ -58,6 +58,8 @@ const watchPlugin = (config) => {
         console.info(
           yield watchSectionTitle(titleText, SectionTitleStatus.Log)
         );
+        const runner = api.useHookRunners();
+        runner.buildWatchJs({ buildConfig: config });
       }));
     }
   };

package/dist/utils/libuild-plugins.js.map

@@ -1 +1 @@
-{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,cAAc,CAAC,WAA2C;AACrE,SAAO;AAAA,IACL,MAAM;AAAA,IACN,MAAM,UAAU;AACd,eAAS,MAAM,YAAY,IAAI,gBAAgB,MAAY;AACzD,cAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,cAAM,EAAE,mBAAmB,IAAI,MAAM,6CAAO;AAC5C,cAAM,YAAY,IAChB,OAAO,cAAc,WAAW,WAAW,gBACzC,OAAO,UAAU,OAAO;AAC5B,gBAAQ;AAAA,UACN,MAAM,kBAAkB,WAAW,mBAAmB,GAAG;AAAA,QAC3D;AAAA,MACF,EAAC;AAAA,IACH;AAAA,EACF;AACF;AAEO,MAAM,iBAAiB,CAC5B,QACA,YACkB;AAClB,SAAO;AAAA,IACL,MAAM;AAAA,IACN,MAAM,UAAU;AACd,eAAS,MAAM,WAAW,WAAW,mBAAmB,MAAY;AAClE,cAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,cAAM,iBAAiB,MAAM,kBAAkB,QAAQ,OAAO;AAC9D,iBAAS,OAAO,WAAW;AAAA,MAC7B,EAAC;AAAA,IACH;AAAA,EACF;AACF;;;;;;","names":[],"sources":["../../src/utils/libuild-plugins.ts"],"sourcesContent":["import type { LibuildPlugin } from '@modern-js/libuild';\nimport type { BaseBuildConfig } from '../types';\n\nexport const watchPlugin = (config: BaseBuildConfig): LibuildPlugin => {\n  return {\n    name: 'watch-plugin',\n    apply(compiler) {\n      compiler.hooks.watchChange.tap('watch-plugin', async () => {\n        const { watchSectionTitle } = await import('./log');\n        const { SectionTitleStatus } = await import('../constants/log');\n        const titleText = `[${\n          config.buildType === 'bundle' ? 'Bundle' : 'Bundleless'\n        }:${config.format}_${config.target}]`;\n        console.info(\n          await watchSectionTitle(titleText, SectionTitleStatus.Log),\n        );\n      });\n    },\n  };\n};\n\nexport const externalPlugin = (\n  config: BaseBuildConfig,\n  options: { appDirectory: string },\n): LibuildPlugin => {\n  return {\n    name: 'external-plugin',\n    apply(compiler) {\n      compiler.hooks.initialize.tapPromise('external-plugin', async () => {\n        const { getFinalExternals } = await import('./builder');\n        const finalExternals = await getFinalExternals(config, options);\n        compiler.config.external = finalExternals;\n      });\n    },\n  };\n};\n"]}
+{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,cAAc,CACzB,KACA,WACkB;AAClB,SAAO;AAAA,IACL,MAAM;AAAA,IACN,MAAM,UAAU;AACd,eAAS,MAAM,YAAY,IAAI,gBAAgB,MAAY;AACzD,cAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,cAAM,EAAE,mBAAmB,IAAI,MAAM,6CAAO;AAC5C,cAAM,YAAY,IAChB,OAAO,cAAc,WAAW,WAAW,gBACzC,OAAO,UAAU,OAAO;AAC5B,gBAAQ;AAAA,UACN,MAAM,kBAAkB,WAAW,mBAAmB,GAAG;AAAA,QAC3D;AACA,cAAM,SAAS,IAAI,eAAe;AAClC,eAAO,aAAa,EAAE,aAAa,OAAO,CAAC;AAAA,MAC7C,EAAC;AAAA,IACH;AAAA,EACF;AACF;AAEO,MAAM,iBAAiB,CAC5B,QACA,YACkB;AAClB,SAAO;AAAA,IACL,MAAM;AAAA,IACN,MAAM,UAAU;AACd,eAAS,MAAM,WAAW,WAAW,mBAAmB,MAAY;AAClE,cAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,cAAM,iBAAiB,MAAM,kBAAkB,QAAQ,OAAO;AAC9D,iBAAS,OAAO,WAAW;AAAA,MAC7B,EAAC;AAAA,IACH;AAAA,EACF;AACF;;;;;;","names":[],"sources":["../../src/utils/libuild-plugins.ts"],"sourcesContent":["import type { LibuildPlugin } from '@modern-js/libuild';\nimport type { BaseBuildConfig, PluginAPI, ModuleTools } from '../types';\n\nexport const watchPlugin = (\n  api: PluginAPI<ModuleTools>,\n  config: BaseBuildConfig,\n): LibuildPlugin => {\n  return {\n    name: 'watch-plugin',\n    apply(compiler) {\n      compiler.hooks.watchChange.tap('watch-plugin', async () => {\n        const { watchSectionTitle } = await import('./log');\n        const { SectionTitleStatus } = await import('../constants/log');\n        const titleText = `[${\n          config.buildType === 'bundle' ? 'Bundle' : 'Bundleless'\n        }:${config.format}_${config.target}]`;\n        console.info(\n          await watchSectionTitle(titleText, SectionTitleStatus.Log),\n        );\n        const runner = api.useHookRunners();\n        runner.buildWatchJs({ buildConfig: config });\n      });\n    },\n  };\n};\n\nexport const externalPlugin = (\n  config: BaseBuildConfig,\n  options: { appDirectory: string },\n): LibuildPlugin => {\n  return {\n    name: 'external-plugin',\n    apply(compiler) {\n      compiler.hooks.initialize.tapPromise('external-plugin', async () => {\n        const { getFinalExternals } = await import('./builder');\n        const finalExternals = await getFinalExternals(config, options);\n        compiler.config.external = finalExternals;\n      });\n    },\n  };\n};\n"]}

package/package.json

@@ -11,7 +11,7 @@
     "module-tools",
     "lib-tools"
   ],
-  "version": "2.2.0",
+  "version": "2.2.1-beta.0",
   "bin": {
     "modern": "./bin/modern.js",
     "modern-module": "./bin/modern.js"
@@ -40,13 +40,13 @@
     "@modern-js/libuild-plugin-svgr": "~0.8.0",
     "@modern-js/libuild-plugin-swc": "~0.8.0",
     "@modern-js/core": "2.2.0",
-    "@modern-js/new-action": "2.2.0",
-    "@modern-js/plugin": "2.2.0",
     "@modern-js/plugin-i18n": "2.2.0",
+    "@modern-js/plugin": "2.2.0",
+    "@modern-js/plugin-changeset": "2.2.0",
     "@modern-js/upgrade": "2.2.0",
     "@modern-js/utils": "2.2.0",
-    "@modern-js/plugin-changeset": "2.2.0",
-    "@modern-js/plugin-lint": "2.2.0"
+    "@modern-js/plugin-lint": "2.2.0",
+    "@modern-js/new-action": "2.2.0"
   },
   "devDependencies": {
     "@modern-js/self": "npm:@modern-js/module-tools@*",
@@ -61,8 +61,8 @@
     "react": "17",
     "typescript": "^4",
     "@modern-js/builder-webpack-provider": "2.2.0",
-    "@scripts/jest-config": "2.2.0",
-    "@scripts/build": "2.2.0"
+    "@scripts/build": "2.2.0",
+    "@scripts/jest-config": "2.2.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",