@modern-js/module-tools 2.47.1 → 2.48.0

package/bin/modern.js

@@ -1,9 +1,15 @@
 #!/usr/bin/env node
 const { INTERNAL_MODULE_TOOLS_PLUGINS } = require('@modern-js/utils');
 
+const { version } = require('../package.json');
+
+if (!process.env.MODERN_JS_VERSION) {
+  process.env.MODERN_JS_VERSION = version;
+}
+
 require('@modern-js/core/runBin').run({
   internalPlugins: {
     cli: INTERNAL_MODULE_TOOLS_PLUGINS,
   },
-  initialLog: `Modern.js Module v${require('../package.json').version}`,
+  initialLog: `Modern.js Module v${version}`,
 });

package/dist/builder/feature/asset.js

@@ -89,9 +89,9 @@ const getDefaultSVGRConfig = () => ({
 async function getAssetContents(assetPath, rebaseFrom, calledOnLoad) {
   const fileContent = await import_fs.default.promises.readFile(assetPath);
   const { buildType, format, outDir } = this.config;
-  const { limit, path, publicPath, svgr } = this.config.asset;
+  const { limit, path, publicPath, svgr, name: name2 } = this.config.asset;
   const hash = (0, import_utils.getHash)(fileContent, null).slice(0, 8);
-  const outputFileName = (0, import_path.basename)(assetPath).split(".").join(`.${hash}.`);
+  const outputFileName = getOutputFileName(assetPath, name2, hash);
   const outputFilePath = (0, import_path.resolve)(outDir, path, outputFileName);
   const relativePath = (0, import_path.relative)(rebaseFrom, outputFilePath);
   const normalizedRelativePath = (0, import_utils.normalizeSlashes)(relativePath.startsWith("..") ? relativePath : `./${relativePath}`);
@@ -147,6 +147,26 @@ async function getAssetContents(assetPath, rebaseFrom, calledOnLoad) {
     loader
   };
 }
+function getOutputFileName(filePath, assetName, hash) {
+  const format = typeof assetName === "function" ? assetName(filePath) : assetName;
+  const fileBaseNameArray = (0, import_path.basename)(filePath).split(".");
+  var _fileBaseNameArray_pop;
+  const extname2 = (_fileBaseNameArray_pop = fileBaseNameArray.pop()) !== null && _fileBaseNameArray_pop !== void 0 ? _fileBaseNameArray_pop : "";
+  const fileBaseName = fileBaseNameArray.join(".");
+  const outputFileName = format.replace(/(\[[^\]]*\])/g, (str, match) => {
+    if (match === "[name]") {
+      return fileBaseName;
+    }
+    if (match === "[ext]") {
+      return extname2;
+    }
+    if (match === "[hash]") {
+      return hash;
+    }
+    return match;
+  });
+  return outputFileName;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   asset,

package/dist/command.js

@@ -34,6 +34,7 @@ __export(command_exports, {
   upgradeCommand: () => upgradeCommand
 });
 module.exports = __toCommonJS(command_exports);
+var import_utils = require("@modern-js/utils");
 var import_locale = require("./locale");
 const initModuleContext = async (api) => {
   const { isTypescript } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
@@ -78,18 +79,18 @@ const devCommand = async (program, api) => {
 };
 const newCommand = async (program) => {
   program.command("new").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.new.describe)).option("--config-file <configFile>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--lang <lang>", import_locale.i18n.t(import_locale.localeKeys.command.new.lang)).option("-c, --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.new.config)).option("-d, --debug", import_locale.i18n.t(import_locale.localeKeys.command.new.debug), false).option("--dist-tag <tag>", import_locale.i18n.t(import_locale.localeKeys.command.new.distTag)).option("--registry", import_locale.i18n.t(import_locale.localeKeys.command.new.registry)).option("--no-need-install", import_locale.i18n.t(import_locale.localeKeys.command.shared.noNeedInstall)).action(async (options) => {
-    const { ModuleNewAction } = await Promise.resolve().then(() => __toESM(require("@modern-js/new-action")));
     const { getLocaleLanguage } = await Promise.resolve().then(() => __toESM(require("@modern-js/plugin-i18n/language-detector")));
     const locale = getLocaleLanguage();
-    await ModuleNewAction({
+    await (0, import_utils.newAction)({
       ...options,
       locale: options.lang || locale
-    });
+    }, "module");
   });
 };
 const upgradeCommand = async (program) => {
-  const { defineCommand } = await Promise.resolve().then(() => __toESM(require("@modern-js/upgrade")));
-  defineCommand(program.command("upgrade").option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--no-need-install", import_locale.i18n.t(import_locale.localeKeys.command.shared.noNeedInstall)));
+  program.command("upgrade").allowUnknownOption().option("-h --help", "Show help").action(async () => {
+    await (0, import_utils.upgradeAction)();
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/constants/build.js

@@ -29,7 +29,8 @@ const getDefaultBuildConfig = () => {
       limit: 14336,
       path: "assets",
       publicPath: "",
-      svgr: false
+      svgr: false,
+      name: "[name].[hash].[ext]"
     },
     autoExternal: true,
     banner: {},

package/dist/types/config/index.d.ts

@@ -69,6 +69,10 @@ export interface SvgrOptions extends Config {
     exclude?: Parameters<CreateFilter>[1];
 }
 export interface Asset {
+    /**
+     * @default [name].[hash].[ext]
+     */
+    name?: string | ((assetPath: string) => string);
     path?: string;
     limit?: number;
     publicPath?: string | ((filePath: string) => string);

package/package.json

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