@modern-js/app-tools 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/types/builder/builderPlugins/compatModern.d.ts

@@ -7,7 +7,8 @@ declare type FnParameter<T extends {
 }> = { [P in keyof T]: Parameter<T[P]> };
 export declare type PluginCompatModernOptions = FnParameter<Partial<Pick<BuilderPluginAPI, 'onAfterBuild' | 'onAfterCreateCompiler' | 'onAfterStartDevServer' | 'onBeforeBuild' | 'onBeforeCreateCompiler' | 'onBeforeStartDevServer' | 'onDevCompileDone' | 'onExit'>>>;
 /**
- * Provides default configuration consistent with `@modern-js/webpack`
+ * Provides default configuration consistent with modern.js v1
  */
+
 export declare const PluginCompatModern: (appContext: IAppContext, modernConfig: AppNormalizedConfig, options?: PluginCompatModernOptions) => BuilderPlugin<BuilderPluginAPI>;
 export {};

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

@@ -1,5 +1,5 @@
 import { BuilderInstance, BuilderTarget, CreateBuilderOptions } from '@modern-js/builder';
-import { BuilderConfig } from '@modern-js/builder-webpack-provider';
+import { BuilderConfig, BuilderWebpackProvider } from '@modern-js/builder-webpack-provider';
 import type { IAppContext } from '@modern-js/core';
 import type { AppNormalizedConfig } from '../types';
 import { PluginCompatModernOptions } from './builderPlugins/compatModern';
@@ -9,10 +9,10 @@ export declare type BuilderOptions = {
   appContext: IAppContext;
   compatPluginConfig?: PluginCompatModernOptions;
 };
-export declare function createBuilderForEdenX({
+export declare function createBuilderForModern({
   normalizedConfig,
   appContext,
   compatPluginConfig
-}: BuilderOptions): Promise<BuilderInstance>;
+}: BuilderOptions): Promise<BuilderInstance<BuilderWebpackProvider>>;
 export declare function createBuilderProviderConfig(normalizedConfig: AppNormalizedConfig, appContext: IAppContext): BuilderConfig;
 export declare function createBuilderOptions(target: BuilderTarget | BuilderTarget[], appContext: IAppContext): CreateBuilderOptions;

package/dist/types/builder/loaders/routerLoader.d.ts

@@ -0,0 +1,3 @@
+import type { LoaderContext } from 'webpack';
+declare function loader(this: LoaderContext<void>, source: string): string;
+export default loader;

package/dist/types/builder/loaders/serverModuleLoader.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from 'webpack';
+declare function loader(this: LoaderContext<void>): string;
+export default loader;

package/dist/types/builder/webpackPlugins/routerPlugin.d.ts

@@ -1,10 +1,4 @@
 import type { Compiler } from 'webpack';
-interface Options {
-  existNestedRoutes: boolean;
-}
 export default class RouterPlugin {
-  private existNestedRoutes;
-  constructor(options: Options);
   apply(compiler: Compiler): void;
-}
-export {};
+}

package/dist/types/defineConfig.d.ts

@@ -4,4 +4,5 @@ export declare const defineConfig: (config: AppUserConfig) => AppUserConfig;
  * @deprecated
  * Using defineConfig first.
  */
+
 export declare const defineLegacyConfig: (config: AppLegacyUserConfig) => AppLegacyUserConfig;

package/dist/types/index.d.ts

@@ -1,6 +1,11 @@
-import { CliPlugin } from '@modern-js/core';
+import { Command } from '@modern-js/utils';
+import { CliPlugin, PluginAPI } from '@modern-js/core';
 import { AppTools } from './types';
 export * from './defineConfig';
 export * from './types';
+export declare const devCommand: (program: Command, api: PluginAPI<AppTools>) => Promise<void>;
+export declare const buildCommand: (program: Command, api: PluginAPI<AppTools>) => Promise<void>;
+
 declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

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

@@ -1,3 +1,5 @@
 import { CliPlugin, AppTools } from '../types';
+
 declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

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

@@ -1,7 +1,7 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-declare type BuilderEnvConfig = Required<BuilderConfig>['dev'];
+declare type BuilderDevConfig = Required<BuilderConfig>['dev'];
 export declare type DevProxyOptions = string | Record<string, string>;
