npm - @modern-js/module-tools - Versions diffs - 2.33.0 → 2.33.1 - Mend

@modern-js/module-tools 2.33.0 → 2.33.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/dist/command.js CHANGED Viewed

@@ -58,7 +58,7 @@ const devCommand = async (program, api) => {
   }
 };
 const newCommand = async (program) => {
-  program.command("new").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.new.describe)).option("--config-file <configFile>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).option("--lang <lang>", _locale.i18n.t(_locale.localeKeys.command.new.lang)).option("-c, --config <config>", _locale.i18n.t(_locale.localeKeys.command.new.config)).option("-d, --debug", _locale.i18n.t(_locale.localeKeys.command.new.debug), false).option("--dist-tag <tag>", _locale.i18n.t(_locale.localeKeys.command.new.distTag)).option("--registry", _locale.i18n.t(_locale.localeKeys.command.new.registry)).action(async (options) => {
+  program.command("new").usage("[options]").description(_locale.i18n.t(_locale.localeKeys.command.new.describe)).option("--config-file <configFile>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).option("--lang <lang>", _locale.i18n.t(_locale.localeKeys.command.new.lang)).option("-c, --config <config>", _locale.i18n.t(_locale.localeKeys.command.new.config)).option("-d, --debug", _locale.i18n.t(_locale.localeKeys.command.new.debug), false).option("--dist-tag <tag>", _locale.i18n.t(_locale.localeKeys.command.new.distTag)).option("--registry", _locale.i18n.t(_locale.localeKeys.command.new.registry)).option("--no-need-install", _locale.i18n.t(_locale.localeKeys.command.shared.noNeedInstall)).action(async (options) => {
     const { ModuleNewAction } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/new-action")));
     const { getLocaleLanguage } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/plugin-i18n/language-detector")));
     const locale = getLocaleLanguage();
@@ -70,7 +70,7 @@ const newCommand = async (program) => {
 };
 const upgradeCommand = async (program) => {
   const { defineCommand } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/upgrade")));
-  defineCommand(program.command("upgrade").option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)));
+  defineCommand(program.command("upgrade").option("-c --config <config>", _locale.i18n.t(_locale.localeKeys.command.shared.config)).option("--no-need-install", _locale.i18n.t(_locale.localeKeys.command.shared.noNeedInstall)));
 };
 //# sourceMappingURL=command.js.map

package/dist/command.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":null,"mappings":";;;;;;;;;;;;EAOaA,cAAY;WAAZA;;EAwBAC,YAAU;WAAVA;;EAgDAC,YAAU;WAAVA;;~~EA0BAC~~,gBAAc;WAAdA;;;;~~wBArGoB~~;yBACC;AAE3B,MAAMH,eAAe,OAC1BI,SACAC;AAEAD,UACGE,QAAQ,SACRC,MAAM,aACNC,YAAYC,aAAKC,EAAEC,mBAAWL,QAAQM,MAAMC,QAAQ,GACpDC,OAAO,eAAeL,aAAKC,EAAEC,mBAAWL,QAAQM,MAAMG,KAAK,GAC3DD,OAAO,yBAAyBL,aAAKC,EAAEC,mBAAWL,QAAQM,MAAMI,QAAQ,GACxEF,OACC,gCACAL,aAAKC,EAAEC,mBAAWL,QAAQM,MAAMK,QAAQ,GAEzCH,OAAO,YAAYL,aAAKC,EAAEC,mBAAWL,QAAQM,MAAMM,GAAG,GACtDJ,OAAO,cAAcL,aAAKC,EAAEC,mBAAWL,QAAQM,MAAMO,OAAO,GAC5DL,OAAO,wBAAwBL,aAAKC,EAAEC,mBAAWL,QAAQc,OAAOC,MAAM,GACtEC,OAAO,OAAOC;AACb,UAAMC,UAAU,OAAMC,+BAAkBpB;AACxC,UAAM,EAAEO,MAAK,IAAK,MAAM,iFAAO;AAC/B,UAAMA,MAAMP,KAAKkB,SAASC;EAC5B;AACJ;AAEO,MAAMvB,aAAa,OACxBG,SACAC;AAEA,QAAMqB,SAASrB,IAAIsB,eAAc;AACjC,QAAMC,eAAe,MAAMF,OAAOG,YAAW;AAE7C,QAAMH,OAAOI,UAAUF;AAEvB,QAAMG,aAAa3B,QAChBE,QAAQ,OACRC,MAAM,aACNC,YAAYC,aAAKC,EAAEC,mBAAWL,QAAQ0B,IAAInB,QAAQ,GAClDC,OAAO,yBAAyBL,aAAKC,EAAEC,mBAAWL,QAAQ0B,IAAIhB,QAAQ,GACtEM,OAAO,OAAOC;AACb,UAAMC,UAAU,OAAMC,+BAAkBpB;AACxC,UAAM,EAAE2B,IAAG,IAAK,MAAM,iFAAO;AAC7B,UAAMA,IAAIT,SAASK,cAAcvB,KAAKmB;EACxC;AAEF,aAAWS,QAAQL,cAAc;AAC/B,QAAI,CAACK,KAAKC,aAAa;AACrB;IACF;AAEA,eAAWC,UAAUF,KAAKC,aAAa;AACrCH,iBAAWzB,QAAQ6B,QAAQb,OAAO,OAAOC;AACvC,cAAMC,UAAU,OAAMC,+BAAkBpB;AASxC,cAAMqB,OAAOU,cAAcH;AAC3B,cAAMA,KAAKX,OAAOC,SAAS;UAAEc,aAAab,QAAQa;QAAY;MAMhE;IACF;EACF;AACF;AAEO,MAAMnC,aAAa,OAAOE;AAC/BA,UACGE,QAAQ,OACRC,MAAM,aACNC,YAAYC,aAAKC,EAAEC,mBAAWL,QAAQgC,IAAIzB,QAAQ,GAClDC,OACC,8BACAL,aAAKC,EAAEC,mBAAWL,QAAQc,OAAOC,MAAM,GAExCP,OAAO,iBAAiBL,aAAKC,EAAEC,mBAAWL,QAAQgC,IAAIC,IAAI,GAC1DzB,OAAO,yBAAyBL,aAAKC,EAAEC,mBAAWL,QAAQgC,IAAIjB,MAAM,GACpEP,OAAO,eAAeL,aAAKC,EAAEC,mBAAWL,QAAQgC,IAAIE,KAAK,GAAG,OAC5D1B,OAAO,oBAAoBL,aAAKC,EAAEC,mBAAWL,QAAQgC,IAAIG,OAAO,GAChE3B,OAAO,cAAcL,aAAKC,EAAEC,mBAAWL,QAAQgC,IAAII,QAAQ,~~GAC3DpB~~,OAAO,OAAMC;AACZ,UAAM,~~EAAEoB~~,gBAAe,IAAK,MAAM,iFAAO;AACzC,UAAM,EAAEC,kBAAiB,IAAK,MAAM,iFAClC;AAGF,UAAMC,SAASD;AAEf,UAAMD,gBAAgB;MAAE,~~GAAGpB~~;~~MAASsB~~,~~QAAQtB~~,QAAQgB,~~QAAQM~~;IAAO;EACrE;AACJ;AAEO,~~MAAM1C~~,iBAAiB,OAAOC;AACnC,QAAM,~~EAAE0C~~,cAAa,IAAK,MAAM,iFAAO;AACvCA,~~gBACE1C~~,QACGE,QAAQ,WACRQ,OAAO,wBAAwBL,aAAKC,EAAEC,mBAAWL,QAAQc,OAAOC,MAAM;~~AAE7E~~;","names":["buildCommand","devCommand","newCommand","upgradeCommand","program","api","command","usage","description","i18n","t","localeKeys","build","describe","option","watch","tsconfig","platform","dts","noClear","shared","config","action","options","context","initModuleContext","runner","useHookRunners","devToolMetas","registerDev","beforeDev","devProgram","dev","meta","subCommands","subCmd","beforeDevTask","isTsProject","new","lang","debug","distTag","registry","ModuleNewAction","getLocaleLanguage","locale","defineCommand"],"sources":["../src/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/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';\nimport { i18n, localeKeys } from './locale';\nimport { initModuleContext } from './utils/context';\n\nexport const buildCommand = async (\n program: Command,\n api: PluginAPI<ModuleTools>,\n) => {\n program\n .command('build')\n .usage('[options]')\n .description(i18n.t(localeKeys.command.build.describe))\n .option('-w, --watch', i18n.t(localeKeys.command.build.watch))\n .option('--tsconfig [tsconfig]', i18n.t(localeKeys.command.build.tsconfig))\n .option(\n '-p, --platform [platform...]',\n i18n.t(localeKeys.command.build.platform),\n )\n .option('--no-dts', i18n.t(localeKeys.command.build.dts))\n .option('--no-clear', i18n.t(localeKeys.command.build.noClear))\n .option('-c --config <config>', i18n.t(localeKeys.command.shared.config))\n .action(async (options: BuildCommandOptions) => {\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 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(i18n.t(localeKeys.command.dev.describe))\n .option('--tsconfig [tsconfig]', i18n.t(localeKeys.command.dev.tsconfig))\n .action(async (options: DevCommandOptions) => {\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 context = await initModuleContext(api);\n\n // TODO: watch build\n // const { ensureFirstBuild, watchBuild } = await import('./dev');\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 // TODO: watch build\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 program\n .command('new')\n .usage('[options]')\n .description(i18n.t(localeKeys.command.new.describe))\n .option(\n '--config-file <configFile>',\n i18n.t(localeKeys.command.shared.config),\n )\n .option('--lang <lang>', i18n.t(localeKeys.command.new.lang))\n .option('-c, --config <config>', i18n.t(localeKeys.command.new.config))\n .option('-d, --debug', i18n.t(localeKeys.command.new.debug), false)\n .option('--dist-tag <tag>', i18n.t(localeKeys.command.new.distTag))\n .option('--registry', i18n.t(localeKeys.command.new.registry))\n .action(async options => {\n const { ModuleNewAction } = await import('@modern-js/new-action');\n const { getLocaleLanguage } = await import(\n '@modern-js/plugin-i18n/language-detector'\n );\n\n const locale = getLocaleLanguage();\n\n await ModuleNewAction({ ...options, locale: options.lang \|\| locale });\n });\n};\n\nexport const upgradeCommand = async (program: Command) => {\n const { defineCommand } = await import('@modern-js/upgrade');\n defineCommand(\n program\n .command('upgrade')\n .option('-c --config <config>', i18n.t(localeKeys.command.shared.config)),\n );\n};\n"]}
1	+ {"version":3,"file":null,"mappings":"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","names":["buildCommand","devCommand","newCommand","upgradeCommand","program","api","command","usage","description","i18n","t","localeKeys","build","describe","option","watch","tsconfig","platform","dts","noClear","shared","config","action","options","context","initModuleContext","runner","useHookRunners","devToolMetas","registerDev","beforeDev","devProgram","dev","meta","subCommands","subCmd","beforeDevTask","isTsProject","new","lang","debug","distTag","registry","noNeedInstall","ModuleNewAction","getLocaleLanguage","locale","defineCommand"],"sources":["../src/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/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';\nimport { i18n, localeKeys } from './locale';\nimport { initModuleContext } from './utils/context';\n\nexport const buildCommand = async (\n program: Command,\n api: PluginAPI<ModuleTools>,\n) => {\n program\n .command('build')\n .usage('[options]')\n .description(i18n.t(localeKeys.command.build.describe))\n .option('-w, --watch', i18n.t(localeKeys.command.build.watch))\n .option('--tsconfig [tsconfig]', i18n.t(localeKeys.command.build.tsconfig))\n .option(\n '-p, --platform [platform...]',\n i18n.t(localeKeys.command.build.platform),\n )\n .option('--no-dts', i18n.t(localeKeys.command.build.dts))\n .option('--no-clear', i18n.t(localeKeys.command.build.noClear))\n .option('-c --config <config>', i18n.t(localeKeys.command.shared.config))\n .action(async (options: BuildCommandOptions) => {\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 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(i18n.t(localeKeys.command.dev.describe))\n .option('--tsconfig [tsconfig]', i18n.t(localeKeys.command.dev.tsconfig))\n .action(async (options: DevCommandOptions) => {\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 context = await initModuleContext(api);\n\n // TODO: watch build\n // const { ensureFirstBuild, watchBuild } = await import('./dev');\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 // TODO: watch build\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 program\n .command('new')\n .usage('[options]')\n .description(i18n.t(localeKeys.command.new.describe))\n .option(\n '--config-file <configFile>',\n i18n.t(localeKeys.command.shared.config),\n )\n .option('--lang <lang>', i18n.t(localeKeys.command.new.lang))\n .option('-c, --config <config>', i18n.t(localeKeys.command.new.config))\n .option('-d, --debug', i18n.t(localeKeys.command.new.debug), false)\n .option('--dist-tag <tag>', i18n.t(localeKeys.command.new.distTag))\n .option('--registry', i18n.t(localeKeys.command.new.registry))\n .option(\n '--no-need-install',\n i18n.t(localeKeys.command.shared.noNeedInstall),\n )\n .action(async options => {\n const { ModuleNewAction } = await import('@modern-js/new-action');\n const { getLocaleLanguage } = await import(\n '@modern-js/plugin-i18n/language-detector'\n );\n\n const locale = getLocaleLanguage();\n\n await ModuleNewAction({ ...options, locale: options.lang \|\| locale });\n });\n};\n\nexport const upgradeCommand = async (program: Command) => {\n const { defineCommand } = await import('@modern-js/upgrade');\n defineCommand(\n program\n .command('upgrade')\n .option('-c --config <config>', i18n.t(localeKeys.command.shared.config))\n .option(\n '--no-need-install',\n i18n.t(localeKeys.command.shared.noNeedInstall),\n ),\n );\n};\n"]}

