@modern-js/core 2.53.0 → 2.54.1

package/dist/context.d.ts

@@ -1,4 +1,4 @@
-import type { CliPlugin, UserConfig, IAppContext, InternalPlugins, NormalizedConfig } from './types';
+import type { CliPlugin, UserConfig, IAppContext, NormalizedConfig } from './types';
 export declare const AppContext: import("@modern-js/plugin").Context<IAppContext>;
 export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig<any>>;
 export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<NormalizedConfig<any>>;
@@ -19,10 +19,11 @@ export declare const useConfigContext: <Extends extends Record<string, any>>() =
  * Get normalized content of user config.
  */
 export declare const useResolvedConfigContext: <Extends extends Record<string, any>>() => NormalizedConfig<Extends>;
-export declare const initAppContext: ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }: {
+export declare const initAppContext: ({ appDirectory, plugins, configFile, runtimeConfigFile, options, serverConfigFile, }: {
     appDirectory: string;
     plugins: CliPlugin[];
     configFile: string | false;
+    runtimeConfigFile: string | false;
     options?: {
         metaName?: string | undefined;
         srcDir?: string | undefined;
@@ -31,5 +32,4 @@ export declare const initAppContext: ({ appDirectory, plugins, configFile, optio
         sharedDir?: string | undefined;
     } | undefined;
     serverConfigFile: string;
-    serverInternalPlugins: InternalPlugins;
 }) => IAppContext;

package/dist/context.js

@@ -48,14 +48,14 @@ const setAppContext = (value) => AppContext.set(value);
 const useAppContext = () => AppContext.use().value;
 const useConfigContext = () => ConfigContext.use().value;
 const useResolvedConfigContext = () => ResolvedConfigContext.use().value;
-const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins }) => {
+const initAppContext = ({ appDirectory, plugins, configFile, runtimeConfigFile, options, serverConfigFile }) => {
   const { metaName = "modern-js", srcDir = "src", distDir = "", apiDir = "api", sharedDir = "shared" } = options || {};
   return {
     metaName,
     appDirectory,
     configFile,
+    runtimeConfigFile,
     serverConfigFile,
-    serverInternalPlugins,
     ip: import_utils.address.ip(),
     port: 0,
     packageName: require(import_path.default.resolve(appDirectory, "./package.json")).name,
@@ -65,6 +65,7 @@ const initAppContext = ({ appDirectory, plugins, configFile, options, serverConf
     distDirectory: distDir,
     sharedDirectory: import_path.default.resolve(appDirectory, sharedDir),
     nodeModulesDirectory: import_path.default.resolve(appDirectory, "./node_modules"),
+    serverPlugins: [],
     internalDirectory: import_path.default.resolve(appDirectory, `./node_modules/.${metaName}`),
     plugins,
     htmlTemplates: {},

package/dist/createCli.d.ts

@@ -1,7 +1,5 @@
 import type { CoreOptions } from './types';
-export declare const mergeOptions: (options?: CoreOptions) => CoreOptions & {
-    serverConfigFile: string;
-};
+export declare const mergeOptions: (options?: CoreOptions) => CoreOptions;
 export declare const createCli: () => {
     init: (options?: CoreOptions) => Promise<{
         resolved: import("./types").NormalizedConfig<{}>;

package/dist/createCli.js

@@ -35,6 +35,7 @@ const setProgramVersion = (version = "unknown") => {
 };
 const mergeOptions = (options) => {
   const defaultOptions = {
+    runtimeConfigFile: import_utils.DEFAULT_RUNTIME_CONFIG,
     serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG
   };
   return {
@@ -46,7 +47,7 @@ const createCli = () => {
   let hooksRunner;
   let initOptions;
   const init = async (options) => {
-    var _mergedOptions_options, _mergedOptions_internalPlugins, _mergedOptions_internalPlugins1, _mergedOptions_internalPlugins2;
+    var _mergedOptions_options, _mergedOptions_internalPlugins, _mergedOptions_internalPlugins1;
     import_manager.manager.clear();
     const mergedOptions = mergeOptions(options);
     initOptions = mergedOptions;
@@ -68,9 +69,9 @@ const createCli = () => {
       appDirectory,
       plugins,
       configFile: loaded.filePath,
+      runtimeConfigFile: (mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.runtimeConfigFile) || "",
       options: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options,
-      serverConfigFile: mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.serverConfigFile,
-      serverInternalPlugins: (mergedOptions === null || mergedOptions === void 0 ? void 0 : (_mergedOptions_internalPlugins2 = mergedOptions.internalPlugins) === null || _mergedOptions_internalPlugins2 === void 0 ? void 0 : _mergedOptions_internalPlugins2.server) || import_utils.INTERNAL_SERVER_PLUGINS
+      serverConfigFile: (mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.serverConfigFile) || ""
     });
     import_context.ConfigContext.set(loaded.config);
     import_context.AppContext.set(appContext);

package/dist/types/context.d.ts

@@ -1,4 +1,4 @@
-import { Entrypoint, InternalPlugins, ServerRoute, HtmlTemplates, HtmlPartials } from '@modern-js/types';
+import { Entrypoint, ServerRoute, HtmlTemplates, HtmlPartials, ServerPlugin } from '@modern-js/types';
 import type { UniBuilderInstance, UniBuilderWebpackInstance } from '@modern-js/uni-builder';
 export type ToolsType = 'app-tools' | 'module-tools' | 'monorepo-tools';
 export interface IAppContext {
@@ -22,10 +22,12 @@ export interface IAppContext {
     nodeModulesDirectory: string;
     /** Path to the configuration file */
     configFile: string | false;
+    /** Path to the runtime configuration file */
+    runtimeConfigFile: string | false;
     /** Path to the server configuration file */
     serverConfigFile: string;
-    /** Currently registered server plugins */
-    serverInternalPlugins: InternalPlugins;
+    /** Server Plugins  */
+    serverPlugins: ServerPlugin[];
     /** IPv4 address of the current machine */
     ip?: string;
     /** Port number of the development server */

package/dist/types/coreOptions.d.ts

@@ -4,6 +4,7 @@ export interface CoreOptions {
     cwd?: string;
     version?: string;
     configFile?: string;
+    runtimeConfigFile?: string;
     /**
      * The initial log message when CLI started
      */

package/package.json

@@ -14,7 +14,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.53.0",
+  "version": "2.54.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -71,9 +71,9 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.3",
-    "@modern-js/node-bundle-require": "2.53.0",
-    "@modern-js/utils": "2.53.0",
-    "@modern-js/plugin": "2.53.0"
+    "@modern-js/node-bundle-require": "2.54.1",
+    "@modern-js/plugin": "2.54.1",
+    "@modern-js/utils": "2.54.1"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -81,10 +81,10 @@
     "tsm": "2.3.0",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/uni-builder": "2.53.0",
-    "@modern-js/types": "2.53.0",
-    "@scripts/build": "2.53.0",
-    "@scripts/jest-config": "2.53.0"
+    "@modern-js/uni-builder": "2.54.1",
+    "@modern-js/types": "2.54.1",
+    "@scripts/build": "2.54.1",
+    "@scripts/jest-config": "2.54.1"
   },
   "sideEffects": false,
   "publishConfig": {