@modern-js/app-tools 2.58.3 → 2.59.0

package/dist/esm-node/utils/getSelectedEntries.js

@@ -0,0 +1,34 @@
+import { chalk, inquirer } from "@modern-js/utils";
+import { i18n, localeKeys } from "../locale";
+const getSelectedEntries = async (entry, entrypoints) => {
+  const entryNames = entrypoints.map((e) => e.entryName);
+  if (!entry) {
+    return entryNames;
+  }
+  if (typeof entry === "boolean") {
+    const { selected } = await inquirer.prompt([
+      {
+        type: "checkbox",
+        name: "selected",
+        choices: entryNames,
+        message: i18n.t(localeKeys.command.dev.selectEntry),
+        validate(answer) {
+          if (answer.length < 1) {
+            return i18n.t(localeKeys.command.dev.requireEntry);
+          }
+          return true;
+        }
+      }
+    ]);
+    return selected;
+  }
+  entry.forEach((name) => {
+    if (!entryNames.includes(name)) {
+      throw new Error(`Can not found entry ${chalk.yellow(name)}, the entry should be one of ${chalk.yellow(entryNames.join(", "))}`);
+    }
+  });
+  return entry;
+};
+export {
+  getSelectedEntries
+};

package/dist/esm-node/utils/loadPlugins.js

@@ -0,0 +1,22 @@
+import { loadServerPlugins as loadServerPluginInstances } from "@modern-js/prod-server";
+async function getServerPlugins(api, metaName = "modern-js") {
+  const runner = api.useHookRunners();
+  const { plugins } = await runner._internalServerPlugins({
+    plugins: []
+  });
+  const filtedPlugins = plugins.filter((plugin) => plugin.name.includes(metaName));
+  api.setAppContext({
+    ...api.useAppContext(),
+    serverPlugins: filtedPlugins
+  });
+  return filtedPlugins;
+}
+async function loadServerPlugins(api, appDirectory, metaName) {
+  const plugins = await getServerPlugins(api, metaName);
+  const instances = await loadServerPluginInstances(plugins, appDirectory);
+  return instances;
+}
+export {
+  getServerPlugins,
+  loadServerPlugins
+};

package/dist/esm-node/utils/printInstructions.js

@@ -0,0 +1,11 @@
+import { logger, prettyInstructions } from "@modern-js/utils";
+const printInstructions = async (hookRunners, appContext, config) => {
+  const message = prettyInstructions(appContext, config);
+  const { instructions } = await hookRunners.beforePrintInstructions({
+    instructions: message
+  });
+  logger.log(instructions);
+};
+export {
+  printInstructions
+};

package/dist/esm-node/utils/register.js