-export interface DevUserConfig extends Pick<BuilderEnvConfig, 'assetPrefix' | 'https'> {
+export interface DevUserConfig extends Omit<BuilderDevConfig, 'port'> {
   /**
    * The configuration of `dev.proxy` is provided by `proxy` plugin.
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.

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

@@ -37,6 +37,7 @@ export interface AppToolsUserConfig {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `bff` plugin
    */
+
   bff?: BffUserConfig;
 }
 export declare type AppToolsNormalizedConfig = {

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

@@ -2,7 +2,6 @@ import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 export declare type BuilderOutputConfig = Required<BuilderConfig>['output'];
 export interface OutputUserConfig extends BuilderOutputConfig {
   ssg?: SSGConfig;
-  enableModernMode?: boolean;
   disableNodePolyfill?: boolean;
 }
 export declare type OutputNormalizedConfig = OutputUserConfig;

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

@@ -17,6 +17,7 @@ export interface SourceUserConfig extends BuilderSourceConfig {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `tailwindcss` plugin
    */
+
   designSystem?: Record<string, any>;
 }
 export declare type SourceNormalizedConfig = SourceUserConfig;

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

@@ -1,15 +1,24 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 import type { JestConfig } from '@modern-js/core';
+import type { PluginSwcOptions } from '@modern-js/builder-plugin-swc';
+import type { PluginEsbuildOptions } from '@modern-js/builder-plugin-esbuild';
 export declare type BuilderToolsConfig = Required<BuilderConfig>['tools'];
 /**
  * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
  * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
  * @requires `tailwindcss` plugin
  */
+
 export declare type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
 export interface ToolsUserConfig extends BuilderToolsConfig {
   tailwindcss?: Tailwindcss;
   jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
-  esbuild?: Record<string, unknown>;
+  esbuild?: PluginEsbuildOptions;
+  /**
+   * The configuration of `swc` is provided by `swc` plugin.
+   * @requires `swc` plugin
+   */
+
+  swc?: PluginSwcOptions;
 }
 export declare type ToolsNormalizedConfig = ToolsUserConfig;

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

@@ -1,6 +1,8 @@
 import type { webpack } from '@modern-js/builder-webpack-provider';
 import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js/plugin';
 import type { Entrypoint, HtmlPartials, NestedRoute, PageRoute, RouteLegacy, ServerRoute } from '@modern-js/types';
+import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
+import type { Stats, MultiStats } from '@modern-js/builder-shared';
 export interface ImportSpecifier {
   local?: string;
   imported?: string;
@@ -67,7 +69,7 @@ export declare type AppToolsHooks = {
     bundlerConfigs?: webpack.Configuration[];
   }, unknown>;
   afterBuild: AsyncWorkflow<{
-    stats?: webpack.Stats | webpack.MultiStats;
+    stats?: Stats | MultiStats;
   }, unknown>;
   beforeDeploy: AsyncWorkflow<Record<string, any>, unknown>;
   afterDeploy: AsyncWorkflow<Record<string, any>, unknown>;
@@ -77,4 +79,8 @@ export declare type AppToolsHooks = {
     eventType: 'add' | 'change' | 'unlink';
   }, void>;
   beforeRestart: AsyncWorkflow<void, void>;
+  registerDev: ParallelWorkflow<void, DevToolData>;
+  beforeDevTask: ParallelWorkflow<DevToolData, void>;
+  registerBuildPlatform: ParallelWorkflow<void, RegisterBuildPlatformResult>;
+  beforeBuildPlatform: ParallelWorkflow<RegisterBuildPlatformResult[], void>;
 };

package/dist/types/types/legacyConfig/dev.d.ts

@@ -8,5 +8,6 @@ export declare type DevUserLegacyConfig = {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `proxy` plugin
    */
+
   proxy?: DevProxyOptions;
 };

package/dist/types/types/legacyConfig/output.d.ts

@@ -38,7 +38,6 @@ export declare type OutputLegacyUserConfig = {
   templateParametersByEntries?: Record<string, Record<string, unknown>>;
   crossorigin?: boolean | CrossOrigin;
   cssModuleLocalIdentName?: string;
-  enableModernMode?: boolean;
   disableNodePolyfill?: boolean;
   enableTsLoader?: boolean;
   /**
@@ -46,6 +45,7 @@ export declare type OutputLegacyUserConfig = {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `ssg` plugin
    */
+
   ssg?: SSGConfig;
 };
 export {};

package/dist/types/types/legacyConfig/source.d.ts

@@ -21,5 +21,6 @@ export declare type SourceLegacyUserConfig = {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `tailwindcss` plugin
    */
+
   designSystem?: Record<string, any>;
 };

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

@@ -10,6 +10,7 @@ export declare type ToolsLegacyUserConfig = BuilderToolsConfig & {
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
    * @requires `tailwindcss` plugin
    */
+
   tailwindcss?: Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
   jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
 };

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

@@ -17,5 +17,6 @@ export declare const buildServerConfig: ({
  *
  * 处理循环引用的 replacer
  */
+
 export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
 export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig) => Promise<void>;

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

@@ -1,3 +1,4 @@
-import { IAppContext, ToRunners } from '@modern-js/core';
+import type { IAppContext, ToRunners } from '@modern-js/core';
 import { AppToolsHooks } from '../types/hooks';
+export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
 export declare const createFileWatcher: (appContext: IAppContext, configDir: string | undefined, hooksRunner: ToRunners<AppToolsHooks>) => Promise<import("@modern-js/utils").FSWatcher | undefined>;

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

@@ -1,6 +1,7 @@
 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;
 export declare const closeServer: () => Promise<void>;
 export declare const createServer: (options: ModernDevServerOptions) => Promise<Server>;
 export declare const injectDataLoaderPlugin: (internalPlugins: InternalPlugins) => {

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

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

package/lib/types.d.ts

@@ -5,7 +5,7 @@
 
 declare namespace NodeJS {
   interface ProcessEnv {
-    readonly NODE_ENV: 'development' | 'production' | 'test';
+    NODE_ENV: 'development' | 'production' | 'test';
     readonly PUBLIC_URL: string;
   }
 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -52,30 +52,33 @@
     }
   },
   "bin": {
-    "modern": "./bin/modern.js"
+    "modern": "./bin/modern.js",
+    "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",
-    "@modern-js/builder": "2.0.0-beta.2",
-    "@modern-js/builder-plugin-esbuild": "2.0.0-beta.2",
-    "@modern-js/builder-plugin-node-polyfill": "2.0.0-beta.2",
-    "@modern-js/builder-shared": "2.0.0-beta.2",
-    "@modern-js/builder-webpack-provider": "2.0.0-beta.2",
-    "@modern-js/core": "2.0.0-beta.2",
-    "@modern-js/new-action": "2.0.0-beta.2",
-    "@modern-js/node-bundle-require": "2.0.0-beta.2",
-    "@modern-js/plugin": "2.0.0-beta.2",
-    "@modern-js/plugin-data-loader": "2.0.0-beta.2",
-    "@modern-js/plugin-i18n": "2.0.0-beta.2",
-    "@modern-js/plugin-lint": "2.0.0-beta.2",
-    "@modern-js/prod-server": "2.0.0-beta.2",
-    "@modern-js/server": "2.0.0-beta.2",
-    "@modern-js/types": "2.0.0-beta.2",
-    "@modern-js/upgrade": "2.0.0-beta.2",
-    "@modern-js/utils": "2.0.0-beta.2"
+    "es-module-lexer": "^1.1.0",
+    "esbuild": "0.15.7",
+    "@modern-js/builder": "2.0.0-beta.4",
+    "@modern-js/builder-plugin-esbuild": "2.0.0-beta.4",
+    "@modern-js/builder-plugin-node-polyfill": "2.0.0-beta.4",
+    "@modern-js/builder-shared": "2.0.0-beta.4",
+    "@modern-js/builder-webpack-provider": "2.0.0-beta.4",
+    "@modern-js/core": "2.0.0-beta.4",
+    "@modern-js/new-action": "2.0.0-beta.4",
+    "@modern-js/node-bundle-require": "2.0.0-beta.4",
+    "@modern-js/plugin": "2.0.0-beta.4",
+    "@modern-js/plugin-data-loader": "2.0.0-beta.4",
+    "@modern-js/plugin-i18n": "2.0.0-beta.4",
+    "@modern-js/plugin-lint": "2.0.0-beta.4",
+    "@modern-js/prod-server": "2.0.0-beta.4",
+    "@modern-js/server": "2.0.0-beta.4",
+    "@modern-js/types": "2.0.0-beta.4",
+    "@modern-js/upgrade": "2.0.0-beta.4",
+    "@modern-js/utils": "2.0.0-beta.4"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -84,9 +87,10 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/server-core": "2.0.0-beta.2",
-    "@scripts/build": "2.0.0-beta.2",
-    "@scripts/jest-config": "2.0.0-beta.2"
+    "@modern-js/builder-plugin-swc": "2.0.0-beta.4",
+    "@modern-js/server-core": "2.0.0-beta.4",
+    "@scripts/build": "2.0.0-beta.4",
+    "@scripts/jest-config": "2.0.0-beta.4"
   },
   "sideEffects": false,
   "publishConfig": {