@modern-js/app-tools 2.57.0 → 2.57.1-alpha.1

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

@@ -5,7 +5,7 @@ const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
   const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
-    const { dev } = await import("./dev");
+    const { dev } = await import("./dev.js");
     await dev(api, options);
   });
   for (const meta of devToolMetas) {
@@ -28,7 +28,7 @@ const buildCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const platformBuilders = await runner.registerBuildPlatform();
   const buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(async (options) => {
-    const { build } = await import("./build");
+    const { build } = await import("./build.js");
     await build(api, options);
   });
   for (const platformBuilder of platformBuilders) {
@@ -47,17 +47,17 @@ const buildCommand = async (program, api) => {
 };
 const serverCommand = (program, api) => {
   program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async () => {
-    const { start } = await import("./serve");
+    const { start } = await import("./serve.js");
     await start(api);
   });
 };
 const deployCommand = (program, api) => {
   program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options) => {
     if (!options.skipBuild) {
-      const { build } = await import("./build");
+      const { build } = await import("./build.js");
       await build(api);
     }
-    const { deploy } = await import("./deploy");
+    const { deploy } = await import("./deploy.js");
     await deploy(api, options);
     process.exit(0);
   });
@@ -72,7 +72,7 @@ const newCommand = (program, locale) => {
 };
 const inspectCommand = (program, api) => {
   program.command("inspect").description("inspect the internal configs").option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async (options) => {
-    const { inspect } = await import("./inspect");
+    const { inspect } = await import("./inspect.js");
     inspect(api, options);
   });
 };

package/dist/esm-node/esm/esbuild-loader.js

@@ -0,0 +1,39 @@
+import { pathToFileURL } from "url";
+import * as tsConfigPaths from "@modern-js/utils/tsconfig-paths";
+import { getAliasConfig } from "@modern-js/utils";
+import path from "path";
+let matchPath;
+function initialize({ appDir, alias }) {
+  const TS_CONFIG_FILENAME = `tsconfig.json`;
+  const aliasConfig = getAliasConfig(alias, {
+    appDirectory: appDir,
+    tsconfigPath: path.resolve(appDir, TS_CONFIG_FILENAME)
+  });
+  const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
+  const tsPaths = Object.keys(paths).reduce((o, key) => {
+    let tsPath = paths[key];
+    if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
+      tsPath = path.relative(absoluteBaseUrl, tsPath);
+    }
+    if (typeof tsPath === "string") {
+      tsPath = [
+        tsPath
+      ];
+    }
+    return {
+      ...o,
+      [`${key}`]: tsPath
+    };
+  }, {});
+  matchPath = tsConfigPaths.createMatchPath(absoluteBaseUrl, tsPaths);
+}
+function resolve(specifier, context, defaultResolve) {
+  const match = matchPath(specifier);
+  return match ? defaultResolve(pathToFileURL(match).href, context) : defaultResolve(specifier, context);
+}
+import { load } from "esbuild-register/loader";
+export {
+  initialize,
+  load,
+  resolve
+};

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

@@ -0,0 +1,39 @@
+const import_meta = {};
+import { register } from "node:module";
+import path from "node:path";
+const checkDep = async (dep) => {
+  try {
+    await import(dep);
+    return true;
+  } catch (error) {
+    return false;
+  }
+};
+const registerEsm = async ({ appDir, distDir, alias }) => {
+  const hasTsNode = await checkDep("ts-node");
+  if (hasTsNode) {
+    process.env.TS_NODE_TRANSPILE_ONLY = true;
+    process.env.TS_NODE_PROJECT = path.join(appDir, "tsconfig.json");
+    process.env.TS_NODE_SCOPE = true;
+    process.env.TS_NODE_FILES = true;
+    process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${path.relative(appDir, distDir)}/`;
+    register("./ts-node-loader.mjs", import_meta.url, {
+      data: {
+        appDir,
+        distDir,
+        alias
+      }
+    });
+  } else {
+    register("./esbuild-loader.mjs", import_meta.url, {
+      data: {
+        appDir,
+        distDir,
+        alias
+      }
+    });
+  }
+};
+export {
+  registerEsm
+};

package/dist/esm-node/esm/ts-node-loader.js

@@ -0,0 +1,42 @@
+import { pathToFileURL } from "url";
+import { resolve as tsNodeResolve } from "ts-node/esm";
+import * as tsConfigPaths from "@modern-js/utils/tsconfig-paths";
+import { getAliasConfig } from "@modern-js/utils";
+import path from "path";
+console.log("ttttttttttttt", tsConfigPaths);
+let matchPath;
+function initialize({ appDir, alias }) {
+  const TS_CONFIG_FILENAME = `tsconfig.json`;
+  const aliasConfig = getAliasConfig(alias, {
+    appDirectory: appDir,
+    tsconfigPath: path.resolve(appDir, TS_CONFIG_FILENAME)
+  });
+  const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
+  const tsPaths = Object.keys(paths).reduce((o, key) => {
+    let tsPath = paths[key];
+    if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
+      tsPath = path.relative(absoluteBaseUrl, tsPath);
+    }
+    if (typeof tsPath === "string") {
+      tsPath = [
+        tsPath
+      ];
+    }
+    return {
+      ...o,
+      [`${key}`]: tsPath
+    };
+  }, {});
+  matchPath = tsConfigPaths.createMatchPath(absoluteBaseUrl, tsPaths);
+}
+function resolve(specifier, context, defaultResolve) {
+  const match = matchPath(specifier);
+  return match ? tsNodeResolve(pathToFileURL(match).href, context, defaultResolve) : tsNodeResolve(specifier, context, defaultResolve);
+}
+import { transformSource, load } from "ts-node/esm";
+export {
+  initialize,
+  load,
+  resolve,
+  transformSource
+};

package/dist/esm-node/index.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import initializePlugin from "./plugins/initialize";
 import analyzePlugin from "./plugins/analyze";
@@ -47,6 +47,7 @@ const appTools = (options = {
       ...appContext,
       toolsType: "app-tools"
     });
+    const nestedRoutes = {};
     const locale = getLocaleLanguage();
     i18n.changeLanguage({
       locale
@@ -111,6 +112,21 @@ const appTools = (options = {
         cleanRequireCache([
           require.resolve("./plugins/analyze")
         ]);
+      },
+      async modifyFileSystemRoutes({ entrypoint, routes }) {
+        nestedRoutes[entrypoint.entryName] = routes;
+        return {
+          entrypoint,
+          routes
+        };
+      },
+      async beforeGenerateRoutes({ entrypoint, code }) {
+        const { distDirectory } = api.useAppContext();
+        await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes);
+        return {
+          entrypoint,
+          code
+        };
       }
     };
   }

package/dist/esm-node/plugins/analyze/index.js

@@ -7,6 +7,7 @@ import { getSelectedEntries } from "../../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../../config";
 import { createBuilderGenerator } from "../../builder";
 import { checkIsBuildCommands } from "./utils";
+import { compatibleRequire } from "@modern-js/utils";
 const debug = createDebugger("plugin-analyze");
 var analyze_default = ({ bundler }) => ({
   name: "@modern-js/plugin-analyze",
@@ -44,9 +45,9 @@ var analyze_default = ({ bundler }) => ({
           return;
         }
         const [{ getBundleEntry }, { getServerRoutes }, { getHtmlTemplate }] = await Promise.all([
-          import("./getBundleEntry"),
-          import("./getServerRoutes"),
-          import("./getHtmlTemplate")
+          compatibleRequire(path.join(__dirname, "./getBundleEntry.js")),
+          compatibleRequire(path.join(__dirname, "./getServerRoutes.js")),
+          compatibleRequire(path.join(__dirname, "./getHtmlTemplate.js"))
         ]);
         const { entrypoints } = await hookRunners.modifyEntrypoints({
           entrypoints: await getBundleEntry(hookRunners, appContext, resolvedConfig)

package/dist/esm-node/plugins/deploy/dependencies/index.js

@@ -8,7 +8,6 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   const entryFiles = await findEntryFiles(serverRootDir, entryFilter);
   const fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);
   const currentProjectModules = path.join(appDir, "node_modules");
-  const dependencySearchRoot = path.resolve(appDir, "../../../../../../");
   const tracedFiles = Object.fromEntries(await Promise.all([
     ...fileTrace.reasons.entries()
   ].map(async ([_path, reasons]) => {
@@ -39,7 +38,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       const packageJsonPath = match ? path.join(match[0], "package.json") : await pkgUp({
         cwd: path.dirname(filePath)
       });
-      if (packageJsonPath === null || packageJsonPath === void 0 ? void 0 : packageJsonPath.startsWith(dependencySearchRoot)) {
+      if (packageJsonPath) {
         const packageJson = await fse.readJSON(packageJsonPath);
         pkgPath = baseDir = path.dirname(packageJsonPath);
         subpath = path.relative(baseDir, filePath);

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

@@ -15,7 +15,7 @@ const createServer = async (options) => {
   if (server) {
     server.close();
   }
-  server = (await createDevServer(options, applyPlugins)).server;
+  server = await createDevServer(options, applyPlugins);
   return server;
 };
 export {

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

@@ -1 +1 @@
-export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack").createRspackBuilderForModern>;
+export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack/index.js").createRspackBuilderForModern>;

package/dist/types/esm/esbuild-loader.d.mts

@@ -0,0 +1,6 @@
+export function initialize({ appDir, alias, tsconfigPath }: {
+    appDir: any;
+    alias: any;
+    tsconfigPath: any;
+}): Promise<void>;
+export function resolve(specifier: any, context: any, defaultResolve: any): any;

package/dist/types/esm/register-esm.d.mts

@@ -0,0 +1,5 @@
+export function registerEsm({ appDir, distDir, alias }: {
+    appDir: any;
+    distDir: any;
+    alias: any;
+}): Promise<void>;

package/dist/types/esm/ts-node-loader.d.mts

@@ -0,0 +1,6 @@
+export function initialize({ appDir, alias, tsconfigPath }: {
+    appDir: any;
+    alias: any;
+    tsconfigPath: any;
+}): Promise<void>;
+export function resolve(specifier: any, context: any, defaultResolve: any): any;

package/dist/types/esm/utils.d.mts

@@ -0,0 +1,6 @@
+export function createMatchPath({ alias, appDir, tsconfigPath }: {
+    alias: any;
+    appDir: any;
+    tsconfigPath: any;
+}): tsConfigPaths.MatchPath;
+import tsConfigPaths from '@modern-js/utils/tsconfig-paths';

package/dist/types/plugins/deploy/platforms/netlify-entry-mjs.d.ts

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

package/dist/types/plugins/deploy/platforms/netlifyEntry.d.ts

@@ -1,2 +1 @@
-declare function _default(request: any, context: any): Promise<any>;
-export default _default;
+export function createHandler(): Promise<any>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.57.0",
+  "version": "2.57.1-alpha.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -90,30 +90,30 @@
     "@modern-js/core": "2.57.0",
     "@modern-js/node-bundle-require": "2.57.0",
     "@modern-js/plugin": "2.57.0",
-    "@modern-js/plugin-data-loader": "2.57.0",
     "@modern-js/plugin-i18n": "2.57.0",
-    "@modern-js/plugin-lint": "2.57.0",
     "@modern-js/prod-server": "2.57.0",
     "@modern-js/rsbuild-plugin-esbuild": "2.57.0",
-    "@modern-js/server-utils": "2.57.0",
     "@modern-js/server": "2.57.0",
+    "@modern-js/plugin-lint": "2.57.0",
     "@modern-js/server-core": "2.57.0",
+    "@modern-js/server-utils": "2.57.0",
     "@modern-js/types": "2.57.0",
+    "@modern-js/utils": "2.57.0",
     "@modern-js/uni-builder": "2.57.0",
-    "@modern-js/utils": "2.57.0"
+    "@modern-js/plugin-data-loader": "2.57.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "1.0.1-beta.3",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
-    "@types/node": "^14",
+    "@types/node": "^16",
     "jest": "^29",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@scripts/jest-config": "2.57.0",
-    "@scripts/build": "2.57.0"
+    "@scripts/build": "2.57.0",
+    "@scripts/jest-config": "2.57.0"
   },
   "sideEffects": false,
   "publishConfig": {