@modern-js/app-tools 2.4.0 → 2.5.0-alpha.1

package/dist/esm-node/types/index.js

@@ -0,0 +1,3 @@
+export * from "./hooks";
+export * from "./config";
+export * from "./legacyConfig";

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

@@ -0,0 +1,88 @@
+import * as path from "path";
+import { bundle } from "@modern-js/node-bundle-require";
+import {
+  CONFIG_FILE_EXTENSIONS,
+  fs,
+  getServerConfig,
+  OUTPUT_CONFIG_FILE
+} from "@modern-js/utils";
+const defineServerConfig = (config) => config;
+const buildServerConfig = async ({
+  appDirectory,
+  distDirectory,
+  configFile,
+  options
+}) => {
+  const configFilePath = await getServerConfig(appDirectory, configFile);
+  const getOutputFile = async (filepath) => path.resolve(
+    distDirectory,
+    `${filepath.replace(
+      new RegExp(CONFIG_FILE_EXTENSIONS.join("|")),
+      ""
+    )}.js`
+  );
+  if (configFilePath) {
+    const configHelperFilePath = path.normalize(
+      path.join(distDirectory, "./config-helper.js")
+    );
+    const helperCode = `
+      export const defineConfig = (config) => config;
+    `;
+    await fs.ensureDir(distDirectory);
+    await fs.writeFile(configHelperFilePath, helperCode);
+    await bundle(configFilePath, {
+      ...options,
+      getOutputFile,
+      esbuildPlugins: [
+        {
+          name: "native-build-config",
+          setup(ctx) {
+            ctx.onResolve(
+              {
+                filter: /app-tools\/server/
+              },
+              () => {
+                return {
+                  path: configHelperFilePath
+                };
+              }
+            );
+          }
+        }
+      ]
+    });
+  }
+};
+const safeReplacer = () => {
+  const cache = [];
+  const keyCache = [];
+  return function(key, value) {
+    if (typeof value === "object" && value !== null) {
+      const index = cache.indexOf(value);
+      if (index !== -1) {
+        return `[Circular ${keyCache[index]}]`;
+      }
+      cache.push(value);
+      keyCache.push(key || "root");
+    }
+    return value;
+  };
+};
+const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
+  var _a;
+  const outputPath = path.join(
+    appDirectory,
+    ((_a = resolvedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
+    OUTPUT_CONFIG_FILE
+  );
+  await fs.writeJSON(outputPath, resolvedConfig, {
+    spaces: 2,
+    replacer: safeReplacer()
+  });
+};
+export {
+  buildServerConfig,
+  defineServerConfig,
+  emitResolvedConfig,
+  safeReplacer
+};

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

@@ -0,0 +1,37 @@
+import { Server } from "@modern-js/server";
+let server = null;
+const getServer = () => server;
+const setServer = (newServer) => {
+  server = newServer;
+};
+const closeServer = async () => {
+  if (server) {
+    await server.close();
+    server = null;
+  }
+};
+const createServer = async (options) => {
+  if (server) {
+    await server.close();
+  }
+  server = new Server(options);
+  const app = await server.init();
+  return app;
+};
+const injectDataLoaderPlugin = (internalPlugins) => {
+  const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
+  return {
+    ...internalPlugins,
+    "@modern-js/plugin-data-loader": {
+      path: DataLoaderPlugin,
+      forced: true
+    }
+  };
+};
+export {
+  closeServer,
+  createServer,
+  getServer,
+  injectDataLoaderPlugin,
+  setServer
+};

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

@@ -0,0 +1,15 @@
+function getAutoInjectEnv(appContext) {
+  const { metaName } = appContext;
+  const prefix = `${metaName.split(/[-_]/)[0]}_`.toUpperCase();
+  const envReg = new RegExp(`^${prefix}`);
+  return Object.keys(process.env).reduce((prev, key) => {
+    const value = process.env[key];
+    if (envReg.test(key) && typeof value !== "undefined") {
+      prev[`process.env.${key}`] = value;
+    }
+    return prev;
+  }, {});
+}
+export {
+  getAutoInjectEnv
+};

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

@@ -0,0 +1,33 @@
+import path from "path";
+import { fs, getServerConfig } from "@modern-js/utils";
+const getPackageConfig = (appDirectory, packageJsonConfig) => {
+  const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
+  const json = JSON.parse(
+    fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8")
+  );
+  return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
+};
+const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
+  const serverConfig = await getServerConfig(appDirectory, serverConfigFile);
+  if (serverConfig) {
+    dependencies.push(serverConfig);
+  }
+};
+async function generateWatchFiles(appContext, configDir) {
+  const { appDirectory, configFile } = appContext;
+  const configPath = path.join(appDirectory, configDir || "");
+  const dependencies = getPackageConfig(
+    appContext.appDirectory,
+    appContext.packageName
+  ) ? [path.resolve(appDirectory, "./package.json")] : [];
+  await addServerConfigToDeps(
+    dependencies,
+    appContext.appDirectory,
+    appContext.serverConfigFile
+  );
+  return [`${configPath}/html`, configFile || "./config", ...dependencies];
+}
+export {
+  addServerConfigToDeps,
+  generateWatchFiles
+};

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