package/dist/config/merge.js CHANGED Viewed

@@ -23,7 +23,7 @@ const _builder = require("../utils/builder");
 const _input = require("../utils/input");
 const _build = require("../constants/build");
 const mergeDefaultBaseConfig = async (pConfig, options) => {
-  var _pConfig_style, _pConfig_style1, _pConfig_style2, _pConfig_style3;
+  var _asset, _pConfig_style, _pConfig_style1, _pConfig_style2, _pConfig_style3;
   const defaultConfig = (0, _build.getDefaultBuildConfig)();
   const { context, buildCmdOptions } = options;
   const { applyOptionsChain, ensureAbsolutePath, slash } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("@modern-js/utils")));
@@ -51,11 +51,15 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
   const sourceDir = (_pConfig_sourceDir = pConfig.sourceDir) !== null && _pConfig_sourceDir !== void 0 ? _pConfig_sourceDir : defaultConfig.sourceDir;
   var _pConfig_metafile;
   const metafile = (_pConfig_metafile = pConfig.metafile) !== null && _pConfig_metafile !== void 0 ? _pConfig_metafile : defaultConfig.metafile;
+  const asset = {
+    ...defaultConfig.asset,
+    ...pConfig.asset
+  };
   const defaultIndexEntry = buildType === "bundle" ? await getDefaultIndexEntry(context) : [
     sourceDir
   ];
   var _pConfig_input;
-  const input = await (0, _input.normalizeInput)((_pConfig_input = pConfig.input) !== null && _pConfig_input !== void 0 ? _pConfig_input : defaultIndexEntry, context.appDirectory);
+  const input = await (0, _input.normalizeInput)((_pConfig_input = pConfig.input) !== null && _pConfig_input !== void 0 ? _pConfig_input : defaultIndexEntry, context.appDirectory, Boolean((_asset = asset) === null || _asset === void 0 ? void 0 : _asset.svgr));
   var _pConfig_define;
   const userDefine = (_pConfig_define = pConfig.define) !== null && _pConfig_define !== void 0 ? _pConfig_define : {};
   const define = {
@@ -94,10 +98,7 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
   const esbuildOptions = (_pConfig_esbuildOptions = pConfig.esbuildOptions) !== null && _pConfig_esbuildOptions !== void 0 ? _pConfig_esbuildOptions : defaultConfig.esbuildOptions;
   var _pConfig_format, _pConfig_target, _pConfig_sourceMap, _pConfig_copy, _pConfig_outDir, _pConfig_jsx, _pConfig_platform, _pConfig_splitting, _pConfig_minify, _pConfig_umdModuleName, _pConfig_sideEffects, _pConfig_style_inject, _pConfig_style_modules, _pConfig_style_autoModules, _pConfig_style_tailwindcss, _pConfig_externalHelpers, _pConfig_transformImport, _pConfig_transformLodash, _pConfig_sourceType, _pConfig_disableSwcTransform;
   return {
-    asset: {
-      ...defaultConfig.asset,
-      ...pConfig.asset
-    },
+    asset,
     buildType,
     format: (_pConfig_format = pConfig.format) !== null && _pConfig_format !== void 0 ? _pConfig_format : defaultConfig.format,
     target: (_pConfig_target = pConfig.target) !== null && _pConfig_target !== void 0 ? _pConfig_target : defaultConfig.target,

package/dist/config/merge.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":null,"mappings":";;;;;;;;;;;;EAaaA,wBAAsB;WAAtBA;;EAiJAC,oBAAkB;WAAlBA;;;;uBA9JY;yBASE;uBACI;uBACO;AAE/B,MAAMD,yBAAyB,OACpCE,SACAC;MA0HYD,gBACCA,iBAEPA,iBAEAA;AA7HN,QAAME,iBAAgBC,iCAAqB;AAC3C,QAAM,EAAEC,SAASC,gBAAe,IAAKJ;AACrC,QAAM,EAAEK,mBAAmBC,oBAAoBC,MAAK,IAAK,MAAM,iFAC7D;AAEF,QAAM,EAAEC,qBAAoB,IAAK,MAAM,iFAAO;AAC9C,QAAM,EAAEC,eAAc,IAAK,MAAM,iFAAO;AACxC,QAAMC,eAAe;IACnB,KAAKP,QAAQQ;EACf;AACA,QAAMC,cAAcP,kBAAkBK,cAAcX,QAAQc,KAAK;AAOjE,QAAMA,QAAQC,OAAOC,KAAKH,aAAaI,OACrC,CAACC,MAAMC;AACL,UAAMC,iBAAiB,CAACC;AACtB,UAAI,OAAOA,WAAU,YAAYA,OAAMC,WAAW,MAAM;AACtD,eAAOd,MAAMD,mBAAmBH,QAAQmB,cAAcF;MACxD;AACA,aAAOA;IACT;AACA,UAAMA,QAAQD,eAAeP,YAAYM,KAAK;AAE9CD,SAAKC,QAAQE;AACb,WAAOH;EACT,GACA,CAAC;AAGH,QAAMM,cAAc,MAAMd,eAAeV;MACvBA;AAAlB,QAAMyB,aAAYzB,6BAAQyB,eAAS,QAAjBzB,qDAAqBE,cAAcuB;MACnCzB;AAAlB,QAAM0B,aAAY1B,6BAAQ0B,eAAS,QAAjB1B,qDAAqBE,cAAcwB;MACpC1B;AAAjB,QAAM2B,YAAW3B,4BAAQ2B,cAAQ,QAAhB3B,mDAAoBE,cAAcyB;AACnD,QAAMC,oBACJH,cAAc,WAAW,MAAMhB,qBAAqBL,WAAW;IAACsB;;MAEhE1B;AADF,QAAM6B,QAAQ,OAAMC,2BAClB9B,yBAAQ6B,WAAK,QAAb7B,6CAAiB4B,mBACjBxB,QAAQmB,YAAY;MAEHvB;AAAnB,QAAM+B,cAAa/B,0BAAQgC,YAAM,QAAdhC,+CAAkB,CAAC;AACtC,QAAMgC,SAAS;IACb,GAAG9B,cAAc8B;IACjB,GAAGjB,OAAOC,KAAKe,YAAYd,OAA+B,CAACgB,MAAMd;AAC/Dc,WAAKd,QAAQe,KAAKC,UAAUJ,WAAWZ,KAAK;AAC5C,aAAOc;IACT,GAAG,CAAC;EACN;AACA,QAAM,EAAEG,KAAKC,QAAQC,UAAUC,gBAAe,IAAKlC;AAGnD,QAAMmC,QAAQH,WAAW,SAASrC,QAAQoC,QAAQ;AAElD,QAAMA,MAAMI,QACR,QACC;IACC,GAAGtC,cAAckC;IACjB,GAAGpC,QAAQoC;EACb;AAEJ,MAAIA,KAAK;AACP,QAAIG,iBAAiB;AACnBH,UAAIK,eAAeF;IACrB;EACF;MACgBvC;AAAhB,MAAI0C,aAAY1C,6BAAQ0C,eAAS,QAAjB1C,qDAAqBE,cAAcwC;MAE9B1C;AAArB,QAAM2C,gBAAe3C,gCAAQ2C,kBAAY,QAApB3C,2DAAwBE,cAAcyC;AAE3D,MAAIA,cAAc;AAChB,UAAMC,OAAO,OAAMC,wBACjBzC,QAAQmB,eACRuB,oBAASH,gBACLA,eACA;MACEI,cAAc;MACdC,kBAAkB;IACpB;AAENN,gBAAY;SACPE,KAAKK,IAAIC,SAAO,IAAIC,OAAO,IAAID,iBAAiB;SAC/CR,aAAa;;EAErB;MAEuB1C;AAAvB,QAAMoD,kBAAiBpD,kCAAQoD,oBAAc,QAAtBpD,+DAA0BE,cAAckD;MAOrDpD,iBACAA,iBACGA,oBACLA,eACEA,iBAEHA,cAEKA,mBACCA,oBACHA,iBAMOA,wBACFA,sBAQHA,uBACCA,wBAEPA,4BAEAA,4BAOaA,0BACAA,0BACAA,0BACLA,qBAEVA;AAhDJ,SAAO;IACLqD,OAAO;MACL,GAAGnD,cAAcmD;MACjB,GAAGrD,QAAQqD;IACb;IACA5B;IACA6B,SAAQtD,0BAAQsD,YAAM,QAAdtD,+CAAkBE,cAAcoD;IACxCC,SAAQvD,0BAAQuD,YAAM,QAAdvD,+CAAkBE,cAAcqD;IACxCC,YAAWxD,6BAAQwD,eAAS,QAAjBxD,qDAAqBE,cAAcsD;IAC9CC,OAAMzD,wBAAQyD,UAAI,QAAZzD,2CAAgBE,cAAcuD;IACpCC,SAAQ1D,0BAAQ0D,YAAM,QAAd1D,+CAAkBE,cAAcwD;IACxCtB;IACAuB,MAAK3D,uBAAQ2D,SAAG,QAAX3D,yCAAeE,cAAcyD;IAClC9B;IACA+B,WAAU5D,4BAAQ4D,cAAQ,QAAhB5D,mDAAoBE,cAAc0D;IAC5CC,YAAW7D,6BAAQ6D,eAAS,QAAjB7D,qDAAqBE,cAAc2D;IAC9CC,SAAQ9D,0BAAQ8D,YAAM,QAAd9D,+CAAkBE,cAAc4D;IACxCnB;IACAoB,YAAY;MACV,GAAG7D,cAAc6D;MACjB,GAAG/D,QAAQ+D;IACb;IACAC,gBAAehE,iCAAQgE,mBAAa,QAArBhE,6DAAyBE,cAAc8D;IACtDC,cAAajE,+BAAQiE,iBAAW,QAAnBjE,yDAAuBE,cAAc+D;IAClDvB;IACAhB;IACAZ;IACAkB;IACAL;IACAuC,OAAO;MACL,GAAG1C;MACH2C,SAAQnE,kDAAQkE,WAAK,QAAblE,oDAAemE,YAAM,QAArBnE,2DAAyBE,cAAcgE,MAAMC;MACrDC,UAASpE,oDAAQkE,WAAK,QAAblE,sDAAeoE,aAAO,QAAtBpE,6DAA0BE,cAAcgE,MAAME;MACvDC,cACErE,wDAAQkE,WAAK,QAAblE,sDAAeqE,iBAAW,QAA1BrE,qEAA8BE,cAAcgE,MAAMG;MACpDC,cACEtE,wDAAQkE,WAAK,QAAblE,sDAAesE,iBAAW,QAA1BtE,qEAA8BE,cAAcgE,MAAMI;IACtD;IACAC,UAAU;MACR,GAAGrE,cAAcqE;MACjB,GAAGvE,QAAQuE;IACb;IACAnB;IACAoB,kBAAiBxE,mCAAQwE,qBAAe,QAAvBxE,iEAA2BE,cAAcsE;IAC1DC,kBAAiBzE,mCAAQyE,qBAAe,QAAvBzE,iEAA2BE,cAAcuE;IAC1DC,kBAAiB1E,mCAAQ0E,qBAAe,QAAvB1E,iEAA2BE,cAAcwE;IAC1DC,aAAY3E,8BAAQ2E,gBAAU,QAAlB3E,uDAAsBE,cAAcyE;IAChDC,sBACE5E,uCAAQ4E,yBAAmB,QAA3B5E,yEAA+BE,cAAc0E;EACjD;AACF;AAEO,MAAM7E,qBAAqB,CAAC8E,WAEKC,QAAQD,OAAOE,MAAM;","names":["mergeDefaultBaseConfig","isLegacyUserConfig","pConfig","options","defaultConfig","getDefaultBuildConfig","context","buildCmdOptions","applyOptionsChain","ensureAbsolutePath","slash","getDefaultIndexEntry","getStyleConfig","defaultAlias","srcDirectory","mergedAlias","alias","Object","keys","reduce","prev","name","formattedValue","value","startsWith","appDirectory","styleConfig","buildType","sourceDir","metafile","defaultIndexEntry","input","normalizeInput","userDefine","define","memo","JSON","stringify","dts","cmdDts","tsconfig","cmdTsconfigPath","noDts","tsconfigPath","externals","autoExternal","deps","getAllDeps","isObject","dependencies","peerDependencies","map","dep","RegExp","esbuildOptions","asset","format","target","sourceMap","copy","outDir","jsx","platform","splitting","minify","umdGlobals","umdModuleName","sideEffects","style","inject","modules","autoModules","tailwindcss","redirect","externalHelpers","transformImport","transformLodash","sourceType","disableSwcTransform","config","Boolean","legacy"],"sources":["../../src/config/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/config/merge.ts"],"sourcesContent":["import { isObject } from '@modern-js/utils';\nimport { ModuleContext } from '../types';\nimport type {\n BaseBuildConfig,\n PartialBaseBuildConfig,\n DTSOptions,\n ModuleLegacyUserConfig,\n BuildCommandOptions,\n} from '../types';\nimport { getAllDeps } from '../utils/builder';\nimport { normalizeInput } from '../utils/input';\nimport { getDefaultBuildConfig } from '../constants/build';\n\nexport const mergeDefaultBaseConfig = async (\n pConfig: PartialBaseBuildConfig,\n options: { context: ModuleContext; buildCmdOptions: BuildCommandOptions },\n): Promise<BaseBuildConfig> => {\n const defaultConfig = getDefaultBuildConfig();\n const { context, buildCmdOptions } = options;\n const { applyOptionsChain, ensureAbsolutePath, slash } = await import(\n '@modern-js/utils'\n );\n const { getDefaultIndexEntry } = await import('../utils/input');\n const { getStyleConfig } = await import('../utils/style');\n const defaultAlias = {\n '@': context.srcDirectory,\n };\n const mergedAlias = applyOptionsChain(defaultAlias, pConfig.alias);\n\n /*\n Format alias value:\n * - Relative paths need to be turned into absolute paths.\n * - Absolute paths or a package name are not processed.\n */\n const alias = Object.keys(mergedAlias).reduce<Record<string, string>>(\n (prev, name) => {\n const formattedValue = (value: string) => {\n if (typeof value === 'string' && value.startsWith('.')) {\n return slash(ensureAbsolutePath(context.appDirectory, value));\n }\n return value;\n };\n const value = formattedValue(mergedAlias[name]);\n\n prev[name] = value;\n return prev;\n },\n {},\n );\n\n const styleConfig = await getStyleConfig(pConfig);\n const buildType = pConfig.buildType ?? defaultConfig.buildType;\n const sourceDir = pConfig.sourceDir ?? defaultConfig.sourceDir;\n const metafile = pConfig.metafile ?? defaultConfig.metafile;\n const defaultIndexEntry =\n buildType === 'bundle' ? await getDefaultIndexEntry(context) : [sourceDir];\n const input = await normalizeInput(\n pConfig.input ?? defaultIndexEntry,\n context.appDirectory,\n );\n const userDefine = pConfig.define ?? {};\n const define = {\n ...defaultConfig.define,\n ...Object.keys(userDefine).reduce<Record<string, string>>((memo, name) => {\n memo[name] = JSON.stringify(userDefine[name]!);\n return memo;\n }, {}),\n };\n const { dts: cmdDts, tsconfig: cmdTsconfigPath } = buildCmdOptions;\n\n // Impact eslint complexity\n const noDts = cmdDts === false \|\| pConfig.dts === false;\n\n const dts = noDts\n ? false\n : ({\n ...defaultConfig.dts,\n ...pConfig.dts,\n } as DTSOptions);\n\n if (dts) {\n if (cmdTsconfigPath) {\n dts.tsconfigPath = cmdTsconfigPath;\n }\n }\n let externals = pConfig.externals ?? defaultConfig.externals;\n\n const autoExternal = pConfig.autoExternal ?? defaultConfig.autoExternal;\n\n if (autoExternal) {\n const deps = await getAllDeps(\n context.appDirectory,\n isObject(autoExternal)\n ? autoExternal\n : {\n dependencies: true,\n peerDependencies: true,\n },\n );\n externals = [\n ...deps.map(dep => new RegExp(`^${dep}($\|\\\\/\|\\\\\\\\)`)),\n ...(externals \|\| []),\n ];\n }\n\n const esbuildOptions = pConfig.esbuildOptions ?? defaultConfig.esbuildOptions;\n return {\n asset: {\n ...defaultConfig.asset,\n ...pConfig.asset,\n },\n buildType,\n format: pConfig.format ?? defaultConfig.format,\n target: pConfig.target ?? defaultConfig.target,\n sourceMap: pConfig.sourceMap ?? defaultConfig.sourceMap,\n copy: pConfig.copy ?? defaultConfig.copy,\n outDir: pConfig.outDir ?? defaultConfig.outDir,\n dts,\n jsx: pConfig.jsx ?? defaultConfig.jsx,\n input,\n platform: pConfig.platform ?? defaultConfig.platform,\n splitting: pConfig.splitting ?? defaultConfig.splitting,\n minify: pConfig.minify ?? defaultConfig.minify,\n autoExternal,\n umdGlobals: {\n ...defaultConfig.umdGlobals,\n ...pConfig.umdGlobals,\n },\n umdModuleName: pConfig.umdModuleName ?? defaultConfig.umdModuleName,\n sideEffects: pConfig.sideEffects ?? defaultConfig.sideEffects,\n externals,\n sourceDir,\n alias,\n define,\n metafile,\n style: {\n ...styleConfig,\n inject: pConfig.style?.inject ?? defaultConfig.style.inject,\n modules: pConfig.style?.modules ?? defaultConfig.style.modules,\n autoModules:\n pConfig.style?.autoModules ?? defaultConfig.style.autoModules,\n tailwindcss:\n pConfig.style?.tailwindcss ?? defaultConfig.style.tailwindcss,\n },\n redirect: {\n ...defaultConfig.redirect,\n ...pConfig.redirect,\n },\n esbuildOptions,\n externalHelpers: pConfig.externalHelpers ?? defaultConfig.externalHelpers,\n transformImport: pConfig.transformImport ?? defaultConfig.transformImport,\n transformLodash: pConfig.transformLodash ?? defaultConfig.transformLodash,\n sourceType: pConfig.sourceType ?? defaultConfig.sourceType,\n disableSwcTransform:\n pConfig.disableSwcTransform ?? defaultConfig.disableSwcTransform,\n };\n};\n\nexport const isLegacyUserConfig = (config: {\n legacy?: boolean;\n}): config is ModuleLegacyUserConfig => Boolean(config.legacy);\n"]}
1	+ {"version":3,"file":null,"mappings":"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","names":["mergeDefaultBaseConfig","isLegacyUserConfig","pConfig","options","asset","defaultConfig","getDefaultBuildConfig","context","buildCmdOptions","applyOptionsChain","ensureAbsolutePath","slash","getDefaultIndexEntry","getStyleConfig","defaultAlias","srcDirectory","mergedAlias","alias","Object","keys","reduce","prev","name","formattedValue","value","startsWith","appDirectory","styleConfig","buildType","sourceDir","metafile","defaultIndexEntry","input","normalizeInput","Boolean","svgr","userDefine","define","memo","JSON","stringify","dts","cmdDts","tsconfig","cmdTsconfigPath","noDts","tsconfigPath","externals","autoExternal","deps","getAllDeps","isObject","dependencies","peerDependencies","map","dep","RegExp","esbuildOptions","format","target","sourceMap","copy","outDir","jsx","platform","splitting","minify","umdGlobals","umdModuleName","sideEffects","style","inject","modules","autoModules","tailwindcss","redirect","externalHelpers","transformImport","transformLodash","sourceType","disableSwcTransform","config","legacy"],"sources":["../../src/config/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/config/merge.ts"],"sourcesContent":["import { isObject } from '@modern-js/utils';\nimport { ModuleContext } from '../types';\nimport type {\n BaseBuildConfig,\n PartialBaseBuildConfig,\n DTSOptions,\n ModuleLegacyUserConfig,\n BuildCommandOptions,\n} from '../types';\nimport { getAllDeps } from '../utils/builder';\nimport { normalizeInput } from '../utils/input';\nimport { getDefaultBuildConfig } from '../constants/build';\n\nexport const mergeDefaultBaseConfig = async (\n pConfig: PartialBaseBuildConfig,\n options: { context: ModuleContext; buildCmdOptions: BuildCommandOptions },\n): Promise<BaseBuildConfig> => {\n const defaultConfig = getDefaultBuildConfig();\n const { context, buildCmdOptions } = options;\n const { applyOptionsChain, ensureAbsolutePath, slash } = await import(\n '@modern-js/utils'\n );\n const { getDefaultIndexEntry } = await import('../utils/input');\n const { getStyleConfig } = await import('../utils/style');\n const defaultAlias = {\n '@': context.srcDirectory,\n };\n const mergedAlias = applyOptionsChain(defaultAlias, pConfig.alias);\n\n /*\n Format alias value:\n * - Relative paths need to be turned into absolute paths.\n * - Absolute paths or a package name are not processed.\n */\n const alias = Object.keys(mergedAlias).reduce<Record<string, string>>(\n (prev, name) => {\n const formattedValue = (value: string) => {\n if (typeof value === 'string' && value.startsWith('.')) {\n return slash(ensureAbsolutePath(context.appDirectory, value));\n }\n return value;\n };\n const value = formattedValue(mergedAlias[name]);\n\n prev[name] = value;\n return prev;\n },\n {},\n );\n\n const styleConfig = await getStyleConfig(pConfig);\n const buildType = pConfig.buildType ?? defaultConfig.buildType;\n const sourceDir = pConfig.sourceDir ?? defaultConfig.sourceDir;\n const metafile = pConfig.metafile ?? defaultConfig.metafile;\n const asset = {\n ...defaultConfig.asset,\n ...pConfig.asset,\n };\n const defaultIndexEntry =\n buildType === 'bundle' ? await getDefaultIndexEntry(context) : [sourceDir];\n const input = await normalizeInput(\n pConfig.input ?? defaultIndexEntry,\n context.appDirectory,\n Boolean(asset?.svgr),\n );\n const userDefine = pConfig.define ?? {};\n const define = {\n ...defaultConfig.define,\n ...Object.keys(userDefine).reduce<Record<string, string>>((memo, name) => {\n memo[name] = JSON.stringify(userDefine[name]!);\n return memo;\n }, {}),\n };\n const { dts: cmdDts, tsconfig: cmdTsconfigPath } = buildCmdOptions;\n\n // Impact eslint complexity\n const noDts = cmdDts === false \|\| pConfig.dts === false;\n\n const dts = noDts\n ? false\n : ({\n ...defaultConfig.dts,\n ...pConfig.dts,\n } as DTSOptions);\n\n if (dts) {\n if (cmdTsconfigPath) {\n dts.tsconfigPath = cmdTsconfigPath;\n }\n }\n let externals = pConfig.externals ?? defaultConfig.externals;\n\n const autoExternal = pConfig.autoExternal ?? defaultConfig.autoExternal;\n\n if (autoExternal) {\n const deps = await getAllDeps(\n context.appDirectory,\n isObject(autoExternal)\n ? autoExternal\n : {\n dependencies: true,\n peerDependencies: true,\n },\n );\n externals = [\n ...deps.map(dep => new RegExp(`^${dep}($\|\\\\/\|\\\\\\\\)`)),\n ...(externals \|\| []),\n ];\n }\n\n const esbuildOptions = pConfig.esbuildOptions ?? defaultConfig.esbuildOptions;\n return {\n asset,\n buildType,\n format: pConfig.format ?? defaultConfig.format,\n target: pConfig.target ?? defaultConfig.target,\n sourceMap: pConfig.sourceMap ?? defaultConfig.sourceMap,\n copy: pConfig.copy ?? defaultConfig.copy,\n outDir: pConfig.outDir ?? defaultConfig.outDir,\n dts,\n jsx: pConfig.jsx ?? defaultConfig.jsx,\n input,\n platform: pConfig.platform ?? defaultConfig.platform,\n splitting: pConfig.splitting ?? defaultConfig.splitting,\n minify: pConfig.minify ?? defaultConfig.minify,\n autoExternal,\n umdGlobals: {\n ...defaultConfig.umdGlobals,\n ...pConfig.umdGlobals,\n },\n umdModuleName: pConfig.umdModuleName ?? defaultConfig.umdModuleName,\n sideEffects: pConfig.sideEffects ?? defaultConfig.sideEffects,\n externals,\n sourceDir,\n alias,\n define,\n metafile,\n style: {\n ...styleConfig,\n inject: pConfig.style?.inject ?? defaultConfig.style.inject,\n modules: pConfig.style?.modules ?? defaultConfig.style.modules,\n autoModules:\n pConfig.style?.autoModules ?? defaultConfig.style.autoModules,\n tailwindcss:\n pConfig.style?.tailwindcss ?? defaultConfig.style.tailwindcss,\n },\n redirect: {\n ...defaultConfig.redirect,\n ...pConfig.redirect,\n },\n esbuildOptions,\n externalHelpers: pConfig.externalHelpers ?? defaultConfig.externalHelpers,\n transformImport: pConfig.transformImport ?? defaultConfig.transformImport,\n transformLodash: pConfig.transformLodash ?? defaultConfig.transformLodash,\n sourceType: pConfig.sourceType ?? defaultConfig.sourceType,\n disableSwcTransform:\n pConfig.disableSwcTransform ?? defaultConfig.disableSwcTransform,\n };\n};\n\nexport const isLegacyUserConfig = (config: {\n legacy?: boolean;\n}): config is ModuleLegacyUserConfig => Boolean(config.legacy);\n"]}

package/dist/locale/en.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ export declare const EN_LOCALE: {
   command: {
     shared: {
       config: string;
+      noNeedInstall: string;
     };
     build: {
       describe: string;

package/dist/locale/en.js CHANGED Viewed

@@ -15,7 +15,8 @@ const noDevTools = `There are no DevTools available, you can learn about them an
 const EN_LOCALE = {
   command: {
     shared: {
-      config: "sspecify the configuration file, which can be a relative or absolute path"
+      config: "sspecify the configuration file, which can be a relative or absolute path",
+      noNeedInstall: "not run install command"
     },
     build: {
       describe: "build the module for production",

package/dist/locale/en.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":null,"mappings":";;;;+BASaA;;;WAAAA;;;uBATS;AAEtB,MAAMC,aAAa;MACbC,aAAMC,UACRD,aAAME,KAAK,gBACX;;AAIG,MAAMJ,YAAY;EACvBK,SAAS;IACPC,QAAQ;MACNC,QACE;~~IACJ~~;IACAC,OAAO;MACLC,UAAU;MACVC,OAAO;MACPC,UAAU;MACVC,WAAW;MACXC,UACE;MACFC,OAAO;MACPC,KAAK;MACLC,SAAS;IACX;IACAC,KAAK;MACHR,UAAU;MACVE,UAAU;IACZ;IACAO,KAAK;MACHT,UAAU;MACVU,OAAO;~~MACPZ~~,QAAQ;~~MACRa~~,SAAS;MACTC,UAAU;MACVC,MAAM;IACR;EACF;EACAC,KAAK;IACHN,KAAK;MACHO,~~YAAYvB~~;IACd;~~IACAwB~~,gBACE;EACJ;EACAC,QAAQ;IACNC,iBAAiB;~~QACbzB~~,aAAME,KAAK;QACXF,~~aAAM0B~~,OAAO,~~8BAA8B1B~~,~~aAAM0B~~,OACnD;;~~QAGE1B~~,aAAME,KAAK;QACXF,~~aAAM0B~~,OAAO,+BAA+~~B1B~~,~~aAAM0B~~,OACpD;;~~QAGE1B~~,aAAME,KAAK;QACXF,~~aAAM0B~~,OAAO,~~iCAAiC1B~~,~~aAAM0B~~,OACtD;;EAGJ;EACAC,OAAO;IACLd,KAAK;MACHe,cACE;IACJ;IACAC,eACE;EACJ;AACF;","names":["EN_LOCALE","noDevTools","chalk","underline","blue","command","shared","config","build","describe","watch","tsconfig","styleOnly","platform","noTsc","dts","noClear","dev","new","debug","distTag","registry","lang","log","noDevtools","buildConfigTip","errors","externalHelpers","yellow","warns","abortOnError","clearRootPath"],"sources":["../../src/locale/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/locale/en.ts"],"sourcesContent":["import { chalk } from '@modern-js/utils';\n\nconst noDevTools = `There are no DevTools available, you can learn about them and choose to use them by following the link options.\n - ${chalk.underline(\n chalk.blue('[Storybook]'),\n 'https://modernjs.dev/module-tools/guide/basic/using-storybook.html',\n )}\n`;\n\nexport const EN_LOCALE = {\n command: {\n shared: {\n config:\n 'sspecify the configuration file, which can be a relative or absolute path',\n },\n build: {\n describe: 'build the module for production',\n watch: 'building module in watch mode',\n tsconfig: 'Specify a path to the tsconfig.json file',\n styleOnly: 'only build style',\n platform:\n 'build the specified task or all tasks, If exist. (tasks: \"storybook\", \"docs\")',\n noTsc: 'close tsc compiler to emit d.ts (Deprecated)',\n dts: 'Turn on dts generation and type checking',\n noClear: 'disable auto clear dist dir',\n },\n dev: {\n describe: 'run and debug the module',\n tsconfig: 'Specify a path to the tsconfig.json file',\n },\n new: {\n describe: 'enable optional features',\n debug: 'using debug mode to log something',\n config: 'set default generator config(json string)',\n distTag: `use specified tag version for it's generator`,\n registry: 'set npm registry url to run npm command',\n lang: 'set new command language(en or zh)',\n },\n },\n log: {\n dev: {\n noDevtools: noDevTools,\n },\n buildConfigTip:\n 'The configuration file of the current project has both `buildConfig` and `buildPreset` options. However, only the `buildConfig` configuration will take effect. If you need to override the content of `buildPreset`, please use the function type of `buildPreset` (refer to the API documentation for details).',\n },\n errors: {\n externalHelpers: `The 'externalHelpers' configuration is currently enabled, but the \"@swc/helpers\" dependency declaration was not found. This will cause issues with the build output.Use the following for installation:\n ${chalk.blue('Package Manager is npm:')}\n ${chalk.yellow('`npm i @swc/helpers`')} Or ${chalk.yellow(\n '`npm i @swc/helpers -D`',\n )}\n\n ${chalk.blue('Package Manager is pnpm:')}\n ${chalk.yellow('`pnpm i @swc/helpers`')} Or ${chalk.yellow(\n '`pnpm i @swc/helpers -D`',\n )}\n\n ${chalk.blue('Package Manager is yarn:')}\n ${chalk.yellow('`yarn add @swc/helpers`')} Or ${chalk.yellow(\n '`yarn add @swc/helpers -D`',\n )}\n `,\n },\n warns: {\n dts: {\n abortOnError:\n 'With the `dts.abortOnError` configuration currently turned off, type errors do not cause build failures, but they do not guarantee proper type file output',\n },\n clearRootPath:\n 'It is detected that the outDir in the configuration is the same as the current project directory, and the current product directory will not be automatically deleted.',\n },\n};\n"]}
1	+ {"version":3,"file":null,"mappings":";;;;+BASaA;;;WAAAA;;;uBATS;AAEtB,MAAMC,aAAa;MACbC,aAAMC,UACRD,aAAME,KAAK,gBACX;;AAIG,MAAMJ,YAAY;EACvBK,SAAS;IACPC,QAAQ;MACNC,QACE;MACFC,eAAe;IACjB;IACAC,OAAO;MACLC,UAAU;MACVC,OAAO;MACPC,UAAU;MACVC,WAAW;MACXC,UACE;MACFC,OAAO;MACPC,KAAK;MACLC,SAAS;IACX;IACAC,KAAK;MACHR,UAAU;MACVE,UAAU;IACZ;IACAO,KAAK;MACHT,UAAU;MACVU,OAAO;MACPb,QAAQ;MACRc,SAAS;MACTC,UAAU;MACVC,MAAM;IACR;EACF;EACAC,KAAK;IACHN,KAAK;MACHO,YAAYxB;IACd;IACAyB,gBACE;EACJ;EACAC,QAAQ;IACNC,iBAAiB;QACb1B,aAAME,KAAK;QACXF,aAAM2B,OAAO,8BAA8B3B,aAAM2B,OACnD;;QAGE3B,aAAME,KAAK;QACXF,aAAM2B,OAAO,+BAA+B3B,aAAM2B,OACpD;;QAGE3B,aAAME,KAAK;QACXF,aAAM2B,OAAO,iCAAiC3B,aAAM2B,OACtD;;EAGJ;EACAC,OAAO;IACLd,KAAK;MACHe,cACE;IACJ;IACAC,eACE;EACJ;AACF;","names":["EN_LOCALE","noDevTools","chalk","underline","blue","command","shared","config","noNeedInstall","build","describe","watch","tsconfig","styleOnly","platform","noTsc","dts","noClear","dev","new","debug","distTag","registry","lang","log","noDevtools","buildConfigTip","errors","externalHelpers","yellow","warns","abortOnError","clearRootPath"],"sources":["../../src/locale/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/locale/en.ts"],"sourcesContent":["import { chalk } from '@modern-js/utils';\n\nconst noDevTools = `There are no DevTools available, you can learn about them and choose to use them by following the link options.\n - ${chalk.underline(\n chalk.blue('[Storybook]'),\n 'https://modernjs.dev/module-tools/guide/basic/using-storybook.html',\n )}\n`;\n\nexport const EN_LOCALE = {\n command: {\n shared: {\n config:\n 'sspecify the configuration file, which can be a relative or absolute path',\n noNeedInstall: 'not run install command',\n },\n build: {\n describe: 'build the module for production',\n watch: 'building module in watch mode',\n tsconfig: 'Specify a path to the tsconfig.json file',\n styleOnly: 'only build style',\n platform:\n 'build the specified task or all tasks, If exist. (tasks: \"storybook\", \"docs\")',\n noTsc: 'close tsc compiler to emit d.ts (Deprecated)',\n dts: 'Turn on dts generation and type checking',\n noClear: 'disable auto clear dist dir',\n },\n dev: {\n describe: 'run and debug the module',\n tsconfig: 'Specify a path to the tsconfig.json file',\n },\n new: {\n describe: 'enable optional features',\n debug: 'using debug mode to log something',\n config: 'set default generator config(json string)',\n distTag: `use specified tag version for it's generator`,\n registry: 'set npm registry url to run npm command',\n lang: 'set new command language(en or zh)',\n },\n },\n log: {\n dev: {\n noDevtools: noDevTools,\n },\n buildConfigTip:\n 'The configuration file of the current project has both `buildConfig` and `buildPreset` options. However, only the `buildConfig` configuration will take effect. If you need to override the content of `buildPreset`, please use the function type of `buildPreset` (refer to the API documentation for details).',\n },\n errors: {\n externalHelpers: `The 'externalHelpers' configuration is currently enabled, but the \"@swc/helpers\" dependency declaration was not found. This will cause issues with the build output.Use the following for installation:\n ${chalk.blue('Package Manager is npm:')}\n ${chalk.yellow('`npm i @swc/helpers`')} Or ${chalk.yellow(\n '`npm i @swc/helpers -D`',\n )}\n\n ${chalk.blue('Package Manager is pnpm:')}\n ${chalk.yellow('`pnpm i @swc/helpers`')} Or ${chalk.yellow(\n '`pnpm i @swc/helpers -D`',\n )}\n\n ${chalk.blue('Package Manager is yarn:')}\n ${chalk.yellow('`yarn add @swc/helpers`')} Or ${chalk.yellow(\n '`yarn add @swc/helpers -D`',\n )}\n `,\n },\n warns: {\n dts: {\n abortOnError:\n 'With the `dts.abortOnError` configuration currently turned off, type errors do not cause build failures, but they do not guarantee proper type file output',\n },\n clearRootPath:\n 'It is detected that the outDir in the configuration is the same as the current project directory, and the current product directory will not be automatically deleted.',\n },\n};\n"]}

package/dist/locale/index.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ declare const localeKeys: {
   command: {
     shared: {
       config: string;
+      noNeedInstall: string;
     };
     build: {
       describe: string;
@@ -46,6 +47,7 @@ declare const localeKeys: {
   command: {
     shared: {
       config: string;
+      noNeedInstall: string;
     };
     build: {
       describe: string;

package/dist/locale/zh.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ export declare const ZH_LOCALE: {
   command: {
     shared: {
       config: string;
+      noNeedInstall: string;
     };
     build: {
       describe: string;

package/dist/locale/zh.js CHANGED Viewed

@@ -15,7 +15,8 @@ const noDevTools = `暂无可用的 DevTools，你可以通过以下选项以及
 const ZH_LOCALE = {
   command: {
     shared: {
-      config: "指定配置文件路径，可以为相对路径或绝对路径"
+      config: "指定配置文件路径，可以为相对路径或绝对路径",
+      noNeedInstall: "无需安装依赖"
     },
     build: {
       describe: "构建生产环境产物",

package/dist/locale/zh.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":null,"mappings":";;;;+BASaA;;;WAAAA;;;uBATS;AAEtB,MAAMC,aAAa;MACbC,aAAMC,UACRD,aAAME,KAAK,iBACX;;AAIG,MAAMJ,YAAY;EACvBK,SAAS;IACPC,QAAQ;MACNC,QAAQ;~~IACV~~;IACAC,OAAO;MACLC,UAAU;MACVC,OAAO;MACPC,UAAU;MACVC,WAAW;MACXC,UACE;MACFC,OAAO;MACPC,KAAK;MACLC,SAAS;IACX;IACAC,KAAK;MACHR,UAAU;MACVE,UAAU;IACZ;IACAO,KAAK;MACHT,UAAU;MACVU,OAAO;~~MACPZ~~,QAAQ;~~MACRa~~,SAAS;MACTC,UAAU;MACVC,MAAM;IACR;EACF;EACAC,KAAK;IACHN,KAAK;MACHO,~~YAAYvB~~;IACd;~~IACAwB~~,gBACE;EACJ;EACAC,QAAQ;IACNC,iBAAiB;~~QACbzB~~,aAAME,KAAK;QACXF,~~aAAM0B~~,OAAO,~~8BAA8B1B~~,~~aAAM0B~~,OACnD;;~~QAGE1B~~,aAAME,KAAK;QACXF,~~aAAM0B~~,OAAO,+BAA+~~B1B~~,~~aAAM0B~~,OACpD;;~~QAGE1B~~,aAAME,KAAK;QACXF,~~aAAM0B~~,OAAO,~~iCAAiC1B~~,~~aAAM0B~~,OACtD;;EAGJ;EACAC,OAAO;IACLd,KAAK;MACHe,cACE;IACJ;IACAC,eACE;EACJ;AACF;","names":["ZH_LOCALE","noDevTools","chalk","underline","blue","command","shared","config","build","describe","watch","tsconfig","styleOnly","platform","noTsc","dts","noClear","dev","new","debug","distTag","registry","lang","log","noDevtools","buildConfigTip","errors","externalHelpers","yellow","warns","abortOnError","clearRootPath"],"sources":["../../src/locale/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/locale/zh.ts"],"sourcesContent":["import { chalk } from '@modern-js/utils';\n\nconst noDevTools = `暂无可用的 DevTools，你可以通过以下选项以及对应的链接来了解如何使用。\n - ${chalk.underline(\n chalk.blue('[Storybook]:'),\n 'https://modernjs.dev/module-tools/guide/basic/using-storybook.html',\n )}\n`;\n\nexport const ZH_LOCALE = {\n command: {\n shared: {\n config: '指定配置文件路径，可以为相对路径或绝对路径',\n },\n build: {\n describe: '构建生产环境产物',\n watch: '使用 Watch 模式构建模块',\n tsconfig: '指定 tsconfig.json 文件的路径',\n styleOnly: '只构建样式文件',\n platform:\n '如果存在的话，执行指定的构建任务或者全部构建任务. (构建任务包括: \"storybook\", \"文档\")',\n noTsc: '关闭 tsc 编译（废弃）',\n dts: '开启 dts 文件的生成以及类型检查',\n noClear: '不清理产物目录',\n },\n dev: {\n describe: '运行和调试模块',\n tsconfig: '指定 tsconfig.json 文件的路径',\n },\n new: {\n describe: '启用可选功能',\n debug: '开启 Debug 模式，打印调试日志信息',\n config: '生成器运行默认配置(JSON 字符串)',\n distTag: '生成器使用特殊的 npm Tag 版本',\n registry: '生成器运行过程中定制 npm Registry',\n lang: '设置 new 命令执行语言(zh 或者 en)',\n },\n },\n log: {\n dev: {\n noDevtools: noDevTools,\n },\n buildConfigTip:\n '当前项目的配置文件中同时设置了 `buildConfig` 和 `buildPreset`，因此仅有 `buildConfig` 配置能够生效。如果你需要覆盖 `buildPreset` 的内容，请使用 `buildPreset` 的函数配置方式（详见 API 文档）。',\n },\n errors: {\n externalHelpers: `当前开启了 'externalHelpers' 配置，未找到 \"@swc/helpers\" 依赖声明，构建产物会存在问题。使用下面的方式进行安装：\n ${chalk.blue('Package Manager is npm:')}\n ${chalk.yellow('`npm i @swc/helpers`')} Or ${chalk.yellow(\n '`npm i @swc/helpers -D`',\n )}\n\n ${chalk.blue('Package Manager is pnpm:')}\n ${chalk.yellow('`pnpm i @swc/helpers`')} Or ${chalk.yellow(\n '`pnpm i @swc/helpers -D`',\n )}\n\n ${chalk.blue('Package Manager is yarn:')}\n ${chalk.yellow('`yarn add @swc/helpers`')} Or ${chalk.yellow(\n '`yarn add @swc/helpers -D`',\n )}\n `,\n },\n warns: {\n dts: {\n abortOnError:\n '当前关闭了 `dts.abortOnError` 配置，类型错误不会导致构建失败，但无法保证类型文件正常输出',\n },\n clearRootPath:\n '检测到配置中 outDir 与当前项目目录相同，不会自动删除当前产物目录',\n },\n};\n"]}
1	+ {"version":3,"file":null,"mappings":";;;;+BASaA;;;WAAAA;;;uBATS;AAEtB,MAAMC,aAAa;MACbC,aAAMC,UACRD,aAAME,KAAK,iBACX;;AAIG,MAAMJ,YAAY;EACvBK,SAAS;IACPC,QAAQ;MACNC,QAAQ;MACRC,eAAe;IACjB;IACAC,OAAO;MACLC,UAAU;MACVC,OAAO;MACPC,UAAU;MACVC,WAAW;MACXC,UACE;MACFC,OAAO;MACPC,KAAK;MACLC,SAAS;IACX;IACAC,KAAK;MACHR,UAAU;MACVE,UAAU;IACZ;IACAO,KAAK;MACHT,UAAU;MACVU,OAAO;MACPb,QAAQ;MACRc,SAAS;MACTC,UAAU;MACVC,MAAM;IACR;EACF;EACAC,KAAK;IACHN,KAAK;MACHO,YAAYxB;IACd;IACAyB,gBACE;EACJ;EACAC,QAAQ;IACNC,iBAAiB;QACb1B,aAAME,KAAK;QACXF,aAAM2B,OAAO,8BAA8B3B,aAAM2B,OACnD;;QAGE3B,aAAME,KAAK;QACXF,aAAM2B,OAAO,+BAA+B3B,aAAM2B,OACpD;;QAGE3B,aAAME,KAAK;QACXF,aAAM2B,OAAO,iCAAiC3B,aAAM2B,OACtD;;EAGJ;EACAC,OAAO;IACLd,KAAK;MACHe,cACE;IACJ;IACAC,eACE;EACJ;AACF;","names":["ZH_LOCALE","noDevTools","chalk","underline","blue","command","shared","config","noNeedInstall","build","describe","watch","tsconfig","styleOnly","platform","noTsc","dts","noClear","dev","new","debug","distTag","registry","lang","log","noDevtools","buildConfigTip","errors","externalHelpers","yellow","warns","abortOnError","clearRootPath"],"sources":["../../src/locale/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/locale/zh.ts"],"sourcesContent":["import { chalk } from '@modern-js/utils';\n\nconst noDevTools = `暂无可用的 DevTools，你可以通过以下选项以及对应的链接来了解如何使用。\n - ${chalk.underline(\n chalk.blue('[Storybook]:'),\n 'https://modernjs.dev/module-tools/guide/basic/using-storybook.html',\n )}\n`;\n\nexport const ZH_LOCALE = {\n command: {\n shared: {\n config: '指定配置文件路径，可以为相对路径或绝对路径',\n noNeedInstall: '无需安装依赖',\n },\n build: {\n describe: '构建生产环境产物',\n watch: '使用 Watch 模式构建模块',\n tsconfig: '指定 tsconfig.json 文件的路径',\n styleOnly: '只构建样式文件',\n platform:\n '如果存在的话，执行指定的构建任务或者全部构建任务. (构建任务包括: \"storybook\", \"文档\")',\n noTsc: '关闭 tsc 编译（废弃）',\n dts: '开启 dts 文件的生成以及类型检查',\n noClear: '不清理产物目录',\n },\n dev: {\n describe: '运行和调试模块',\n tsconfig: '指定 tsconfig.json 文件的路径',\n },\n new: {\n describe: '启用可选功能',\n debug: '开启 Debug 模式，打印调试日志信息',\n config: '生成器运行默认配置(JSON 字符串)',\n distTag: '生成器使用特殊的 npm Tag 版本',\n registry: '生成器运行过程中定制 npm Registry',\n lang: '设置 new 命令执行语言(zh 或者 en)',\n },\n },\n log: {\n dev: {\n noDevtools: noDevTools,\n },\n buildConfigTip:\n '当前项目的配置文件中同时设置了 `buildConfig` 和 `buildPreset`，因此仅有 `buildConfig` 配置能够生效。如果你需要覆盖 `buildPreset` 的内容，请使用 `buildPreset` 的函数配置方式（详见 API 文档）。',\n },\n errors: {\n externalHelpers: `当前开启了 'externalHelpers' 配置，未找到 \"@swc/helpers\" 依赖声明，构建产物会存在问题。使用下面的方式进行安装：\n ${chalk.blue('Package Manager is npm:')}\n ${chalk.yellow('`npm i @swc/helpers`')} Or ${chalk.yellow(\n '`npm i @swc/helpers -D`',\n )}\n\n ${chalk.blue('Package Manager is pnpm:')}\n ${chalk.yellow('`pnpm i @swc/helpers`')} Or ${chalk.yellow(\n '`pnpm i @swc/helpers -D`',\n )}\n\n ${chalk.blue('Package Manager is yarn:')}\n ${chalk.yellow('`yarn add @swc/helpers`')} Or ${chalk.yellow(\n '`yarn add @swc/helpers -D`',\n )}\n `,\n },\n warns: {\n dts: {\n abortOnError:\n '当前关闭了 `dts.abortOnError` 配置，类型错误不会导致构建失败，但无法保证类型文件正常输出',\n },\n clearRootPath:\n '检测到配置中 outDir 与当前项目目录相同，不会自动删除当前产物目录',\n },\n};\n"]}

package/dist/utils/input.d.ts CHANGED Viewed

@@ -6,6 +6,6 @@ export declare const getDefaultIndexEntry: ({
   isTsProject: boolean;
   appDirectory: string;
 }) => Promise<string[]>;
-export declare const normalizeInput: (input: Input, appDirectory: string) => Promise<string[] | {
+export declare const normalizeInput: (input: Input, appDirectory: string, enableSvgr: boolean) => Promise<string[] | {
   [name: string]: string;
 }>;

package/dist/utils/input.js CHANGED Viewed

@@ -35,7 +35,7 @@ const getDefaultIndexEntry = async ({ isTsProject, appDirectory }) => {
   }
   return [];
 };
-const normalizeInput = async (input, appDirectory) => {
+const normalizeInput = async (input, appDirectory, enableSvgr) => {
   const extensions = [
     "js",
     "ts",
@@ -51,6 +51,9 @@ const normalizeInput = async (input, appDirectory) => {
     "less",
     "json"
   ];
+  if (enableSvgr) {
+    extensions.push("svg");
+  }
   if ((0, _utils.isArray)(input)) {
     const normalizedInput = await (0, _utils.globby)(input.map(_utils.slash), {
       expandDirectories: {

package/dist/utils/input.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":null,"mappings":";;;;;;;;;;;;EAIaA,sBAAoB;WAApBA;;EAoBAC,gBAAc;WAAdA;;;;iEAxBI;uBAC0B;AAGpC,MAAMD,uBAAuB,OAAO,EACzCE,aACAC,aAAY,MAIb;AACC,MAAIC,QAAQF,cAAc,iBAAiB;AAC3C,MAAIG,UAAGC,WAAWC,cAAKC,QAAQL,cAAcC,SAAS;AACpD,WAAO;MAACA;;EACV;AAEAA,UAAQF,cAAc,kBAAkB;AACxC,MAAIG,UAAGC,WAAWC,cAAKC,QAAQL,cAAcC,SAAS;AACpD,WAAO;MAACA;;EACV;AAEA,SAAO;AACT;AAEO,MAAMH,iBAAiB,~~OAAOQ~~,~~OAAcN~~;~~AACjD~~,~~QAAMO~~,aAAa;IACjB;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;AAGF,OAAIC,~~mBAAQF~~,QAAQ;AAClB,~~UAAMG~~,kBAAkB,OAAMC,~~kBAAOJ~~,~~MAAMK~~,IAAIC,YAAK,GAAG;MACrDC,mBAAmB;~~QACjBN~~;MACF;~~MACAO~~,QAAQ;QAAC;;MACTC,~~KAAKf~~;IACP;AACA,~~WAAOS~~;EACT,OAAO;AACL,~~WAAOH~~;EACT;AACF;","names":["getDefaultIndexEntry","normalizeInput","isTsProject","appDirectory","entry","fs","existsSync","path","resolve","input","extensions","isArray","normalizedInput","globby","map","slash","expandDirectories","ignore","cwd"],"sources":["../../src/utils/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/utils/input.ts"],"sourcesContent":["import path from 'path';\nimport { fs, globby, isArray, slash } from '@modern-js/utils';\nimport { Input } from '../types';\n\nexport const getDefaultIndexEntry = async ({\n isTsProject,\n appDirectory,\n}: {\n isTsProject: boolean;\n appDirectory: string;\n}) => {\n let entry = isTsProject ? 'src/index.ts' : 'src/index.js';\n if (fs.existsSync(path.resolve(appDirectory, entry))) {\n return [entry];\n }\n\n entry = isTsProject ? 'src/index.tsx' : 'src/index.jsx';\n if (fs.existsSync(path.resolve(appDirectory, entry))) {\n return [entry];\n }\n\n return [];\n};\n\nexport const normalizeInput = async (input: Input, appDirectory: string) => {\n const extensions = [\n 'js',\n 'ts',\n 'jsx',\n 'tsx',\n 'mjs',\n 'cjs',\n 'mts',\n 'cts',\n 'css',\n 'sass',\n 'scss',\n 'less',\n 'json',\n ];\n\n if (isArray(input)) {\n const normalizedInput = await globby(input.map(slash), {\n expandDirectories: {\n extensions,\n },\n ignore: ['*/.d.ts'],\n cwd: appDirectory,\n });\n return normalizedInput;\n } else {\n return input;\n }\n};\n"]}
1	+ {"version":3,"file":null,"mappings":";;;;;;;;;;;;EAIaA,sBAAoB;WAApBA;;EAoBAC,gBAAc;WAAdA;;;;iEAxBI;uBAC0B;AAGpC,MAAMD,uBAAuB,OAAO,EACzCE,aACAC,aAAY,MAIb;AACC,MAAIC,QAAQF,cAAc,iBAAiB;AAC3C,MAAIG,UAAGC,WAAWC,cAAKC,QAAQL,cAAcC,SAAS;AACpD,WAAO;MAACA;;EACV;AAEAA,UAAQF,cAAc,kBAAkB;AACxC,MAAIG,UAAGC,WAAWC,cAAKC,QAAQL,cAAcC,SAAS;AACpD,WAAO;MAACA;;EACV;AAEA,SAAO;AACT;AAEO,MAAMH,iBAAiB,OAC5BQ,OACAN,cACAO;AAEA,QAAMC,aAAa;IACjB;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;AAGF,MAAID,YAAY;AACdC,eAAWC,KAAK;EAClB;AAEA,OAAIC,mBAAQJ,QAAQ;AAClB,UAAMK,kBAAkB,OAAMC,kBAAON,MAAMO,IAAIC,YAAK,GAAG;MACrDC,mBAAmB;QACjBP;MACF;MACAQ,QAAQ;QAAC;;MACTC,KAAKjB;IACP;AACA,WAAOW;EACT,OAAO;AACL,WAAOL;EACT;AACF;","names":["getDefaultIndexEntry","normalizeInput","isTsProject","appDirectory","entry","fs","existsSync","path","resolve","input","enableSvgr","extensions","push","isArray","normalizedInput","globby","map","slash","expandDirectories","ignore","cwd"],"sources":["../../src/utils/home/runner/work/modern.js/modern.js/packages/solutions/module-tools/src/utils/input.ts"],"sourcesContent":["import path from 'path';\nimport { fs, globby, isArray, slash } from '@modern-js/utils';\nimport { Input } from '../types';\n\nexport const getDefaultIndexEntry = async ({\n isTsProject,\n appDirectory,\n}: {\n isTsProject: boolean;\n appDirectory: string;\n}) => {\n let entry = isTsProject ? 'src/index.ts' : 'src/index.js';\n if (fs.existsSync(path.resolve(appDirectory, entry))) {\n return [entry];\n }\n\n entry = isTsProject ? 'src/index.tsx' : 'src/index.jsx';\n if (fs.existsSync(path.resolve(appDirectory, entry))) {\n return [entry];\n }\n\n return [];\n};\n\nexport const normalizeInput = async (\n input: Input,\n appDirectory: string,\n enableSvgr: boolean,\n) => {\n const extensions = [\n 'js',\n 'ts',\n 'jsx',\n 'tsx',\n 'mjs',\n 'cjs',\n 'mts',\n 'cts',\n 'css',\n 'sass',\n 'scss',\n 'less',\n 'json',\n ];\n\n if (enableSvgr) {\n extensions.push('svg');\n }\n\n if (isArray(input)) {\n const normalizedInput = await globby(input.map(slash), {\n expandDirectories: {\n extensions,\n },\n ignore: ['*/.d.ts'],\n cwd: appDirectory,\n });\n return normalizedInput;\n } else {\n return input;\n }\n};\n"]}

package/package.json CHANGED Viewed

@@ -15,7 +15,7 @@
     "module-tools",
     "lib-tools"
   ],
-  "version": "2.33.0",
+  "version": "2.33.1",
   "bin": {
     "modern": "./bin/modern.js",
     "modern-module": "./bin/modern.js"
@@ -55,18 +55,18 @@
     "@babel/traverse": "^7.21.5",
     "postcss": "8.4.27",
     "@swc/helpers": "0.5.1",
-    "@modern-js/core": "2.33.0",
-    "@modern-js/libuild": "2.33.0",
-    "@modern-js/libuild-plugin-svgr": "2.33.0",
-    "@modern-js/libuild-plugin-swc": "2.33.0",
-    "@modern-js/new-action": "2.33.0",
-    "@modern-js/plugin": "2.33.0",
-    "@modern-js/plugin-changeset": "2.33.0",
-    "@modern-js/plugin-i18n": "2.33.0",
-    "@modern-js/plugin-lint": "2.33.0",
-    "@modern-js/types": "2.33.0",
-    "@modern-js/upgrade": "2.33.0",
-    "@modern-js/utils": "2.33.0"
+    "@modern-js/core": "2.33.1",
+    "@modern-js/libuild": "2.33.1",
+    "@modern-js/libuild-plugin-svgr": "2.33.1",
+    "@modern-js/libuild-plugin-swc": "2.33.1",
+    "@modern-js/new-action": "2.33.1",
+    "@modern-js/plugin": "2.33.1",
+    "@modern-js/plugin-changeset": "2.33.1",
+    "@modern-js/plugin-i18n": "2.33.1",
+    "@modern-js/plugin-lint": "2.33.1",
+    "@modern-js/types": "2.33.1",
+    "@modern-js/upgrade": "2.33.1",
+    "@modern-js/utils": "2.33.1"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.4",
@@ -81,10 +81,10 @@
     "postcss-alias": "2.0.0",
     "react": "17",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.33.0",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.33.0",
-    "@scripts/build": "2.33.0",
-    "@scripts/jest-config": "2.33.0"
+    "@modern-js/builder-webpack-provider": "2.33.1",
+    "@modern-js/self": "npm:@modern-js/module-tools@2.33.1",
+    "@scripts/build": "2.33.1",
+    "@scripts/jest-config": "2.33.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",