@@ -0,0 +1,96 @@
+import path from "node:path";
+import { fs, getAliasConfig, readTsConfigByFile } from "@modern-js/utils";
+const registerEsbuild = async ({ isTsProject, tsConfig, distDir }) => {
+  const esbuildRegister = await import("esbuild-register/dist/node");
+  esbuildRegister.register({
+    tsconfigRaw: isTsProject ? tsConfig : void 0,
+    hookIgnoreNodeModules: true,
+    hookMatcher: (fileName) => !fileName.startsWith(distDir)
+  });
+};
+const registerCompiler = async (appDir, distDir, alias) => {
+  const TS_CONFIG_FILENAME = `tsconfig.json`;
+  const tsconfigPath = path.resolve(appDir, TS_CONFIG_FILENAME);
+  const isTsProject = await fs.pathExists(tsconfigPath);
+  const aliasConfig = getAliasConfig(alias, {
+    appDirectory: appDir,
+    tsconfigPath
+  });
+  const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
+  const tsPaths = Object.keys(paths).reduce((o, key) => {
+    let tsPath = paths[key];
+    if (typeof tsPath === "string" && key.startsWith("@") && tsPath.startsWith("@")) {
+      try {
+        tsPath = require.resolve(tsPath, {
+          paths: [
+            process.cwd(),
+            ...module.paths
+          ]
+        });
+      } catch {
+      }
+    }
+    if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
+      tsPath = path.relative(absoluteBaseUrl, tsPath);
+    }
+    if (typeof tsPath === "string") {
+      tsPath = [
+        tsPath
+      ];
+    }
+    return {
+      ...o,
+      [`${key}`]: tsPath
+    };
+  }, {});
+  let tsConfig = {};
+  if (isTsProject) {
+    tsConfig = readTsConfigByFile(tsconfigPath);
+  }
+  const { MODERN_NODE_LOADER } = process.env;
+  if (MODERN_NODE_LOADER !== "esbuild") {
+    try {
+      const tsNode = await import("ts-node");
+      const tsNodeOptions = tsConfig["ts-node"];
+      if (isTsProject) {
+        tsNode.register({
+          project: tsconfigPath,
+          scope: true,
+          // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
+          files: true,
+          transpileOnly: true,
+          ignore: [
+            "(?:^|/)node_modules/",
+            `(?:^|/)${path.relative(appDir, distDir)}/`
+          ],
+          ...tsNodeOptions
+        });
+      }
+    } catch (error) {
+      await registerEsbuild({
+        isTsProject,
+        tsConfig,
+        distDir
+      });
+    }
+  } else {
+    await registerEsbuild({
+      isTsProject,
+      tsConfig,
+      distDir
+    });
+  }
+  const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
+  if (await fs.pathExists(appDir)) {
+    const loaderRes = tsConfigPaths.loadConfig(appDir);
+    if (loaderRes.resultType === "success") {
+      tsConfigPaths.register({
+        baseUrl: absoluteBaseUrl || "./",
+        paths: tsPaths
+      });
+    }
+  }
+};
+export {
+  registerCompiler
+};

package/dist/esm-node/utils/restart.js

@@ -0,0 +1,22 @@
+import { cli } from "@modern-js/core";
+import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
+async function restart(hooksRunner, filename) {
+  clearConsole();
+  logger.info(`Restart because ${chalk.yellow(filename)} is changed...
+`);
+  let hasGetError = false;
+  await hooksRunner.beforeRestart();
+  try {
+    await cli.init(cli.getPrevInitOptions());
+  } catch (err) {
+    console.error(err);
+    hasGetError = true;
+  } finally {
+    if (!hasGetError) {
+      program.parse(getFullArgv());
+    }
+  }
+}
+export {
+  restart
+};

package/dist/esm-node/utils/routes.js

@@ -0,0 +1,21 @@
+import path from "path";
+import { fs, MAIN_ENTRY_NAME, ROUTE_SPEC_FILE } from "@modern-js/utils";
+const generateRoutes = async (appContext) => {
+  const { serverRoutes, distDirectory } = appContext;
+  const output = JSON.stringify({
+    routes: serverRoutes
+  }, null, 2);
+  await fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
+};
+const getPathWithoutExt = (filename) => {
+  const extname = path.extname(filename);
+  return filename.slice(0, -extname.length);
+};
+const isMainEntry = (entryName, mainEntryName) => {
+  return entryName === (mainEntryName || MAIN_ENTRY_NAME);
+};
+export {
+  generateRoutes,
+  getPathWithoutExt,
+  isMainEntry
+};

package/dist/types/builder/shared/builderPlugins/index.d.ts

@@ -1,4 +1,3 @@
 export * from './adapterBasic';
 export * from './adapterHtml';
 export * from './adapterSSR';
-export * from './adapterWorker';

package/dist/types/index.d.ts

