@modern-js/core 2.58.1 → 2.58.3

package/dist/config/createDefaultConfig.d.ts

@@ -1,2 +1,2 @@
-import { UserConfig } from '../types';
+import type { UserConfig } from '../types';
 export declare function createDefaultConfig(): UserConfig;

package/dist/config/createLoadedConfig.d.ts

@@ -1,4 +1,4 @@
-import { LoadedConfig, UserConfig } from '../types';
+import type { LoadedConfig, UserConfig } from '../types';
 /**
  * Assign the pkg config into the user config.
  */

package/dist/config/createLoadedConfig.js

@@ -33,8 +33,8 @@ __export(createLoadedConfig_exports, {
 });
 module.exports = __toCommonJS(createLoadedConfig_exports);
 var import_path = __toESM(require("path"));
-var import_lodash = require("@modern-js/utils/lodash");
 var import_utils = require("@modern-js/utils");
+var import_lodash = require("@modern-js/utils/lodash");
 var import_utils2 = require("../utils");
 var import_loadConfig = require("./loadConfig");
 const assignPkgConfig = (userConfig = {}, pkgConfig = {}) => (0, import_lodash.mergeWith)({}, userConfig, pkgConfig, (objValue, srcValue) => {

package/dist/config/createResolvedConfig.d.ts

@@ -1,2 +1,2 @@
-import type { UserConfig, NormalizedConfig, LoadedConfig } from '../types';
+import type { LoadedConfig, NormalizedConfig, UserConfig } from '../types';
 export declare const createResolveConfig: (loaded: LoadedConfig<{}>, configs: UserConfig[]) => Promise<NormalizedConfig>;

package/dist/config/loadConfig.js

@@ -39,8 +39,8 @@ __export(loadConfig_exports, {
 });
 module.exports = __toCommonJS(loadConfig_exports);
 var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
 var import_node_bundle_require = require("@modern-js/node-bundle-require");
+var import_utils = require("@modern-js/utils");
 const debug = (0, import_utils.createDebugger)("load-config");
 const CONFIG_FILE_NAME = "modern.config";
 const LOCAL_CONFIG_FILE_NAME = "modern.config.local";

package/dist/context.d.ts

@@ -1,4 +1,4 @@
-import type { CliPlugin, UserConfig, IAppContext, NormalizedConfig } from './types';
+import type { CliPlugin, IAppContext, NormalizedConfig, UserConfig } 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>>;

package/dist/context.js

@@ -39,8 +39,8 @@ __export(context_exports, {
 });
 module.exports = __toCommonJS(context_exports);
 var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
 var import_plugin = require("@modern-js/plugin");
+var import_utils = require("@modern-js/utils");
 const AppContext = (0, import_plugin.createContext)({});
 const ConfigContext = (0, import_plugin.createContext)({});
 const ResolvedConfigContext = (0, import_plugin.createContext)({});
@@ -59,6 +59,7 @@ const initAppContext = ({ appDirectory, plugins, configFile, runtimeConfigFile,
     ip: import_utils.address.ip(),
     port: 0,
     packageName: require(import_path.default.resolve(appDirectory, "./package.json")).name,
+    moduleType: require(import_path.default.resolve(appDirectory, "./package.json")).type || "commonjs",
     srcDirectory: import_path.default.resolve(appDirectory, srcDir),
     apiDirectory: import_path.default.resolve(appDirectory, apiDir),
     lambdaDirectory: import_path.default.resolve(appDirectory, apiDir, "lambda"),

package/dist/createCli.js

@@ -23,12 +23,12 @@ __export(createCli_exports, {
 });
 module.exports = __toCommonJS(createCli_exports);
 var import_utils = require("@modern-js/utils");
-var import_utils2 = require("./utils");
-var import_loadPlugins = require("./loadPlugins");
+var import_config = require("./config");
 var import_context = require("./context");
 var import_loadEnv = require("./loadEnv");
+var import_loadPlugins = require("./loadPlugins");
 var import_manager = require("./manager");
-var import_config = require("./config");
+var import_utils2 = require("./utils");
 var import_checkIsDuplicationPlugin = require("./utils/checkIsDuplicationPlugin");
 const setProgramVersion = (version = "unknown") => {
   import_utils.program.name("modern").usage("<command> [options]").version(version);

package/dist/loadPlugins.d.ts

@@ -1,5 +1,5 @@
-import { InternalPlugins } from '@modern-js/types';
-import type { CliPlugin, UserConfig, OldPluginConfig, PluginConfig } from './types';
+import type { InternalPlugins } from '@modern-js/types';
+import type { CliPlugin, OldPluginConfig, PluginConfig, UserConfig } from './types';
 export declare const isOldPluginConfig: (config?: PluginConfig) => config is OldPluginConfig;
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.

package/dist/loadPlugins.js

@@ -31,7 +31,7 @@ const resolveCliPlugin = async (p, appDirectory) => {
   const path = (0, import_utils.tryResolve)(pkg, appDirectory);
   let module2;
   try {
-    module2 = (0, import_utils.compatRequire)(path);
+    module2 = await (0, import_utils.compatibleRequire)(path);
   } catch (e) {
     ({ default: module2 } = await (0, import_utils.dynamicImport)(path));
   }

package/dist/manager.d.ts

@@ -1,4 +1,4 @@
-import { BasePluginAPI } from './types';
+import type { BasePluginAPI } from './types';
 export declare const manager: import("@modern-js/plugin").AsyncManager<{
     beforeConfig: import("@modern-js/plugin").AsyncWorkflow<void, void>;
     config: import("@modern-js/plugin").ParallelWorkflow<void, import("./types").UserConfig<{}>>;

package/dist/nodeApi.d.ts

@@ -1,4 +1,4 @@
-import { CoreOptions } from '.';
+import { type CoreOptions } from '.';
 export declare const dev: (options?: CoreOptions, commandOptions?: string[]) => void;
 export declare const build: (options?: CoreOptions, commandOptions?: string[]) => void;
 export declare const deploy: (options?: CoreOptions, commandOptions?: string[]) => void;

package/dist/runBin.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { CoreOptions } from '.';
+import { type CoreOptions } from '.';
 export declare const run: (otherCoreOptions?: CoreOptions, options?: {
     override?: boolean | ((coreOptions: CoreOptions) => Promise<CoreOptions> | CoreOptions) | undefined;
 }) => Promise<void>;

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

@@ -1,4 +1,4 @@
-import { PluginConfig } from '../plugin';
+import type { PluginConfig } from '../plugin';
 export type UserConfig<Extends extends {
     hooks?: ExtendHooks;
     userConfig?: ExtendUserConfig;

package/dist/types/context.d.ts

@@ -1,4 +1,4 @@
-import { Entrypoint, ServerRoute, HtmlTemplates, HtmlPartials, ServerPlugin } from '@modern-js/types';
+import type { Entrypoint, HtmlPartials, HtmlTemplates, ServerPlugin, ServerRoute } 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 {
@@ -34,6 +34,8 @@ export interface IAppContext {
     port?: number;
     /** Name of the current project's package.json */
     packageName: string;
+    /** Type field of package.json */
+    moduleType: 'module' | 'commonjs';
     /** Currently registered plugins */
     plugins: any[];
     /** Information for entry points */

package/dist/types/coreOptions.d.ts

@@ -1,5 +1,5 @@
-import type { InternalPlugins } from './plugin';
 import type { UserConfig } from './config';
+import type { InternalPlugins } from './plugin';
 export interface CoreOptions {
     cwd?: string;
     version?: string;

package/dist/types/hooks.d.ts

@@ -1,6 +1,6 @@
-import { Workflow, ParallelWorkflow, AsyncWaterfall, AsyncWorkflow, ToRunners, ToThreads } from '@modern-js/plugin';
+import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow, ToRunners, ToThreads, Workflow } from '@modern-js/plugin';
 import type { Command } from '@modern-js/utils';
-import type { UserConfig, NormalizedConfig } from './config';
+import type { NormalizedConfig, UserConfig } from './config';
 export type BaseHooks<Extends extends {
     hooks?: ExtendHooks;
     userConfig?: ExtendUserConfig;

package/dist/types/plugin.d.ts

@@ -1,6 +1,6 @@
-import { AsyncSetup, PluginOptions } from '@modern-js/plugin';
-import { BaseHooks } from './hooks';
-import { BasePluginAPI } from './pluginAPI';
+import type { AsyncSetup, PluginOptions } from '@modern-js/plugin';
+import type { BaseHooks } from './hooks';
+import type { BasePluginAPI } from './pluginAPI';
 export type { InternalPlugins } from '@modern-js/types';
 /** Plugin options of a cli plugin. */
 export type CliPlugin<Extends extends {

package/dist/types/pluginAPI.d.ts

@@ -1,6 +1,6 @@
-import { CommonAPI } from '@modern-js/plugin';
-import type { setAppContext, useAppContext, useResolvedConfigContext, useConfigContext } from '../context';
-import { BaseHooks } from './hooks';
+import type { CommonAPI } from '@modern-js/plugin';
+import type { setAppContext, useAppContext, useConfigContext, useResolvedConfigContext } from '../context';
+import type { BaseHooks } from './hooks';
 export type BasePluginAPI<Extends extends {
     hooks?: ExtendHooks;
     userConfig?: ExtendUserConfig;

package/dist/utils/commander.d.ts

@@ -1,4 +1,4 @@
-import { program, Command } from '@modern-js/utils';
+import { type Command, program } from '@modern-js/utils';
 export declare function initCommandsMap(): void;
 export type { Command };
 export { program };

package/dist/utils/createFileWatcher.js

@@ -32,8 +32,8 @@ __export(createFileWatcher_exports, {
 });
 module.exports = __toCommonJS(createFileWatcher_exports);
 var import_crypto = __toESM(require("crypto"));
-var path = __toESM(require("path"));
 var fs = __toESM(require("fs"));
+var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 const debug = (0, import_utils.createDebugger)("watch-files");
 const hashMap = /* @__PURE__ */ new Map();

package/dist/utils/initAppDir.d.ts

@@ -1 +1 @@
-export declare const initAppDir: (cwd?: string) => Promise<string>;
+export declare const initAppDir: (currentDir?: string) => Promise<string>;

package/dist/utils/initAppDir.js

@@ -33,10 +33,8 @@ __export(initAppDir_exports, {
 module.exports = __toCommonJS(initAppDir_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-const initAppDir = async (cwd) => {
-  if (!cwd) {
-    cwd = process.cwd();
-  }
+const initAppDir = async (currentDir) => {
+  const cwd = currentDir || process.cwd();
   const pkg = await (0, import_utils.pkgUp)({
     cwd
   });

package/dist/utils/mergeConfig.d.ts

@@ -1,2 +1,2 @@
-import { UserConfig, NormalizedConfig } from '../types';
+import type { NormalizedConfig, UserConfig } from '../types';
 export declare const mergeConfig: <ExtendConfig extends Record<string, any>>(configs: (UserConfig<ExtendConfig> | NormalizedConfig<ExtendConfig>)[]) => NormalizedConfig<ExtendConfig>;

package/package.json

@@ -14,7 +14,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1",
+  "version": "2.58.3",
   "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.58.1",
-    "@modern-js/utils": "2.58.1",
-    "@modern-js/plugin": "2.58.1"
+    "@modern-js/node-bundle-require": "2.58.3",
+    "@modern-js/plugin": "2.58.3",
+    "@modern-js/utils": "2.58.3"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -81,10 +81,10 @@
     "jest": "^29",
     "tsm": "2.3.0",
     "typescript": "^5",
-    "@scripts/build": "2.58.1",
-    "@modern-js/types": "2.58.1",
-    "@scripts/jest-config": "2.58.1",
-    "@modern-js/uni-builder": "2.58.1"
+    "@modern-js/uni-builder": "2.58.3",
+    "@modern-js/types": "2.58.3",
+    "@scripts/jest-config": "2.58.3",
+    "@scripts/build": "2.58.3"
   },
   "sideEffects": false,
   "publishConfig": {