@modern-js/app-tools 1.22.2 → 2.0.0-alpha.0

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

@@ -0,0 +1,89 @@
+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;
+}
+export interface ImportStatement {
+  specifiers: ImportSpecifier[];
+  value: string;
+  initialize?: string;
+}
+export interface RuntimePlugin {
+  name: string;
+  options: string;
+  args?: string;
+}
+export declare type AppToolsHooks = {
+  modifyEntryExport: AsyncWaterfall<{
+    entrypoint: Entrypoint;
+    exportStatement: string;
+  }>;
+  modifyEntryImports: AsyncWaterfall<{
+    imports: ImportStatement[];
+    entrypoint: Entrypoint;
+  }>;
+  modifyEntryRuntimePlugins: AsyncWaterfall<{
+    entrypoint: Entrypoint;
+    plugins: RuntimePlugin[];
+  }>;
+  modifyEntryRenderFunction: AsyncWaterfall<{
+    entrypoint: Entrypoint;
+    code: string;
+  }>;
+  modifyAsyncEntry: AsyncWaterfall<{
+    entrypoint: Entrypoint;
+    code: string;
+  }>;
+  modifyFileSystemRoutes: AsyncWaterfall<{
+    entrypoint: Entrypoint;
+    routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
+  }>;
+  modifyServerRoutes: AsyncWaterfall<{
+    routes: ServerRoute[];
+  }>;
+  htmlPartials: AsyncWaterfall<{
+    entrypoint: Entrypoint;
+    partials: HtmlPartials;
+  }>;
+  beforeGenerateRoutes: AsyncWaterfall<{
+    entrypoint: Entrypoint;
+    code: string;
+  }>;
+  addDefineTypes: AsyncWaterfall<void>;
+  collectServerPlugins: AsyncWaterfall<{
+    plugins: Array<Record<string, string>>;
+  }>;
+  beforeDev: AsyncWorkflow<void, unknown>;
+  afterDev: AsyncWorkflow<void, unknown>;
+  beforeCreateCompiler: AsyncWorkflow<{
+    bundlerConfigs: webpack.Configuration[];
+  }, unknown>;
+  afterCreateCompiler: AsyncWorkflow<{
+    compiler?: webpack.Compiler | webpack.MultiCompiler;
+  }, unknown>;
+  beforePrintInstructions: AsyncWaterfall<{
+    instructions: string;
+  }>;
+  beforeBuild: AsyncWorkflow<{
+    bundlerConfigs?: webpack.Configuration[];
+  }, unknown>;
+  afterBuild: AsyncWorkflow<{
+    stats?: Stats | MultiStats;
+  }, unknown>;
+  beforeDeploy: AsyncWorkflow<Record<string, any>, unknown>;
+  afterDeploy: AsyncWorkflow<Record<string, any>, unknown>;
+  watchFiles: ParallelWorkflow<void>;
+  fileChange: AsyncWorkflow<{
+    filename: string;
+    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/index.d.ts

@@ -0,0 +1,23 @@
+import type { NormalizedConfig, UserConfig } from '@modern-js/core';
+import type { AppToolsUserConfig, AppToolsNormalizedConfig } from './config';
+import type { AppToolsHooks } from './hooks';
+import type { AppToolsLegacyUserConfig, AppToolsLegacyNormalizedConfig } from './legacyConfig';
+export * from './hooks';
+export * from './config';
+export * from './legacyConfig';
+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 declare type AppTools = {
+  hooks: AppToolsHooks;
+  userConfig: AppToolsUserConfig;
+  normalizedConfig: AppToolsNormalizedConfig;
+};
+export declare type LegacyAppTools = {
+  hooks: AppToolsHooks;
+  userConfig: AppToolsLegacyUserConfig;
+  normalizedConfig: AppToolsLegacyNormalizedConfig;
+};
+export declare type AppNormalizedConfig = NormalizedConfig<AppTools>;
+export declare type AppLegacyNormalizedConfig = NormalizedConfig<LegacyAppTools>;
+export declare type AppUserConfig = UserConfig<AppTools>;
+export declare type AppLegacyUserConfig = UserConfig<LegacyAppTools>;

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

@@ -0,0 +1,8 @@
+export interface MicroFrontend {
+  enableHtmlEntry?: boolean;
+  externalBasicLibrary?: boolean;
+  moduleApp?: string;
+}
+export declare type DeployLegacyUserConfig = {
+  microFrontend?: boolean | MicroFrontend;
+};

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

@@ -0,0 +1,13 @@
+import type { DevServerHttpsOptions } from '@modern-js/types';
+export declare type DevProxyOptions = string | Record<string, string>;
+export declare type DevUserLegacyConfig = {
+  assetPrefix?: string | boolean;
+  https?: DevServerHttpsOptions;
+  /**
+   * The configuration of `dev.proxy` is provided by `proxy` plugin.
+   * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+   * @requires `proxy` plugin
+   */
+
+  proxy?: DevProxyOptions;
+};

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

@@ -0,0 +1,33 @@
+import type { ServerUserConfig as LegacyServerUserConfig, BffUserConfig as LegacyBffUserConfig } from '@modern-js/server-core';
+import type { DevUserLegacyConfig } from './dev';
+import type { OutputLegacyUserConfig } from './output';
+import type { SourceLegacyUserConfig } from './source';
+import type { DeployLegacyUserConfig } from './deploy';
+import type { ToolsLegacyUserConfig } from './tools';
+export type { DevUserLegacyConfig } from './dev';
+export type { OutputLegacyUserConfig } from './output';
+export type { DeployLegacyUserConfig } from './deploy';
+export type { SourceLegacyUserConfig } from './source';
+export type { ToolsLegacyUserConfig } from './tools';
+export interface RuntimeLegacyConfig {
+  [name: string]: any;
+}
+export interface RuntimeByEntriesLegacyConfig {
+  [name: string]: RuntimeLegacyConfig;
+}
+export declare type AppToolsLegacyUserConfig = {
+  source?: SourceLegacyUserConfig;
+  output?: OutputLegacyUserConfig;
+  server?: LegacyServerUserConfig;
+  dev?: DevUserLegacyConfig;
+  deploy?: DeployLegacyUserConfig;
+  tools?: ToolsLegacyUserConfig;
+  runtime?: RuntimeLegacyConfig;
+  runtimeByEntries?: RuntimeByEntriesLegacyConfig;
+  bff?: LegacyBffUserConfig;
+  legacy?: boolean;
+};
+export interface AppToolsLegacyNormalizedConfig extends Required<AppToolsLegacyUserConfig> {
+  cliOptions?: Record<string, any>;
+  _raw: AppToolsLegacyUserConfig;
+}

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

@@ -0,0 +1,51 @@
+import { MetaOptions } from '@modern-js/utils';
+import { SSGConfig } from '../config';
+declare type CrossOrigin = 'anonymous' | 'use-credentials';
+export declare type OutputLegacyUserConfig = {
+  assetPrefix?: string;
+  htmlPath?: string;
+  jsPath?: string;
+  cssPath?: string;
+  mediaPath?: string;
+  path?: string;
+  title?: string;
+  titleByEntries?: Record<string, string>;
+  meta?: MetaOptions;
+  metaByEntries?: Record<string, MetaOptions>;
+  inject?: 'body' | 'head' | boolean;
+  injectByEntries?: Record<string, 'body' | 'head' | boolean>;
+  mountId?: string;
+  favicon?: string;
+  faviconByEntries?: Record<string, string | undefined>;
+  copy?: Array<Record<string, unknown> & {
+    from: string;
+  }>;
+  disableTsChecker?: boolean;
+  disableHtmlFolder?: boolean;
+  disableCssModuleExtension?: boolean;
+  disableCssExtract?: boolean;
+  enableCssModuleTSDeclaration?: boolean;
+  disableMinimize?: boolean;
+  enableInlineStyles?: boolean;
+  enableInlineScripts?: boolean;
+  disableSourceMap?: boolean;
+  disableInlineRuntimeChunk?: boolean;
+  disableAssetsCache?: boolean;
+  enableLatestDecorators?: boolean;
+  polyfill?: 'off' | 'usage' | 'entry' | 'ua';
+  dataUriLimit?: number;
+  templateParameters?: Record<string, unknown>;
+  templateParametersByEntries?: Record<string, Record<string, unknown>>;
+  crossorigin?: boolean | CrossOrigin;
+  cssModuleLocalIdentName?: string;
+  disableNodePolyfill?: boolean;
+  enableTsLoader?: boolean;
+  /**
+   * The configuration of `output.ssg` is provided by `ssg` plugin.
+   * 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

@@ -0,0 +1,25 @@
+import type { AliasOption } from '@modern-js/utils';
+export declare type SourceLegacyUserConfig = {
+  alias?: AliasOption;
+  entries?: Record<string, string | {
+    entry: string;
+    disableMount?: boolean;
+  }>;
+  preEntry?: string | string[];
+  enableAsyncEntry?: boolean;
+  disableDefaultEntries?: boolean;
+  entriesDir?: string;
+  configDir?: string;
+  apiDir?: string;
+  envVars?: Array<string>;
+  globalVars?: Record<string, string>;
+  moduleScopes?: Array<string | RegExp> | (((scopes: Array<string | RegExp>) => void) | ((scopes: Array<string | RegExp>) => Array<string | RegExp>))[] | ((scopes: Array<string | RegExp>) => Array<string | RegExp>) | ((scopes: Array<string | RegExp>) => void);
+  include?: Array<string | RegExp>;
+  /**
+   * The configuration of `source.designSystem` is provided by `tailwindcss` plugin.
+   * 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

@@ -0,0 +1,17 @@
+import type { DevServerOptions } from '@modern-js/types';
+import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
+import type { JestConfig } from '@modern-js/core';
+declare type BuilderToolsConfig = Required<BuilderConfig>['tools'];
+export declare type ToolsLegacyUserConfig = BuilderToolsConfig & {
+  esbuild?: Record<string, unknown>;
+  devServer?: DevServerOptions;
+  /**
+   * 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
+   */
+
+  tailwindcss?: Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
+  jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
+};
+export {};

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

@@ -0,0 +1,2 @@
+export declare const getCommand: () => string;
+export declare const isDevCommand: () => boolean;

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

@@ -1,6 +1,6 @@
 import { bundle } from '@modern-js/node-bundle-require';
-import type { NormalizedConfig } from '@modern-js/core';
 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,
@@ -19,4 +19,4 @@ export declare const buildServerConfig: ({
  */
 
 export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
-export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: NormalizedConfig) => Promise<void>;
+export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig) => Promise<void>;

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

@@ -0,0 +1,4 @@
+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,4 +1,12 @@
 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 createServer: (options: ModernDevServerOptions) => Promise<Server>;
+export declare const injectDataLoaderPlugin: (internalPlugins: InternalPlugins) => {
+  '@modern-js/plugin-data-loader': {
+    path: string;
+    forced: boolean;
+  };
+};

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

@@ -0,0 +1,2 @@
+import { AppTools, PluginAPI } from '../types';
+export declare function getServerInternalPlugins(api: PluginAPI<AppTools>): Promise<Record<string, string>>;

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

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

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

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

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

@@ -15,8 +15,7 @@ export declare type StartOptions = {
   apiOnly?: boolean;
 };
 export declare type InspectOptions = {
-  env?: string;
-  output?: string;
-  console?: boolean;
+  env: string;
+  output: string;
   verbose?: boolean;
 };

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": "1.22.2",
+  "version": "2.0.0-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -38,6 +38,9 @@
       "default": "./dist/js/node/exports/server.js"
     }
   },
