@modern-js/app-tools 3.0.0-beta.0 → 3.0.0

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

@@ -1,22 +1,2 @@
-import { bundle } from '@modern-js/node-bundle-require';
-import type { ServerConfig } from '@modern-js/server-core';
 import type { AppNormalizedConfig } from '../types';
-export declare const defineServerConfig: (config: ServerConfig) => ServerConfig;
-export declare const buildServerConfig: ({
-  appDirectory,
-  distDirectory,
-  configFile,
-  options
-}: {
-  appDirectory: string;
-  distDirectory: string;
-  configFile: string;
-  options?: Parameters<typeof bundle>[1];
-}) => Promise<void>;
-/**
- *
- * 处理循环引用的 replacer
- */
-
-export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
-export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig<'shared'>) => Promise<void>;
+export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig) => Promise<void>;

package/dist/types/utils/createServer.d.ts

@@ -1,12 +1,5 @@
-import { Server, ModernDevServerOptions } from '@modern-js/server';
-import type { InternalPlugins } from '@modern-js/types';
-export declare const getServer: () => Server | null;
-export declare const setServer: (newServer: Server) => void;
+import type { Server } from 'node:http';
+import type { Http2SecureServer } from 'node:http2';
+export declare const getServer: () => Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | Http2SecureServer<typeof import("http").IncomingMessage, typeof import("http").ServerResponse, typeof import("http2").Http2ServerRequest, typeof import("http2").Http2ServerResponse> | null;
+export declare const setServer: (newServer: Server | Http2SecureServer) => void;
 export declare const closeServer: () => Promise<void>;
-export declare const createServer: (options: ModernDevServerOptions) => Promise<Server>;
-export declare const injectDataLoaderPlugin: (internalPlugins: InternalPlugins) => {
-  '@modern-js/plugin-data-loader': {
-    path: string;
-    forced: boolean;
-  };
-};

package/dist/types/utils/env.d.ts

@@ -1,2 +1,2 @@
-import type { IAppContext } from '../types';
-export declare function getAutoInjectEnv(appContext: IAppContext): Record<string, string>;
+import type { AppToolsContext } from '../types/plugin';
+export declare function getAutoInjectEnv(appContext: AppToolsContext): Record<string, string>;

package/dist/types/utils/generateWatchFiles.d.ts

@@ -1,3 +1,2 @@
-import { IAppContext } from '../types';
-export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
-export declare function generateWatchFiles(appContext: IAppContext, configDir?: string): Promise<string[]>;
+import type { AppToolsContext } from '../types/plugin';
+export declare function generateWatchFiles(appContext: AppToolsContext, configDir?: string): Promise<string[]>;

package/dist/types/utils/getConfigFile.d.ts

@@ -0,0 +1 @@
+export declare const getConfigFile: (configFile?: string) => string | false;

package/dist/types/utils/getSelectedEntries.d.ts

@@ -1,6 +1,5 @@
-import { Entrypoint } from '@modern-js/types';
+import type { Entrypoint } from '@modern-js/types';
 /**
  * Allow user to select entrypoints to build.
  */
-
-export declare const getSelectedEntries: (entry: string[] | boolean, entrypoints: Entrypoint[]) => Promise<string[]>;
+export declare const getSelectedEntries: (entry: string[] | boolean, entrypoints: Entrypoint[]) => Promise<string[]>;

package/dist/types/utils/initAppContext.d.ts

@@ -0,0 +1,30 @@
+export declare const initAppContext: ({ metaName, appDirectory, runtimeConfigFile, options, tempDir, }: {
+    metaName: string;
+    appDirectory: string;
+    runtimeConfigFile: string;
+    options?: {
+        srcDir?: string;
+        apiDir?: string;
+        distDir?: string;
+        sharedDir?: string;
+    };
+    tempDir?: string;
+}) => {
+    runtimeConfigFile: string;
+    ip: any;
+    port: number;
+    moduleType: any;
+    apiDirectory: string;
+    lambdaDirectory: string;
+    sharedDirectory: string;
+    serverPlugins: never[];
+    internalDirectory: string;
+    htmlTemplates: {};
+    serverRoutes: never[];
+    entrypoints: never[];
+    checkedEntries: never[];
+    apiOnly: boolean;
+    internalDirAlias: string;
+    internalSrcAlias: string;
+    bffRuntimeFramework: string;
+};

