@modern-js/core 2.26.0 → 2.27.0

package/dist/config/loadConfig.js

@@ -1,130 +1,133 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadConfig = exports.getConfigFilePath = exports.clearFilesOverTime = exports.getDependencies = exports.getPackageConfig = exports.PACKAGE_JSON_CONFIG_NAME = exports.LOCAL_CONFIG_FILE_NAME = exports.CONFIG_FILE_NAME = void 0;
-const path_1 = __importDefault(require("path"));
-const utils_1 = require("@modern-js/utils");
-const node_bundle_require_1 = require("@modern-js/node-bundle-require");
-const debug = (0, utils_1.createDebugger)('load-config');
-exports.CONFIG_FILE_NAME = 'modern.config';
-exports.LOCAL_CONFIG_FILE_NAME = 'modern.config.local';
-exports.PACKAGE_JSON_CONFIG_NAME = 'modernConfig';
-/**
- * Get user config from package.json.
- * @param appDirectory - App root directory.
- * @returns modernConfig or undefined
- */
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  CONFIG_FILE_NAME: function() {
+    return CONFIG_FILE_NAME;
+  },
+  LOCAL_CONFIG_FILE_NAME: function() {
+    return LOCAL_CONFIG_FILE_NAME;
+  },
+  PACKAGE_JSON_CONFIG_NAME: function() {
+    return PACKAGE_JSON_CONFIG_NAME;
+  },
+  getPackageConfig: function() {
+    return getPackageConfig;
+  },
+  getDependencies: function() {
+    return getDependencies;
+  },
+  clearFilesOverTime: function() {
+    return clearFilesOverTime;
+  },
+  getConfigFilePath: function() {
+    return getConfigFilePath;
+  },
+  loadConfig: function() {
+    return loadConfig;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _utils = require("@modern-js/utils");
+const _nodebundlerequire = require("@modern-js/node-bundle-require");
+const debug = (0, _utils.createDebugger)("load-config");
+const CONFIG_FILE_NAME = "modern.config";
+const LOCAL_CONFIG_FILE_NAME = "modern.config.local";
+const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
 const getPackageConfig = (appDirectory, packageJsonConfig) => {
-    const json = JSON.parse(utils_1.fs.readFileSync(path_1.default.resolve(appDirectory, './package.json'), 'utf8'));
-    return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : exports.PACKAGE_JSON_CONFIG_NAME];
+  const json = JSON.parse(_utils.fs.readFileSync(_path.default.resolve(appDirectory, "./package.json"), "utf8"));
+  return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
 };
