@modern-js/app-tools 2.62.2-alpha.0 → 2.63.1-alpha.0

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

@@ -0,0 +1 @@
+export declare function isAutoLoadPlugins(appDirectory: string, configFile?: string, packageJsonConfig?: string): Promise<boolean>;

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

@@ -1,5 +1,15 @@
+import type { CLIPluginAPI } from '@modern-js/plugin-v2';
+import type { Plugin } from '@modern-js/plugin-v2';
 import type { ServerPlugin as ServerPluginInstance } from '@modern-js/server-core';
 import type { ServerPlugin } from '@modern-js/types';
-import type { AppTools, PluginAPI } from '../types';
-export declare function getServerPlugins(api: PluginAPI<AppTools<'shared'>>, metaName?: string): Promise<ServerPlugin[]>;
-export declare function loadServerPlugins(api: PluginAPI<AppTools<'shared'>>, appDirectory: string, metaName: string): Promise<ServerPluginInstance[]>;
+import type { InternalPlugins } from '@modern-js/types';
+import type { AppTools } from '../types';
+export declare function getServerPlugins(api: CLIPluginAPI<AppTools<'shared'>>, metaName?: string): Promise<ServerPlugin[]>;
+export declare function loadServerPlugins(api: CLIPluginAPI<AppTools<'shared'>>, 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, autoLoad?: InternalPlugins, autoLoadPlugins?: boolean) => Promise<Plugin[]>;

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

@@ -1,3 +1,3 @@
-import type { CliHooksRunner, IAppContext } 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/new';
+export declare const printInstructions: (hooks: AppToolsHooks<'shared'>, appContext: AppToolsContext<'shared'>, config: AppNormalizedConfig<'shared'>) => Promise<void>;

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

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

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

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

package/lib/types.d.ts

@@ -11,6 +11,10 @@ declare namespace NodeJS {
   }
 }
 