@@ -11,7 +11,7 @@ export type AppToolsOptions = {
      * Specify which bundler to use for the build.
      * @default `webpack`
      * */
-    bundler?: 'experimental-rspack' | 'webpack';
+    bundler?: 'rspack' | 'webpack' | 'experimental-rspack';
 };
 /**
  * The core package of the framework, providing CLI commands, build capabilities, configuration parsing and more.

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.3",
+  "version": "2.59.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -77,7 +77,7 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.24.7",
-    "@rsbuild/core": "1.0.1-beta.14",
+    "@rsbuild/core": "1.0.1-rc.4",
     "@rsbuild/plugin-node-polyfill": "1.0.4",
     "@swc/helpers": "0.5.3",
     "@vercel/nft": "^0.26.4",
@@ -88,23 +88,23 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.58.3",
-    "@modern-js/node-bundle-require": "2.58.3",
-    "@modern-js/plugin": "2.58.3",
-    "@modern-js/plugin-i18n": "2.58.3",
-    "@modern-js/plugin-lint": "2.58.3",
-    "@modern-js/prod-server": "2.58.3",
-    "@modern-js/rsbuild-plugin-esbuild": "2.58.3",
-    "@modern-js/server": "2.58.3",
-    "@modern-js/server-utils": "2.58.3",
-    "@modern-js/plugin-data-loader": "2.58.3",
-    "@modern-js/types": "2.58.3",
-    "@modern-js/server-core": "2.58.3",
-    "@modern-js/uni-builder": "2.58.3",
-    "@modern-js/utils": "2.58.3"
+    "@modern-js/node-bundle-require": "2.59.0",
+    "@modern-js/plugin": "2.59.0",
+    "@modern-js/plugin-data-loader": "2.59.0",
+    "@modern-js/plugin-i18n": "2.59.0",
+    "@modern-js/plugin-lint": "2.59.0",
+    "@modern-js/core": "2.59.0",
+    "@modern-js/prod-server": "2.59.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.59.0",
+    "@modern-js/server": "2.59.0",
+    "@modern-js/server-utils": "2.59.0",
+    "@modern-js/types": "2.59.0",
+    "@modern-js/uni-builder": "2.59.0",
+    "@modern-js/server-core": "2.59.0",
+    "@modern-js/utils": "2.59.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "1.0.1-beta.14",
+    "@rsbuild/plugin-swc": "1.0.1-rc.4",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^16",
@@ -112,9 +112,9 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "webpack": "^5.93.0",
-    "@scripts/build": "2.58.3",
-    "@scripts/jest-config": "2.58.3"
+    "webpack": "^5.94.0",
+    "@scripts/build": "2.59.0",
+    "@scripts/jest-config": "2.59.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/cjs/builder/shared/builderPlugins/adapterWorker.js

@@ -1,51 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var adapterWorker_exports = {};
-__export(adapterWorker_exports, {
-  builderPluginAdapterWorker: () => builderPluginAdapterWorker
-});
-module.exports = __toCommonJS(adapterWorker_exports);
-var import_path = require("path");
-var import_uni_builder = require("@modern-js/uni-builder");
-const getDistPath = (outputConfig, type) => {
-  const { distPath } = outputConfig;
-  const ret = distPath[type];
-  if (typeof ret !== "string") {
-    throw new Error(`unknown key ${type} in "output.distPath"`);
-  }
-  return ret;
-};
-const builderPluginAdapterWorker = () => ({
-  name: "builder-plugin-adapter-worker",
-  setup(api) {
-    api.modifyBundlerChain(async (chain, { environment }) => {
-      const { config, name } = environment;
-      const isServiceWorker = name === import_uni_builder.SERVICE_WORKER_ENVIRONMENT_NAME;
-      if (isServiceWorker) {
-        const workerPath = getDistPath(config.output, "root");
-        const filename = import_path.posix.join(workerPath, `[name].js`);
-        chain.output.filename(filename).chunkFilename(filename).libraryTarget("commonjs2");
-      }
-    });
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  builderPluginAdapterWorker
-});

package/dist/types/builder/shared/builderPlugins/adapterWorker.d.ts

@@ -1,2 +0,0 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-export declare const builderPluginAdapterWorker: () => RsbuildPlugin;