-exports.getPackageConfig = getPackageConfig;
-/**
- * Get the file dependencies by module.children, ignore file path in node_modules and this monorepo packages default.
- * @param filePath - Absolute file path.
- * @returns File dependencies array.
- */
 const getDependencies = (filePath) => {
-    const mod = require.cache[filePath];
-    if (!mod) {
-        debug(`${filePath} has not been required yet`);
-        return [];
-    }
-    const deps = [];
-    if (!/\/node_modules\/|\/modern-js\/packages\//.test(mod.id)) {
-        deps.push(mod.id);
-        for (const child of mod.children) {
-            deps.push(...(0, exports.getDependencies)(child.id));
-        }
+  const mod = require.cache[filePath];
+  if (!mod) {
+    debug(`${filePath} has not been required yet`);
+    return [];
+  }
+  const deps = [];
+  if (!/\/node_modules\/|\/modern-js\/packages\//.test(mod.id)) {
+    deps.push(mod.id);
+    for (const child of mod.children) {
+      deps.push(...getDependencies(child.id));
     }
-    return deps;
+  }
+  return deps;
 };
-exports.getDependencies = getDependencies;
-/**
- *
- * @param targetDir target dir
- * @param overtime Unit of second
- */
 const clearFilesOverTime = async (targetDir, overtime) => {
-    try {
-        // when stats is true, globby return Stats[]
-        const files = (await (0, utils_1.globby)(`${targetDir}/**/*`, {
-            stats: true,
-            absolute: true,
-        }));
-        const currentTime = Date.now();
-        if (files.length > 0) {
-            for (const file of files) {
-                if (currentTime - file.stats.birthtimeMs >= overtime * 1000) {
-                    utils_1.fs.unlinkSync(file.path);
-                }
-            }
+  try {
+    const files = await (0, _utils.globby)(`${targetDir}/**/*`, {
+      stats: true,
+      absolute: true
+    });
+    const currentTime = Date.now();
+    if (files.length > 0) {
+      for (const file of files) {
+        if (currentTime - file.stats.birthtimeMs >= overtime * 1e3) {
+          _utils.fs.unlinkSync(file.path);
         }
+      }
     }
-    catch (err) {
-        // ignore error when clear files
-    }
+  } catch (err) {
+  }
 };
-exports.clearFilesOverTime = clearFilesOverTime;
 const bundleRequireWithCatch = async (configFile, { appDirectory }) => {
-    try {
-        const mod = await (0, node_bundle_require_1.bundleRequire)(configFile, {
-            autoClear: false,
-            getOutputFile: async (filePath) => {
-                const defaultOutputFileName = path_1.default.basename(await (0, node_bundle_require_1.defaultGetOutputFile)(filePath));
-                const outputPath = path_1.default.join(appDirectory, utils_1.CONFIG_CACHE_DIR);
-                // 10 min
-                const timeLimit = 10 * 60;
-                await (0, exports.clearFilesOverTime)(outputPath, timeLimit);
-                return path_1.default.join(outputPath, defaultOutputFileName);
-            },
-        });
-        return mod;
-    }
-    catch (e) {
-        if (e instanceof Error) {
-            e.message = `Get Error while loading config file: ${configFile}, please check it and retry.\n${e.message || ''}`;
-        }
-        throw e;
+  try {
+    const mod = await (0, _nodebundlerequire.bundleRequire)(configFile, {
+      autoClear: false,
+      getOutputFile: async (filePath) => {
+        const defaultOutputFileName = _path.default.basename(await (0, _nodebundlerequire.defaultGetOutputFile)(filePath));
+        const outputPath = _path.default.join(appDirectory, _utils.CONFIG_CACHE_DIR);
+        const timeLimit = 10 * 60;
+        await clearFilesOverTime(outputPath, timeLimit);
+        return _path.default.join(outputPath, defaultOutputFileName);
+      }
+    });
+    return mod;
+  } catch (e) {
+    if (e instanceof Error) {
+      e.message = `Get Error while loading config file: ${configFile}, please check it and retry.
+${e.message || ""}`;
     }
+    throw e;
+  }
 };
 const getConfigFilePath = (appDirectory, filePath) => {
-    if (filePath) {
-        if (path_1.default.isAbsolute(filePath)) {
-            return filePath;
-        }
-        return path_1.default.resolve(appDirectory, filePath);
+  if (filePath) {
+    if (_path.default.isAbsolute(filePath)) {
+      return filePath;
     }
-    return (0, utils_1.findExists)(utils_1.CONFIG_FILE_EXTENSIONS.map(extension => path_1.default.resolve(appDirectory, `${exports.CONFIG_FILE_NAME}${extension}`)));
+    return _path.default.resolve(appDirectory, filePath);
+  }
+  return (0, _utils.findExists)(_utils.CONFIG_FILE_EXTENSIONS.map((extension) => _path.default.resolve(appDirectory, `${CONFIG_FILE_NAME}${extension}`)));
 };
-exports.getConfigFilePath = getConfigFilePath;
-/**
- * Parse and load user config file, support extensions like .ts, mjs, js, ejs.
- * @param appDirectory - App root directory, from which start search user config file.
- * @param configFile - Specific absolute config file path.
- * @returns Object contain config file path, user config object and dependency files used by config file.
- */
 const loadConfig = async (appDirectory, configFile, packageJsonConfig, loadedConfig) => {
-    const pkgConfig = (0, exports.getPackageConfig)(appDirectory, packageJsonConfig);
-    let config;
-    const dependencies = pkgConfig
-        ? [path_1.default.resolve(appDirectory, './package.json')]
-        : [];
-    if (loadedConfig) {
-        config = loadedConfig;
-    }
-    else if (configFile) {
-        delete require.cache[configFile];
-        const mod = await bundleRequireWithCatch(configFile, { appDirectory });
-        config = mod.default || mod;
-    }
-    return {
-        path: configFile,
-        config,
-        pkgConfig,
-        dependencies,
-    };
+  const pkgConfig = getPackageConfig(appDirectory, packageJsonConfig);
+  let config;
+  const dependencies = pkgConfig ? [
+    _path.default.resolve(appDirectory, "./package.json")
+  ] : [];
+  if (loadedConfig) {
+    config = loadedConfig;
+  } else if (configFile) {
+    delete require.cache[configFile];
+    const mod = await bundleRequireWithCatch(configFile, {
+      appDirectory
+    });
+    config = mod.default || mod;
+  }
+  return {
+    path: configFile,
+    config,
+    pkgConfig,
+    dependencies
+  };
 };
-exports.loadConfig = loadConfig;

package/dist/context.d.ts

@@ -19,17 +19,24 @@ 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, }: {
-    appDirectory: string;
-    plugins: CliPlugin[];
-    configFile: string | false;
-    options?: {
-        metaName?: string | undefined;
-        srcDir?: string | undefined;
-        apiDir?: string | undefined;
-        distDir?: string | undefined;
-        sharedDir?: string | undefined;
-    } | undefined;
-    serverConfigFile: string;
-    serverInternalPlugins: InternalPlugins;
-}) => IAppContext;
+export declare const initAppContext: ({
+  appDirectory,
+  plugins,
+  configFile,
+  options,
+  serverConfigFile,
+  serverInternalPlugins
+}: {
+  appDirectory: string;
+  plugins: CliPlugin[];
+  configFile: string | false;
+  options?: {
+    metaName?: string | undefined;
+    srcDir?: string | undefined;
+    apiDir?: string | undefined;
+    distDir?: string | undefined;
+    sharedDir?: string | undefined;
+  } | undefined;
+  serverConfigFile: string;
+  serverInternalPlugins: InternalPlugins;
+}) => IAppContext;

package/dist/context.js

@@ -1,62 +1,76 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  AppContext: function() {
+    return AppContext;
+  },
+  ConfigContext: function() {
+    return ConfigContext;
+  },
+  ResolvedConfigContext: function() {
+    return ResolvedConfigContext;
+  },
+  setAppContext: function() {
+    return setAppContext;
+  },
+  useAppContext: function() {
+    return useAppContext;
+  },
+  useConfigContext: function() {
+    return useConfigContext;
+  },
+  useResolvedConfigContext: function() {
+    return useResolvedConfigContext;
+  },
+  initAppContext: function() {
+    return initAppContext;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _utils = require("@modern-js/utils");
+const _plugin = require("@modern-js/plugin");
+const AppContext = (0, _plugin.createContext)({});
+const ConfigContext = (0, _plugin.createContext)({});
+const ResolvedConfigContext = (0, _plugin.createContext)({});
+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 { metaName = "modern-js", srcDir = "src", distDir = "", apiDir = "api", sharedDir = "shared" } = options || {};
+  return {
+    metaName,
+    appDirectory,
+    configFile,
+    serverConfigFile,
+    serverInternalPlugins,
+    ip: _utils.address.ip(),
+    port: 0,
+    packageName: require(_path.default.resolve(appDirectory, "./package.json")).name,
+    srcDirectory: _path.default.resolve(appDirectory, srcDir),
+    apiDirectory: _path.default.resolve(appDirectory, apiDir),
+    lambdaDirectory: _path.default.resolve(appDirectory, apiDir, "lambda"),
+    distDirectory: distDir,
+    sharedDirectory: _path.default.resolve(appDirectory, sharedDir),
+    nodeModulesDirectory: _path.default.resolve(appDirectory, "./node_modules"),
+    internalDirectory: _path.default.resolve(appDirectory, `./node_modules/.${metaName}`),
+    plugins,
+    htmlTemplates: {},
+    serverRoutes: [],
+    entrypoints: [],
+    checkedEntries: [],
+    apiOnly: false,
+    internalDirAlias: `@_${metaName.replace(/-/g, "_")}_internal`,
+    internalSrcAlias: `@_${metaName.replace(/-/g, "_")}_src`
+  };
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initAppContext = exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.setAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = void 0;
-const path_1 = __importDefault(require("path"));
-const utils_1 = require("@modern-js/utils");
-const plugin_1 = require("@modern-js/plugin");
-exports.AppContext = (0, plugin_1.createContext)({});
-exports.ConfigContext = (0, plugin_1.createContext)({});
-exports.ResolvedConfigContext = (0, plugin_1.createContext)({});
-/**
- * Set app context.
- * @param value new app context. It will override previous app context.
- */
-const setAppContext = (value) => exports.AppContext.set(value);
-exports.setAppContext = setAppContext;
-/**
- * Get app context, including directories, plugins and some static infos.
- */
-const useAppContext = () => exports.AppContext.use().value;
-exports.useAppContext = useAppContext;
-/**
- * Get original content of user config.
- */
-const useConfigContext = () => exports.ConfigContext.use().value;
-exports.useConfigContext = useConfigContext;
-/**
- * Get normalized content of user config.
- */
-const useResolvedConfigContext = () => exports.ResolvedConfigContext.use().value;
-exports.useResolvedConfigContext = useResolvedConfigContext;
-const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, }) => {
-    const { metaName = 'modern-js', srcDir = 'src', distDir = '', apiDir = 'api', sharedDir = 'shared', } = options || {};
-    return {
-        metaName,
-        appDirectory,
-        configFile,
-        serverConfigFile,
-        serverInternalPlugins,
-        ip: utils_1.address.ip(),
-        port: 0,
-        packageName: require(path_1.default.resolve(appDirectory, './package.json')).name,
-        srcDirectory: path_1.default.resolve(appDirectory, srcDir),
-        apiDirectory: path_1.default.resolve(appDirectory, apiDir),
-        lambdaDirectory: path_1.default.resolve(appDirectory, apiDir, 'lambda'),
-        distDirectory: distDir,
-        sharedDirectory: path_1.default.resolve(appDirectory, sharedDir),
-        nodeModulesDirectory: path_1.default.resolve(appDirectory, './node_modules'),
-        internalDirectory: path_1.default.resolve(appDirectory, `./node_modules/.${metaName}`),
-        plugins,
-        htmlTemplates: {},
-        serverRoutes: [],
-        entrypoints: [],
-        checkedEntries: [],
-        apiOnly: false,
-        internalDirAlias: `@_${metaName.replace(/-/g, '_')}_internal`,
-        internalSrcAlias: `@_${metaName.replace(/-/g, '_')}_src`,
-    };
-};
-exports.initAppContext = initAppContext;

package/dist/createCli.d.ts

@@ -1,17 +1,17 @@
 import type { CoreOptions } from './types';
 export declare const mergeOptions: (options?: CoreOptions) => CoreOptions & {
-    serverConfigFile: string;
+  serverConfigFile: string;
 };
 export declare const createCli: () => {
-    init: (options?: CoreOptions) => Promise<{
-        resolved: import("./types").NormalizedConfig<{}>;
-        appContext: import("./types").IAppContext;
-    }>;
-    run: (options?: CoreOptions) => Promise<void>;
-    test: (argv: string[], options?: {
-        coreOptions?: CoreOptions;
-        disableWatcher?: boolean;
-    }) => Promise<void>;
-    runCommand: (command: string, commandOptions?: string[], options?: CoreOptions) => Promise<void>;
-    getPrevInitOptions: () => CoreOptions | undefined;
-};
+  init: (options?: CoreOptions) => Promise<{
+    resolved: import("./types").NormalizedConfig<{}>;
+    appContext: import("./types").IAppContext;
+  }>;
+  run: (options?: CoreOptions) => Promise<void>;
+  test: (argv: string[], options?: {
+    coreOptions?: CoreOptions;
+    disableWatcher?: boolean;
+  }) => Promise<void>;
+  runCommand: (command: string, commandOptions?: string[], options?: CoreOptions) => Promise<void>;
+  getPrevInitOptions: () => CoreOptions | undefined;
+};