package/dist/types/utils/loadPlugins.d.ts

@@ -0,0 +1,15 @@
+import type { CLIPluginAPI } from '@modern-js/plugin';
+import type { Plugin } from '@modern-js/plugin';
+import type { ServerPlugin as ServerPluginInstance } from '@modern-js/server-core';
+import type { ServerPlugin } from '@modern-js/types';
+import type { InternalPlugins } from '@modern-js/types';
+import type { AppTools } from '../types';
+export declare function getServerPlugins(api: CLIPluginAPI<AppTools>, metaName?: string): Promise<ServerPlugin[]>;
+export declare function loadServerPlugins(api: CLIPluginAPI<AppTools>, appDirectory: string, metaName: string): Promise<ServerPluginInstance[]>;
+/**
+ * Load internal plugins which in @modern-js scope and user's custom plugins.
+ * @param appDirectory - Application root directory.
+ * @param internalPlugins - Internal plugins.
+ * @returns Plugin Objects has been required.
+ */
+export declare const loadInternalPlugins: (appDirectory: string, internalPlugins?: InternalPlugins) => Promise<Plugin[]>;

package/dist/types/utils/printInstructions.d.ts

@@ -1,3 +1,3 @@
-import type { IAppContext, CliHooksRunner } from '@modern-js/core';
-import type { AppNormalizedConfig, AppTools } from '../types';
-export declare const printInstructions: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<void>;
+import type { AppNormalizedConfig } from '../types';
+import type { AppToolsContext, AppToolsHooks } from '../types/plugin';
+export declare const printInstructions: (hooks: AppToolsHooks, appContext: AppToolsContext, config: AppNormalizedConfig) => Promise<void>;

package/dist/types/utils/register.d.ts

@@ -0,0 +1,7 @@
+import { type Alias } from '@modern-js/utils';
+import type { ConfigChain } from '@rsbuild/core';
+/**
+ * Setup TypeScript runtime support.
+ * Register ts-node for compilation and tsconfig-paths for path alias resolution.
+ */
+export declare const setupTsRuntime: (appDir: string, distDir: string, alias?: ConfigChain<Alias>) => Promise<void>;

package/dist/types/utils/restart.d.ts

@@ -1,3 +1,2 @@
-import { ToRunners } from '@modern-js/core';
-import { AppToolsHooks } from '../types/hooks';
-export declare function restart(hooksRunner: ToRunners<AppToolsHooks>, filename: string): Promise<void>;
+import type { AppToolsHooks } from '../types/plugin';
+export declare function restart(hooks: AppToolsHooks, filename: string): Promise<void>;

package/dist/types/utils/routes.d.ts

@@ -1,3 +1,4 @@
-import type { IAppContext } from '@modern-js/core';
-declare const generateRoutes: (appContext: IAppContext) => Promise<void>;
-export { generateRoutes };
+import type { AppToolsContext } from '../types/plugin';
+export declare const generateRoutes: (appContext: AppToolsContext) => Promise<void>;
+export declare const getPathWithoutExt: (filename: string) => string;
+export declare const isMainEntry: (entryName: string, mainEntryName?: string) => boolean;

package/dist/types/utils/types.d.ts

@@ -1,21 +1,27 @@
 export type DevOptions = {
-  entry?: string[] | boolean;
-  config?: string;
-  apiOnly?: boolean;
-  analyze?: boolean;
+    entry?: string[] | boolean;
+    config?: string;
+    apiOnly?: boolean;
+    analyze?: boolean;
 };
 export type BuildOptions = {
-  config?: string;
-  analyze?: boolean;
+    config?: string;
+    analyze?: boolean;
+    watch?: boolean;
 };
 export type DeployOptions = {
-  config?: string;
+    config?: string;
+    skipBuild?: boolean;
 };
 export type StartOptions = {
-  apiOnly?: boolean;
+    apiOnly?: boolean;
 };
 export type InspectOptions = {
-  env: string;
-  output: string;
-  verbose?: boolean;
-};
+    env: string;
+    output: string;
+    verbose?: boolean;
+};
+export type InfoOptions = {
+    config?: string;
+    json?: boolean;
+};