+// reference @rsbuild/core/types, but there are some differences, such as svg
+/**
+ * Image assets
+ */
 declare module '*.bmp' {
   const src: string;
   export default src;
@@ -36,143 +40,152 @@ declare module '*.png' {
   export default src;
 }
 
-declare module '*.avif' {
+declare module '*.pjpeg' {
   const src: string;
   export default src;
 }
-
-declare module '*.ico' {
+declare module '*.pjp' {
   const src: string;
   export default src;
 }
-
-declare module '*.webp' {
+declare module '*.apng' {
   const src: string;
   export default src;
 }
-
-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 '*.tif' {
+  const src: string;
+  export default src;
 }
-
-declare module '*.svg?react' {
-  const ReactComponent: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
-  export default ReactComponent;
+declare module '*.tiff' {
+  const src: string;
+  export default src;
 }
-
-declare module '*.bmp?inline' {
+declare module '*.jfif' {
   const src: string;
   export default src;
 }
 
-declare module '*.gif?inline' {
+declare module '*.avif' {
   const src: string;
   export default src;
 }
 
-declare module '*.jpg?inline' {
+declare module '*.ico' {
   const src: string;
   export default src;
 }
 
-declare module '*.jpeg?inline' {
+declare module '*.webp' {
   const src: string;
   export default src;
 }
 
-declare module '*.png?inline' {
+/**
+ * Font assets
+ */
+declare module '*.woff' {
   const src: string;
   export default src;
 }
-
-declare module '*.avif?inline' {
+declare module '*.woff2' {
   const src: string;
   export default src;
 }
-
-declare module '*.ico?inline' {
+declare module '*.eot' {
   const src: string;
   export default src;
 }
-
-declare module '*.webp?inline' {
+declare module '*.ttf' {
   const src: string;
   export default src;
 }
-
-declare module '*.svg?inline' {
-  import * as React from 'react';
-
-  export const ReactComponent: React.FunctionComponent<
-    React.SVGProps<SVGSVGElement>
-  >;
-
+declare module '*.otf' {
   const src: string;
   export default src;
 }
-
-declare module '*.bmp?url' {
+declare module '*.ttc' {
   const src: string;
   export default src;
 }
 
-declare module '*.gif?url' {
+/**
+ * Media assets
+ */
+declare module '*.mp4' {
   const src: string;
   export default src;
 }
-
-declare module '*.jpg?url' {
+declare module '*.webm' {
   const src: string;
   export default src;
 }
-
-declare module '*.jpeg?url' {
+declare module '*.ogg' {
   const src: string;
   export default src;
 }
-
-declare module '*.png?url' {
+declare module '*.mp3' {
   const src: string;
   export default src;
 }
-
-declare module '*.avif?url' {
+declare module '*.wav' {
   const src: string;
   export default src;
 }
-
-declare module '*.ico?url' {
+declare module '*.flac' {
   const src: string;
   export default src;
 }
-
-declare module '*.webp?url' {
+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;
@@ -193,6 +206,9 @@ declare module '*.sass' {
   export default classes;
 }
 
+/**
+ * CSS Modules
+ */
 declare module '*.module.css' {
   const classes: { readonly [key: string]: string };
   export default classes;
@@ -224,12 +240,17 @@ declare module '*.hbs' {
 }
 
 declare module '*.yaml' {
-  const src: string;
+  const src: Record<string, any>;
   export default src;
 }
 
+declare module '*.yml' {
+  const content: Record<string, any>;
+  export default content;
+}
+
 declare module '*.toml' {
-  const src: string;
+  const src: Record<string, any>;
   export default src;
 }
 

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.62.2-alpha.0",
+  "version": "2.63.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -35,9 +35,9 @@
       "default": "./dist/cjs/index.js"
     },
     "./cli/run": {
-      "types": "./dist/types/new/run.d.ts",
-      "jsnext:source": "./src/new/run.ts",
-      "default": "./dist/cjs/new/run.js"
+      "types": "./dist/types/run/index.d.ts",
+      "jsnext:source": "./src/run/index.ts",
+      "default": "./dist/cjs/run/index.js"
     },
     "./types": {
       "types": "./lib/types.d.ts",
@@ -64,7 +64,7 @@
         "./dist/types/index.d.ts"
       ],
       "cli/run": [
-        "./dist/types/new/run.d.ts"
+        "./dist/types/run/index.d.ts"
       ],
       "types": [
         "./lib/types.d.ts"
@@ -85,8 +85,8 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.26.0",
-    "@rsbuild/core": "~1.1.0",
-    "@rsbuild/plugin-node-polyfill": "~1.2.0",
+    "@rsbuild/core": "1.1.8",
+    "@rsbuild/plugin-node-polyfill": "1.2.0",
     "@swc/helpers": "0.5.13",
     "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
@@ -96,23 +96,23 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/plugin-v2": "2.60.6",
-    "@modern-js/core": "2.62.1",
-    "@modern-js/plugin": "2.62.1",
-    "@modern-js/plugin-i18n": "2.62.1",
-    "@modern-js/plugin-data-loader": "2.62.1",
-    "@modern-js/prod-server": "2.62.1",
-    "@modern-js/rsbuild-plugin-esbuild": "2.62.1",
-    "@modern-js/node-bundle-require": "2.62.1",
-    "@modern-js/server": "2.62.1",
-    "@modern-js/uni-builder": "2.62.1",
-    "@modern-js/server-utils": "2.62.1",
-    "@modern-js/server-core": "2.62.1",
-    "@modern-js/utils": "2.62.1",
-    "@modern-js/types": "2.62.1"
+    "@modern-js/core": "2.63.0",
+    "@modern-js/node-bundle-require": "2.63.0",
+    "@modern-js/plugin": "2.63.0",
+    "@modern-js/plugin-i18n": "2.63.0",
+    "@modern-js/plugin-v2": "2.63.0",
+    "@modern-js/prod-server": "2.63.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.63.0",
+    "@modern-js/server": "2.63.0",
+    "@modern-js/server-core": "2.63.0",
+    "@modern-js/server-utils": "2.63.0",
+    "@modern-js/types": "2.63.0",
+    "@modern-js/uni-builder": "2.63.0",
+    "@modern-js/utils": "2.63.0",
+    "@modern-js/plugin-data-loader": "2.63.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-webpack-swc": "~1.0.3",
+    "@rsbuild/plugin-webpack-swc": "1.0.9",
     "@types/babel__traverse": "7.20.6",
     "@types/jest": "^29",
     "@types/node": "^16",
@@ -121,8 +121,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.96.1",
-    "@scripts/build": "2.62.1",
-    "@scripts/jest-config": "2.62.1"
+    "@scripts/build": "2.63.0",
+    "@scripts/jest-config": "2.63.0"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",

package/dist/cjs/hooks.js

@@ -1,60 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var hooks_exports = {};
-__export(hooks_exports, {
-  hooks: () => hooks
-});
-module.exports = __toCommonJS(hooks_exports);
-var import_plugin = require("@modern-js/plugin");
-const hooks = {
-  _internalRuntimePlugins: (0, import_plugin.createAsyncWaterfall)(),
-  modifyFileSystemRoutes: (0, import_plugin.createAsyncWaterfall)(),
-  modifyServerRoutes: (0, import_plugin.createAsyncWaterfall)(),
-  /** add entry point info to entrypoints array */
-  modifyEntrypoints: (0, import_plugin.createAsyncWaterfall)(),
-  /** add entry type */
-  checkEntryPoint: (0, import_plugin.createAsyncWaterfall)(),
-  generateEntryCode: (0, import_plugin.createAsyncWorkflow)(),
-  htmlPartials: (0, import_plugin.createAsyncWaterfall)(),
-  beforeGenerateRoutes: (0, import_plugin.createAsyncWaterfall)(),
-  _internalServerPlugins: (0, import_plugin.createAsyncWaterfall)(),
-  beforeDev: (0, import_plugin.createAsyncWorkflow)(),
-  afterDev: (0, import_plugin.createAsyncWorkflow)(),
-  beforeCreateCompiler: (0, import_plugin.createAsyncWorkflow)(),
-  afterCreateCompiler: (0, import_plugin.createAsyncWorkflow)(),
-  beforePrintInstructions: (0, import_plugin.createAsyncWaterfall)(),
-  beforeBuild: (0, import_plugin.createAsyncWorkflow)(),
-  afterBuild: (0, import_plugin.createAsyncWorkflow)(),
-  beforeDeploy: (0, import_plugin.createAsyncWorkflow)(),
-  deploy: (0, import_plugin.createAsyncWorkflow)(),
-  afterDeploy: (0, import_plugin.createAsyncWorkflow)(),
-  beforeRestart: (0, import_plugin.createAsyncWorkflow)(),
-  /**
-  * @deprecated
-  */
-  registerDev: (0, import_plugin.createParallelWorkflow)(),
-  /**
-  * @deprecated
-  */
-  registerBuildPlatform: (0, import_plugin.createParallelWorkflow)()
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  hooks
-});

package/dist/cjs/new/index.js

@@ -1,79 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var new_exports = {};
-__export(new_exports, {
-  appTools: () => appTools,
-  initAppContext: () => import_context.initAppContext
-});
-module.exports = __toCommonJS(new_exports);
-var import_plugin_v2 = require("@modern-js/plugin-v2");
-var import_old = require("../old");
-var import_compat = require("./compat");
-var import_constants = require("./constants");
-var import_context = require("./context");
-__reExport(new_exports, require("../defineConfig"), module.exports);
-const appTools = (options = {
-  // default webpack to be compatible with original projects
-  bundler: "webpack"
-}) => ({
-  name: "@modern-js/app-tools",
-  usePlugins: [
-    (0, import_compat.compatPlugin)(),
-    (0, import_old.appTools)(options)
-  ],
-  post: [
-    "@modern-js/app-tools-old"
-  ],
-  registryHooks: {
-    onBeforeConfig: (0, import_plugin_v2.createAsyncHook)(),
-    onAfterPrepare: (0, import_plugin_v2.createAsyncHook)(),
-    deploy: (0, import_plugin_v2.createAsyncHook)(),
-    _internalRuntimePlugins: (0, import_plugin_v2.createAsyncHook)(),
-    _internalServerPlugins: (0, import_plugin_v2.createAsyncHook)(),
-    checkEntryPoint: (0, import_plugin_v2.createAsyncHook)(),
-    modifyEntrypoints: (0, import_plugin_v2.createAsyncHook)(),
-    modifyFileSystemRoutes: (0, import_plugin_v2.createAsyncHook)(),
-    modifyServerRoutes: (0, import_plugin_v2.createAsyncHook)(),
-    generateEntryCode: (0, import_plugin_v2.createAsyncHook)(),
-    onBeforeGenerateRoutes: (0, import_plugin_v2.createAsyncHook)(),
-    onBeforePrintInstructions: (0, import_plugin_v2.createAsyncHook)(),
-    registerDev: (0, import_plugin_v2.createAsyncHook)(),
-    registerBuildPlatform: (0, import_plugin_v2.createAsyncHook)(),
-    addRuntimeExports: (0, import_plugin_v2.createAsyncHook)()
-  },
-  setup: (api) => {
-    var _userConfig_output;
-    const context = api.getAppContext();
-    const userConfig = api.getConfig();
-    api.updateAppContext((0, import_context.initAppContext)({
-      appDirectory: context.appDirectory,
-      options: {},
-      serverConfigFile: import_constants.DEFAULT_SERVER_CONFIG_FILE,
-      runtimeConfigFile: import_constants.DEFAULT_RUNTIME_CONFIG_FILE,
-      tempDir: (_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir
-    }));
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  appTools,
-  initAppContext,
-  ...require("../defineConfig")
-});

package/dist/cjs/new/loadPlugins.js

@@ -1,57 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var loadPlugins_exports = {};
-__export(loadPlugins_exports, {
-  loadInternalPlugins: () => loadInternalPlugins
-});
-module.exports = __toCommonJS(loadPlugins_exports);
-var import_utils = require("@modern-js/utils");
-const debug = (0, import_utils.createDebugger)("load-plugins");
-const resolveCliPlugin = async (p, appDirectory) => {
-  const pkg = typeof p === "string" ? p : p[0];
-  const pluginOptions = typeof p === "string" ? void 0 : p[1];
-  const path = (0, import_utils.tryResolve)(pkg, appDirectory);
-  let module2;
-  try {
-    module2 = await (0, import_utils.compatibleRequire)(path);
-  } catch (e) {
-    ({ default: module2 } = await (0, import_utils.dynamicImport)(path));
-  }
-  if (typeof module2 === "function") {
-    const result = module2(pluginOptions);
-    return result;
-  }
-  return module2;
-};
-const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins) => {
-  const plugins = [
-    ...autoLoadPlugins ? (0, import_utils.getInternalPlugins)(appDirectory, internalPlugins) : [],
-    ...autoLoad ? (0, import_utils.getInternalPlugins)(appDirectory, autoLoad) : []
-  ];
-  const loadedPlugins = await Promise.all(plugins.map((plugin) => {
-    const loadedPlugin = resolveCliPlugin(plugin, appDirectory);
-    debug(`resolve plugin %s: %s`, plugin, loadedPlugin);
-    return loadedPlugin;
-  }));
-  return loadedPlugins;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  loadInternalPlugins
-});