@modern-js/core 2.5.1-alpha.0 → 2.6.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/core
 
+## 2.6.0
+
+### Patch Changes
+
+- Updated dependencies [e1f799e]
+- Updated dependencies [7915ab3]
+- Updated dependencies [0fe658a]
+  - @modern-js/utils@2.6.0
+  - @modern-js/node-bundle-require@2.6.0
+  - @modern-js/plugin@2.6.0
+
 ## 2.5.0
 
 ### Patch Changes

package/dist/context.d.ts

@@ -26,7 +26,6 @@ export declare const initAppContext: ({ appDirectory, plugins, configFile, optio
     options?: {
         metaName?: string | undefined;
         srcDir?: string | undefined;
-        apiDir?: string | undefined;
         distDir?: string | undefined;
         sharedDir?: string | undefined;
     } | undefined;

package/dist/context.js

@@ -32,7 +32,7 @@ exports.useConfigContext = useConfigContext;
 const useResolvedConfigContext = () => exports.ResolvedConfigContext.use().value;
 exports.useResolvedConfigContext = useResolvedConfigContext;
 const initAppContext = ({ appDirectory, plugins, configFile, options, serverConfigFile, serverInternalPlugins, toolsType, }) => {
-    const { metaName = 'modern-js', srcDir = 'src', distDir = '', apiDir = 'api', sharedDir = 'shared', } = options || {};
+    const { metaName = 'modern-js', srcDir = 'src', distDir = '', sharedDir = 'shared', } = options || {};
     return {
         metaName,
         appDirectory,
@@ -43,8 +43,6 @@ const initAppContext = ({ appDirectory, plugins, configFile, options, serverConf
         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'),

package/dist/types/context.d.ts

@@ -13,8 +13,6 @@ export interface IAppContext {
     toolsType?: ToolsType;
     packageName: string;
     srcDirectory: string;
-    apiDirectory: string;
-    lambdaDirectory: string;
     sharedDirectory: string;
     nodeModulesDirectory: string;
     internalDirectory: string;

package/package.json

@@ -10,7 +10,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.1-alpha.0",
+  "version": "2.6.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -50,17 +50,12 @@
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.5.0",
-    "@modern-js/plugin": "2.5.0",
-    "@modern-js/utils": "2.5.0"
+    "@modern-js/node-bundle-require": "2.6.0",
+    "@modern-js/plugin": "2.6.0",
+    "@modern-js/utils": "2.6.0"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/builder-shared": "2.5.0",
-    "@modern-js/babel-preset-app": "2.5.0",
-    "@modern-js/types": "2.5.0",
-    "@scripts/build": "2.5.0",
-    "@scripts/jest-config": "2.5.0",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__core": "^7.1.16",
     "@types/jest": "^27",
@@ -74,7 +69,12 @@
     "sass": "^1.45.0",
     "terser-webpack-plugin": "^5.1.4",
     "typescript": "^4",
-    "webpack": "^5.75.0"
+    "webpack": "^5.75.0",
+    "@modern-js/builder-shared": "2.6.0",
+    "@modern-js/babel-preset-app": "2.6.0",
+    "@modern-js/types": "2.6.0",
+    "@scripts/build": "2.6.0",
+    "@scripts/jest-config": "2.6.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/load-configs/index.d.ts

@@ -1,34 +0,0 @@
-import path from 'path';
-export declare const CONFIG_FILE_NAME = "modern.config";
-export declare const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
-/**
- * Get user config from package.json.
- * @param appDirectory - App root directory.
- * @returns modernConfig or undefined
- */
-export declare const getPackageConfig: <T>(appDirectory: string, packageJsonConfig?: string) => T | undefined;
-/**
- * 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.
- */
-export declare const getDependencies: (filePath: string) => string[];
-/**
- *
- * @param targetDir target dir
- * @param overtime Unit of second
- */
-export declare const clearFilesOverTime: (targetDir: string, overtime: number) => Promise<void>;
-export declare const getConfigFilePath: (appDirectory: string, filePath?: string) => string | false;
-/**
- * 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 filePath - Specific absolute config file path.
- * @returns Object contain config file path, user config object and dependency files used by config file.
- */
-export declare const loadConfig: <T>(appDirectory: string, filePath?: string, packageJsonConfig?: string) => Promise<{
-    path: string | false;
-    config?: T | undefined;
-    dependencies?: string[] | undefined;
-    pkgConfig?: T | undefined;
-}>;

package/dist/load-configs/index.js

@@ -1,124 +0,0 @@
-"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.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.PACKAGE_JSON_CONFIG_NAME = 'modernConfig';
-/**
- * Get user config from package.json.
- * @param appDirectory - App root directory.
- * @returns modernConfig or undefined
- */
-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];
-};
-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));
-        }
-    }
-    return deps;
-};
-exports.getDependencies = getDependencies;
-/**
- *
- * @param targetDir target dir
- * @param overtime Unit of second
- */
-const clearFilesOverTime = async (targetDir, overtime) => {
-    // 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);
-            }
-        }
-    }
-};
-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;
-    }
-};
-const getConfigFilePath = (appDirectory, filePath) => {
-    if (filePath) {
-        if (path_1.default.isAbsolute(filePath)) {
-            return filePath;
-        }
-        return path_1.default.resolve(appDirectory, filePath);
-    }
-    return (0, utils_1.findExists)(utils_1.CONFIG_FILE_EXTENSIONS.map(extension => path_1.default.resolve(appDirectory, `${exports.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 filePath - 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, filePath, packageJsonConfig) => {
-    const configFile = (0, exports.getConfigFilePath)(appDirectory, filePath);
-    const pkgConfig = (0, exports.getPackageConfig)(appDirectory, packageJsonConfig);
-    let config;
-    const dependencies = pkgConfig
-        ? [path_1.default.resolve(appDirectory, './package.json')]
-        : [];
-    if (configFile) {
-        delete require.cache[configFile];
-        const mod = await bundleRequireWithCatch(configFile, { appDirectory });
-        config = mod.default || mod;
-        // TODO: get deps.
-        // dependencies = dependencies.concat(getDependencies(configFile));
-    }
-    return {
-        path: configFile,
-        config,
-        pkgConfig,
-        dependencies,
-    };
-};
-exports.loadConfig = loadConfig;