package/lib/types.d.ts

@@ -6,10 +6,15 @@
 declare namespace NodeJS {
   interface ProcessEnv {
     NODE_ENV: 'development' | 'production' | 'test';
-    readonly PUBLIC_URL: string;
+    readonly ASSET_PREFIX: string;
+    readonly MODERN_TARGET: 'browser' | 'node';
   }
 }
 
+// reference @rsbuild/core/types, but there are some differences, such as svg
+/**
+ * Image assets
+ */
 declare module '*.bmp' {
   const src: string;
   export default src;
@@ -35,123 +40,152 @@ declare module '*.png' {
   export default src;
 }
 
-declare module '*.ico' {
+declare module '*.pjpeg' {
   const src: string;
   export default src;
 }
-
-declare module '*.webp' {
+declare module '*.pjp' {
   const src: string;
   export default src;
 }
-
-declare module '*.svg' {
-  import * as React from 'react';
-
-  export const ReactComponent: React.FunctionComponent<
-    React.SVGProps<SVGSVGElement>
-  >;
-
+declare module '*.apng' {
   const src: string;
   export default src;
 }
-
-declare module '*.bmp?inline' {
+declare module '*.tif' {
   const src: string;
   export default src;
 }
-
-declare module '*.gif?inline' {
+declare module '*.tiff' {
   const src: string;
   export default src;
 }
-
-declare module '*.jpg?inline' {
+declare module '*.jfif' {
   const src: string;
   export default src;
 }
 
-declare module '*.jpeg?inline' {
+declare module '*.avif' {
   const src: string;
   export default src;
 }
 
-declare module '*.png?inline' {
+declare module '*.ico' {
   const src: string;
   export default src;
 }
 
-declare module '*.ico?inline' {
+declare module '*.webp' {
   const src: string;
   export default src;
 }
 
-declare module '*.webp?inline' {
+/**
+ * Font assets
+ */
+declare module '*.woff' {
   const src: string;
   export default src;
 }
-
-declare module '*.svg?inline' {
-  import * as React from 'react';
-
-  export const ReactComponent: React.FunctionComponent<
-    React.SVGProps<SVGSVGElement>
-  >;
-
-  /**
-   * The default export type depends on the svgDefaultExport config,
-   * it can be a string or a ReactComponent
-   * */
-  const content: any;
-  export default content;
+declare module '*.woff2' {
+  const src: string;
+  export default src;
 }
-
-declare module '*.bmp?url' {
+declare module '*.eot' {
   const src: string;
   export default src;
 }
-
-declare module '*.gif?url' {
+declare module '*.ttf' {
   const src: string;
   export default src;
 }
-
-declare module '*.jpg?url' {
+declare module '*.otf' {
   const src: string;
   export default src;
 }
-
-declare module '*.jpeg?url' {
+declare module '*.ttc' {
   const src: string;
   export default src;
 }
 
-declare module '*.png?url' {
+/**
+ * Media assets
+ */
+declare module '*.mp4' {
   const src: string;
   export default src;
 }
-
-declare module '*.ico?url' {
+declare module '*.webm' {
   const src: string;
   export default src;
 }
-
-declare module '*.webp?url' {
+declare module '*.ogg' {
+  const src: string;
+  export default src;
+}
+declare module '*.mp3' {
+  const src: string;
+  export default src;
+}
+declare module '*.wav' {
+  const src: string;
+  export default src;
+}
+declare module '*.flac' {
+  const src: string;
+  export default src;
+}
+declare module '*.aac' {
+  const src: string;
+  export default src;
+}
+declare module '*.mov' {
+  const src: string;
+  export default src;
+}
+declare module '*.m4a' {
+  const src: string;
+  export default src;
+}
+declare module '*.opus' {
   const src: string;
   export default src;
 }
 
-declare module '*.svg?url' {
+declare module '*.svg' {
   import * as React from 'react';
 
   export const ReactComponent: React.FunctionComponent<
     React.SVGProps<SVGSVGElement>
   >;
 
+  /**
+   * The default export type depends on the svgDefaultExport config,
+   * it can be a string or a ReactComponent
+   * */
+  const content: any;
+  export default content;
+}
+
+declare module '*.svg?react' {
+  const ReactComponent: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+  export default ReactComponent;
+}
+
+/**
+ * Queries
+ */
+declare module '*?inline' {
+  const content: string;
+  export default content;
+}
+
+declare module '*?url' {
   const src: string;
   export default src;
 }
 
+
 declare module '*.css' {
   const classes: { readonly [key: string]: string };
   export default classes;
@@ -172,6 +206,9 @@ declare module '*.sass' {
   export default classes;
 }
 
+/**
+ * CSS Modules
+ */
 declare module '*.module.css' {
   const classes: { readonly [key: string]: string };
   export default classes;
@@ -202,19 +239,13 @@ declare module '*.hbs' {
   export default src;
 }
 
-declare module '*.yaml' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.toml' {
-  const src: string;
-  export default src;
-}
-
 declare module '*.xml' {
   const src: string;
   export default src;
 }
 
-declare module '@modern-js/runtime/*' {}
+declare module 'http' {
+  interface ServerResponse {
+    locals: Record<string, any>;
+  }
+}

package/package.json

@@ -2,8 +2,12 @@
   "name": "@modern-js/app-tools",
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
-  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
-  "repository": "modern-js-dev/modern.js",
+  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/solutions/app-tools"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,46 +15,63 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-beta.0",
-  "jsnext:source": "./src/index.ts",
+  "version": "3.0.0",
   "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": {
     ".": {
+      "types": "./dist/types/index.d.ts",
+      "node": {
+        "import": "./dist/esm-node/index.mjs",
+        "require": "./dist/cjs/index.js"
+      },
+      "default": "./dist/cjs/index.js"
+    },
+    "./builder": {
+      "types": "./dist/types/builder/index.d.ts",
       "node": {
-        "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm-node/builder/index.mjs",
+        "require": "./dist/cjs/builder/index.js"
       },
-      "default": "./dist/js/node/index.js"
+      "default": "./dist/cjs/builder/index.js"
     },
     "./cli": {
-      "jsnext:source": "./src/index.ts",
-      "default": "./dist/js/node/index.js"
+      "types": "./dist/types/index.d.ts",
+      "node": {
+        "import": "./dist/esm-node/index.mjs",
+        "require": "./dist/cjs/index.js"
+      },
+      "default": "./dist/cjs/index.js"
+    },
+    "./cli/run": {
+      "types": "./dist/types/run/index.d.ts",
+      "node": {
+        "import": "./dist/esm-node/run/index.mjs",
+        "require": "./dist/cjs/run/index.js"
+      },
+      "default": "./dist/cjs/run/index.js"
     },
     "./types": {
-      "jsnext:source": "./lib/types.d.ts",
+      "types": "./lib/types.d.ts",
       "default": "./lib/types.d.ts"
-    },
-    "./server": {
-      "jsnext:source": "./src/exports/server.ts",
-      "default": "./dist/js/node/exports/server.js"
     }
   },
   "engines": {
-    "node": ">=14.17.6"
+    "node": ">=20"
   },
   "typesVersions": {
     "*": {
       ".": [
         "./dist/types/index.d.ts"
       ],
+      "cli/run": [
+        "./dist/types/run/index.d.ts"
+      ],
       "types": [
         "./lib/types.d.ts"
       ],
-      "server": [
-        "./dist/types/exports/server.d.ts"
+      "builder": [
+        "./dist/types/builder/index.d.ts"
       ]
     }
   },
@@ -59,48 +80,49 @@
     "modern-app": "./bin/modern.js"
   },
   "dependencies": {
-    "@babel/parser": "^7.18.0",
-    "@babel/runtime": "^7.18.0",
-    "@babel/traverse": "^7.18.0",
-    "@babel/types": "^7.18.0",
-    "es-module-lexer": "^1.1.0",
-    "esbuild": "0.15.7",
-    "@modern-js/builder": "2.4.1-beta.0",
-    "@modern-js/builder-plugin-esbuild": "2.4.1-beta.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.4.1-beta.0",
-    "@modern-js/builder-shared": "2.5.0-beta.0",
-    "@modern-js/builder-webpack-provider": "2.5.0-beta.0",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/new-action": "2.4.1-beta.0",
-    "@modern-js/node-bundle-require": "2.4.1-beta.0",
-    "@modern-js/plugin": "2.4.0",
-    "@modern-js/plugin-data-loader": "2.4.1-beta.0",
-    "@modern-js/plugin-i18n": "2.4.1-beta.0",
-    "@modern-js/plugin-lint": "2.4.1-beta.0",
-    "@modern-js/prod-server": "2.4.1-beta.0",
-    "@modern-js/server": "2.4.1-beta.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/upgrade": "2.4.1-beta.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@babel/parser": "^7.28.6",
+    "@babel/traverse": "^7.28.6",
+    "@babel/types": "^7.28.6",
+    "@rsbuild/core": "2.0.0-beta.1",
+    "@swc/helpers": "^0.5.17",
+    "es-module-lexer": "^1.7.0",
+    "esbuild": "0.25.5",
+    "esbuild-register": "^3.6.0",
+    "flatted": "^3.3.3",
+    "mlly": "^1.8.0",
+    "ndepe": "^0.1.13",
+    "pkg-types": "^1.3.1",
+    "std-env": "^3.10.0",
+    "@modern-js/builder": "3.0.0",
+    "@modern-js/i18n-utils": "3.0.0",
+    "@modern-js/plugin": "3.0.0",
+    "@modern-js/plugin-data-loader": "3.0.0",
+    "@modern-js/prod-server": "3.0.0",
+    "@modern-js/server": "3.0.0",
+    "@modern-js/server-utils": "3.0.0",
+    "@modern-js/server-core": "3.0.0",
+    "@modern-js/types": "3.0.0",
+    "@modern-js/utils": "3.0.0"
   },
   "devDependencies": {
-    "@types/babel__traverse": "^7.14.2",
-    "@types/jest": "^27",
-    "@types/node": "^14",
-    "jest": "^27",
-    "typescript": "^4",
-    "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "2.4.1-beta.0",
-    "@modern-js/builder-rspack-provider": "2.5.0-beta.0",
-    "@modern-js/server-core": "2.4.1-beta.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@rslib/core": "0.19.4",
+    "@types/babel__traverse": "7.28.0",
+    "@types/node": "^20",
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0",
+    "typescript": "^5",
+    "@modern-js/rslib": "2.68.10",
+    "@scripts/rstest-config": "2.66.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.5.0-beta.0"
+    "ts-node": "^10.9.2",
+    "tsconfig-paths": "^4.2.0"
   },
   "peerDependenciesMeta": {
-    "@modern-js/builder-rspack-provider": {
+    "ts-node": {
+      "optional": true
+    },
+    "tsconfig-paths": {
       "optional": true
     }
   },
@@ -110,9 +132,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern-lib new",
-    "dev": "modern-lib build --watch",
-    "build": "modern-lib build",
-    "test": "jest --passWithNoTests"
+    "dev": "rslib build --watch",
+    "build": "rslib build",
+    "test": "rstest"
   }
 }

package/rslib.config.mts

@@ -0,0 +1,20 @@
+import { rslibConfig } from '@modern-js/rslib';
+import { defineConfig } from '@rslib/core';
+
+export default defineConfig({
+  ...rslibConfig,
+  lib: rslibConfig.lib?.map(libConfig => {
+    return {
+      ...libConfig,
+      output: {
+        ...libConfig.output,
+        copy: [
+          {
+            from: './src/esm',
+            to: './esm',
+          },
+        ],
+      },
+    };
+  }),
+});