+  "engines": {
+    "node": ">=14.17.6"
+  },
   "typesVersions": {
     "*": {
       ".": [
@@ -52,68 +55,56 @@
     }
   },
   "bin": {
-    "modern": "./bin/modern.js"
+    "modern": "./bin/modern.js",
+    "modern-app": "./bin/modern.js"
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.0",
     "@babel/parser": "^7.18.0",
+    "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
-    "@modern-js/core": "1.22.2",
-    "@modern-js/new-action": "1.22.2",
-    "@modern-js/upgrade": "1.22.2",
-    "@modern-js/node-bundle-require": "1.22.2",
-    "@modern-js/plugin": "1.22.2",
-    "@modern-js/plugin-i18n": "1.22.2",
-    "@modern-js/plugin-jarvis": "1.22.2",
-    "@modern-js/prod-server": "1.22.2",
-    "@modern-js/server": "1.22.2",
-    "@modern-js/types": "1.22.2",
-    "@modern-js/utils": "1.22.2",
-    "@modern-js/webpack": "1.22.2"
+    "@modern-js/builder": "2.0.0-beta.6",
+    "@modern-js/builder-plugin-esbuild": "2.0.0-beta.6",
+    "@modern-js/builder-plugin-node-polyfill": "2.0.0-beta.6",
+    "@modern-js/builder-shared": "2.0.0-beta.6",
+    "@modern-js/builder-webpack-provider": "2.0.0-beta.6",
+    "@modern-js/core": "2.0.0-beta.6",
+    "@modern-js/new-action": "2.0.0-beta.6",
+    "@modern-js/node-bundle-require": "2.0.0-beta.6",
+    "@modern-js/plugin": "2.0.0-beta.6",
+    "@modern-js/plugin-data-loader": "2.0.0-beta.6",
+    "@modern-js/plugin-i18n": "2.0.0-beta.6",
+    "@modern-js/plugin-lint": "2.0.0-beta.6",
+    "@modern-js/prod-server": "2.0.0-beta.6",
+    "@modern-js/server": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@modern-js/upgrade": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6",
+    "es-module-lexer": "^1.1.0",
+    "esbuild": "0.15.7"
   },
   "devDependencies": {
+    "@modern-js/builder-plugin-swc": "2.0.0-beta.6",
+    "@modern-js/server-core": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6",
     "@types/babel__traverse": "^7.14.2",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/server-core": "1.22.2",
-    "@scripts/build": "1.22.2",
-    "@scripts/jest-config": "1.22.2"
+    "webpack": "^5.75.0"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
-    "new": "modern new",
-    "dev": "modern build --watch",
-    "build": "wireit",
-    "test": "wireit"
-  }
+    "new": "modern-lib new",
+    "dev": "modern-lib build --watch",
+    "build": "modern-lib build",
+    "test": "jest --passWithNoTests"
+  },
+  "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }