@modern-js/core 1.12.2 → 1.12.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @modern-js/core
 
+## 1.12.3
+
+### Patch Changes
+
+- b82869d: Export types from mergeConfig.ts
+- Updated dependencies [b82869d]
+  - @modern-js/utils@1.7.10
+
 ## 1.12.2
 
 ### Patch Changes

package/dist/config/index.d.ts

@@ -1,11 +1,12 @@
 import { ErrorObject } from '../../compiled/ajv';
 import { defaults } from './defaults';
-import { mergeConfig, NormalizedConfig } from './mergeConfig';
+import { NormalizedConfig } from './mergeConfig';
 import { PluginValidateSchema } from './schema';
 import type { UserConfig, ConfigParam, LoadedConfig } from './types';
 export { defaults as defaultsConfig };
-export { mergeConfig };
+export * from './mergeConfig';
 export * from './types';
+export * from './schema';
 export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
 export declare const defineConfig: (config: ConfigParam) => ConfigParam;
 /**

package/dist/config/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveConfig = exports.loadUserConfig = exports.assignPkgConfig = exports.defineConfig = exports.addServerConfigToDeps = exports.mergeConfig = exports.defaultsConfig = void 0;
+exports.resolveConfig = exports.loadUserConfig = exports.assignPkgConfig = exports.defineConfig = exports.addServerConfigToDeps = exports.defaultsConfig = void 0;
 const load_config_1 = require("@modern-js/load-config");
 const utils_1 = require("@modern-js/utils");
 const lodash_1 = require("@modern-js/utils/lodash");
@@ -28,10 +28,11 @@ const repeatKeyWarning_1 = require("../utils/repeatKeyWarning");
 const defaults_1 = require("./defaults");
 Object.defineProperty(exports, "defaultsConfig", { enumerable: true, get: function () { return defaults_1.defaults; } });
 const mergeConfig_1 = require("./mergeConfig");
-Object.defineProperty(exports, "mergeConfig", { enumerable: true, get: function () { return mergeConfig_1.mergeConfig; } });
 const schema_1 = require("./schema");
 const debug = (0, utils_1.createDebugger)('resolve-config');
+__exportStar(require("./mergeConfig"), exports);
 __exportStar(require("./types"), exports);
+__exportStar(require("./schema"), exports);
 const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
     const serverConfig = await (0, utils_1.getServerConfig)(appDirectory, serverConfigFile);
     if (serverConfig) {

package/dist/pluginAPI.d.ts

@@ -5,7 +5,7 @@ export declare const pluginAPI: {
     setAppContext: (value: import("@modern-js/types").IAppContext) => void;
     useAppContext: () => import("@modern-js/types").IAppContext;
     useConfigContext: () => import("./config").UserConfig;
-    useResolvedConfigContext: () => import(".").NormalizedConfig;
+    useResolvedConfigContext: () => import("./config").NormalizedConfig;
 };
 export type { IAppContext } from '@modern-js/types';
 /** all apis for cli plugin */

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.12.2",
+  "version": "1.12.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@modern-js/load-config": "^1.3.6",
     "@modern-js/plugin": "^1.4.0",
-    "@modern-js/utils": "^1.7.9"
+    "@modern-js/utils": "^1.7.10"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",