@@ -0,0 +1,38 @@
+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/getServerInternalPlugins.js

@@ -0,0 +1,18 @@
+async function getServerInternalPlugins(api) {
+  const hookRunners = api.useHookRunners();
+  const { plugins: serverPlugins } = await hookRunners.collectServerPlugins({
+    plugins: []
+  });
+  const serverInternalPlugins = serverPlugins.reduce(
+    (result, plugin) => Object.assign(result, plugin),
+    {}
+  );
+  api.setAppContext({
+    ...api.useAppContext(),
+    serverInternalPlugins
+  });
+  return serverInternalPlugins;
+}
+export {
+  getServerInternalPlugins
+};

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

@@ -0,0 +1,8 @@
+import { I18CLILanguageDetector } from "@modern-js/plugin-i18n/language-detector";
+function getLocaleLanguage() {
+  const detector = new I18CLILanguageDetector();
+  return detector.detect();
+}
+export {
+  getLocaleLanguage
+};

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

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

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

@@ -0,0 +1,22 @@
+import { cli } from "@modern-js/core";
+import { chalk, clearConsole, 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(process.argv);
+    }
+  }
+}
+export {
+  restart
+};

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

@@ -0,0 +1,10 @@
+import path from "path";
+import { fs, 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);
+};
+export {
+  generateRoutes
+};

package/dist/js/modern/analyze/nestedRoutes.js

@@ -157,7 +157,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       route.error = replaceWithAlias(alias.basename, itemPath, alias.name);
     }
   }
-  let finalRoute = createRoute(
+  const finalRoute = createRoute(
     route,
     rootDir,
     path.join(dirname, `${NESTED_ROUTE.LAYOUT_FILE}.ts`),
@@ -170,15 +170,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }
-  if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
-    const childRoute = finalRoute.children[0];
-    if (childRoute.path === "*") {
-      const path2 = `${finalRoute.path || ""}/${childRoute.path || ""}`;
-      finalRoute = __spreadProps(__spreadValues({}, childRoute), {
-        path: path2
-      });
-    }
-  }
   return finalRoute;
 });
 export {

package/dist/js/node/analyze/nestedRoutes.js

@@ -183,7 +183,7 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
       route.error = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
     }
   }
-  let finalRoute = createRoute(
+  const finalRoute = createRoute(
     route,
     rootDir,
     path.join(dirname, `${import_constants.NESTED_ROUTE.LAYOUT_FILE}.ts`),
@@ -196,15 +196,6 @@ const walk = (dirname, rootDir, alias, entryName) => __async(void 0, null, funct
   if (route.children && route.children.length === 0 && !route.index) {
     return null;
   }
-  if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
-    const childRoute = finalRoute.children[0];
-    if (childRoute.path === "*") {
-      const path2 = `${finalRoute.path || ""}/${childRoute.path || ""}`;
-      finalRoute = __spreadProps(__spreadValues({}, childRoute), {
-        path: path2
-      });
-    }
-  }
   return finalRoute;
 });
 // Annotate the CommonJS export names for ESM import in node:

package/dist/js/treeshaking/analyze/nestedRoutes.js

@@ -197,7 +197,7 @@ var createRoute = function(routeInfo, rootDir, filename, entryName) {
 };
 var walk = function() {
     var _ref = _asyncToGenerator(function(dirname, rootDir, alias, entryName) {
-        var ref, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref1, ref2, ref3, err, finalRoute, childRoute1, path2;
+        var ref, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatRoute, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory2, childRoute, ref1, ref2, ref3, err, finalRoute;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -386,15 +386,6 @@ var walk = function() {
                             null
                         ];
                     }
-                    if (finalRoute.children && finalRoute.children.length === 1 && !finalRoute._component) {
-                        childRoute1 = finalRoute.children[0];
-                        if (childRoute1.path === "*") {
-                            path2 = "".concat(finalRoute.path || "", "/").concat(childRoute1.path || "");
-                            finalRoute = _objectSpreadProps(_objectSpread({}, childRoute1), {
-                                path: path2
-                            });
-                        }
-                    }
                     return [
                         2,
                         finalRoute

package/dist/types/analyze/templates.d.ts

@@ -26,9 +26,11 @@ export declare const html: (partials: {
   body: string[];
 }) => string;
 export declare const routesForServer: ({
-  routes
+  routes,
+  metaName
 }: {
   routes: (NestedRoute | PageRoute)[];
+  metaName: string;
 }) => string;
 export declare const fileSystemRoutes: ({
   routes,

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

@@ -8,7 +8,7 @@ import type { UnwrapBuilderConfig } from '../utils';
 export type BuilderToolsConfig = UnwrapBuilderConfig<BuilderConfig, 'tools'> & {
   esbuild?: PluginEsbuildOptions;
 };
-export type RsBuilderToolsConfig = UnwrapBuilderConfig<RsBuilderConfig, 'source'>;
+export type RsBuilderToolsConfig = UnwrapBuilderConfig<RsBuilderConfig, 'tools'>;
 /**
  * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
  * Please use `yarn new` or `pnpm new` to enable the corresponding capability.

package/dist/types/types/hooks.d.ts

@@ -4,6 +4,7 @@ import type { Entrypoint, HtmlPartials, NestedRoute, PageRoute, RouteLegacy, Ser
 import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
 import type { Stats, MultiStats } from '@modern-js/builder-shared';
 import type { Rspack } from '@modern-js/builder-rspack-provider';
+import { Bundler } from './utils';
 export interface ImportSpecifier {
   local?: string;
   imported?: string;
@@ -18,7 +19,7 @@ export interface RuntimePlugin {
   options: string;
   args?: string;
 }
-export type AppToolsHooks = {
+export type AppToolsHooks<B extends Bundler = 'webpack'> = {
   modifyEntryExport: AsyncWaterfall<{
     entrypoint: Entrypoint;
     exportStatement: string;
@@ -61,16 +62,16 @@ export type AppToolsHooks = {
   beforeDev: AsyncWorkflow<void, unknown>;
   afterDev: AsyncWorkflow<void, unknown>;
   beforeCreateCompiler: AsyncWorkflow<{
-    bundlerConfigs: webpack.Configuration[] | Rspack.Configuration[];
+    bundlerConfigs?: B extends 'rspack' ? Rspack.Configuration[] : webpack.Configuration[];
   }, unknown>;
   afterCreateCompiler: AsyncWorkflow<{
-    compiler?: webpack.Compiler | webpack.MultiCompiler | Rspack.Compiler;
+    compiler?: B extends 'rspack' ? Rspack.Compiler : webpack.Compiler | webpack.MultiCompiler;
   }, unknown>;
   beforePrintInstructions: AsyncWaterfall<{
     instructions: string;
   }>;
   beforeBuild: AsyncWorkflow<{
-    bundlerConfigs?: webpack.Configuration[] | Rspack.Configuration[];
+    bundlerConfigs?: B extends 'rspack' ? Rspack.Configuration[] : webpack.Configuration[];
   }, unknown>;
   afterBuild: AsyncWorkflow<{
     stats?: Stats | MultiStats;

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

@@ -6,11 +6,13 @@ import { Bundler, FromConfig } from './utils';
 export * from './hooks';
 export * from './config';
 export * from './legacyConfig';
+export type { webpack } from '@modern-js/builder-webpack-provider';
+export type { Rspack } from '@modern-js/builder-rspack-provider';
 export type { Bundler } from './utils';
 export type { ServerUserConfig, ServerNormalizedConfig, BffUserConfig, BffNormalizedConfig, SSR, SSRByEntries } from '@modern-js/server-core';
 export type { IAppContext, PluginAPI, CliPlugin, NormalizedConfig, UserConfig } from '@modern-js/core';
 export type AppTools<B extends Bundler = 'webpack'> = {
-  hooks: AppToolsHooks;
+  hooks: AppToolsHooks<B>;
   userConfig: FromConfig<B, {
     rspack: RsAppToolsUserConfig;
     webpack: AppToolsUserConfig;

package/package.json

@@ -11,23 +11,22 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.0",
+  "version": "2.5.0-alpha.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm/index.js",
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/index.ts",
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/index.js"
     },
     "./types": {
       "jsnext:source": "./lib/types.d.ts",
@@ -35,7 +34,7 @@
     },
     "./server": {
       "jsnext:source": "./src/exports/server.ts",
-      "default": "./dist/js/node/exports/server.js"
+      "default": "./dist/cjs/exports/server.js"
     }
   },
   "engines": {
@@ -63,25 +62,25 @@
     "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
+    "@modern-js/plugin-data-loader": "2.5.0-alpha.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "2.4.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.4.0",
-    "@modern-js/builder-shared": "2.4.0",
-    "@modern-js/builder-webpack-provider": "2.4.0",
-    "@modern-js/builder-plugin-esbuild": "2.4.0",
-    "@modern-js/core": "2.4.0",
-    "@modern-js/new-action": "2.4.0",
-    "@modern-js/node-bundle-require": "2.4.0",
-    "@modern-js/plugin": "2.4.0",
-    "@modern-js/plugin-data-loader": "2.4.0",
-    "@modern-js/plugin-i18n": "2.4.0",
-    "@modern-js/plugin-lint": "2.4.0",
-    "@modern-js/prod-server": "2.4.0",
-    "@modern-js/server": "2.4.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/upgrade": "2.4.0",
-    "@modern-js/utils": "2.4.0"
+    "@modern-js/builder": "2.5.0",
+    "@modern-js/builder-plugin-esbuild": "2.5.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.5.0",
+    "@modern-js/builder-shared": "2.5.0",
+    "@modern-js/builder-webpack-provider": "2.5.0",
+    "@modern-js/core": "2.5.0",
+    "@modern-js/new-action": "2.5.0",
+    "@modern-js/node-bundle-require": "2.5.0",
+    "@modern-js/plugin-i18n": "2.5.0",
+    "@modern-js/plugin": "2.5.0",
+    "@modern-js/plugin-lint": "2.5.0",
+    "@modern-js/prod-server": "2.5.0",
+    "@modern-js/server": "2.5.0",
+    "@modern-js/upgrade": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@modern-js/utils": "2.5.0-alpha.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -90,14 +89,14 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "2.4.0",
-    "@modern-js/builder-rspack-provider": "2.4.0",
-    "@modern-js/server-core": "2.4.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@modern-js/builder-rspack-provider": "2.5.0",
+    "@modern-js/builder-plugin-swc": "2.5.0",
+    "@modern-js/server-core": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.4.0"
+    "@modern-js/builder-rspack-provider": "^2.5.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {