@modern-js/core 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/core
 
+## 1.1.2
+
+### Patch Changes
+
+- 6f7fe574: modern-js/core support extra options
+- 0fa83663: support more .env files
+- Updated dependencies [0fa83663]
+- Updated dependencies [f594fbc8]
+  - @modern-js/load-config@1.1.1
+  - @modern-js/plugin@1.1.2
+  - @modern-js/utils@1.1.2
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -54,13 +54,18 @@ const createCli = () => {
   let hooksRunner;
   let isRestart = false;
 
-  const init = async (argv = []) => {
+  const init = async (argv = [], options) => {
     enable();
     manager.clear();
     const appDirectory = await initAppDir();
     loadEnv(appDirectory);
     const loaded = await loadUserConfig(appDirectory);
-    const plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
+    let plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
+
+    if (options !== null && options !== void 0 && options.beforeUsePlugins) {
+      plugins = options.beforeUsePlugins(plugins, loaded.config);
+    }
+
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
     const appContext = initAppContext(appDirectory, plugins, loaded.filePath);
     manager.run(() => {
@@ -102,12 +107,12 @@ const createCli = () => {
     };
   };
 
-  async function run(argv) {
+  async function run(argv, options) {
     const {
       loadedConfig,
       appContext,
       resolved
-    } = await init(argv);
+    } = await init(argv, options);
     await hooksRunner.commands({
       program
     });

package/dist/js/modern/loadEnv.js

@@ -3,7 +3,9 @@ import path from 'path';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
 export const loadEnv = (appDirectory, mode = process.env.NODE_ENV) => {
-  [`.env.${mode}`, '.env'].map(name => path.resolve(appDirectory, name)).filter(filePath => fs.existsSync(filePath) && !fs.statSync(filePath).isDirectory()).forEach(filePath => {
+  // Don't change the order of the filenames， since they are ordered by the priority.
+  // Files on the left have more priority than files on the right.
+  [`.env.${mode}.local`, '.env.local', `.env.${mode}`, '.env'].map(name => path.resolve(appDirectory, name)).filter(filePath => fs.existsSync(filePath) && !fs.statSync(filePath).isDirectory()).forEach(filePath => {
     const envConfig = dotenv.config({
       path: filePath
     });

package/dist/js/modern/loadPlugins.js

@@ -29,8 +29,8 @@ const resolvePlugin = (appDirectory, plugin) => {
 
   const resolved = {};
 
-  if (plugin.cli) {
-    resolved.cli = tryResolve(plugin.cli);
+  if (typeof plugin === 'string' || plugin.cli) {
+    resolved.cli = typeof plugin === 'string' ? tryResolve(plugin) : tryResolve(plugin.cli);
   }
 
   if (plugin.server) {
@@ -47,8 +47,8 @@ const resolvePlugin = (appDirectory, plugin) => {
  */
 
 
-export const loadPlugins = (appDirectory, pluginConfig) => {
-  const plugins = [...Object.keys(INTERNAL_PLUGINS).filter(name => isDepExists(appDirectory, name)).map(name => INTERNAL_PLUGINS[name]), ...pluginConfig];
+export const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
+  const plugins = [...Object.keys(internalPlugins || INTERNAL_PLUGINS).filter(name => isDepExists(appDirectory, name)).map(name => (internalPlugins || INTERNAL_PLUGINS)[name]), ...pluginConfig];
   return plugins.map(plugin => {
     const {
       cli,

package/dist/js/node/index.js

@@ -161,13 +161,18 @@ const createCli = () => {
   let hooksRunner;
   let isRestart = false;
 
-  const init = async (argv = []) => {
+  const init = async (argv = [], options) => {
     (0, _node.enable)();
     manager.clear();
     const appDirectory = await initAppDir();
     (0, _loadEnv.loadEnv)(appDirectory);
     const loaded = await (0, _config.loadUserConfig)(appDirectory);
-    const plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || []);
+    let plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || []);
+
+    if (options !== null && options !== void 0 && options.beforeUsePlugins) {
+      plugins = options.beforeUsePlugins(plugins, loaded.config);
+    }
+
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
     const appContext = (0, _context.initAppContext)(appDirectory, plugins, loaded.filePath);
     manager.run(() => {
@@ -212,12 +217,12 @@ const createCli = () => {
     };
   };
 
-  async function run(argv) {
+  async function run(argv, options) {
     const {
       loadedConfig,
       appContext,
       resolved
-    } = await init(argv);
+    } = await init(argv, options);
     await hooksRunner.commands({
       program: _commander.program
     });

package/dist/js/node/loadEnv.js

@@ -16,7 +16,9 @@ var _dotenvExpand = _interopRequireDefault(require("dotenv-expand"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const loadEnv = (appDirectory, mode = process.env.NODE_ENV) => {
-  [`.env.${mode}`, '.env'].map(name => _path.default.resolve(appDirectory, name)).filter(filePath => _fs.default.existsSync(filePath) && !_fs.default.statSync(filePath).isDirectory()).forEach(filePath => {
+  // Don't change the order of the filenames， since they are ordered by the priority.
+  // Files on the left have more priority than files on the right.
+  [`.env.${mode}.local`, '.env.local', `.env.${mode}`, '.env'].map(name => _path.default.resolve(appDirectory, name)).filter(filePath => _fs.default.existsSync(filePath) && !_fs.default.statSync(filePath).isDirectory()).forEach(filePath => {
     const envConfig = _dotenv.default.config({
       path: filePath
     });

package/dist/js/node/loadPlugins.js

@@ -37,8 +37,8 @@ const resolvePlugin = (appDirectory, plugin) => {
 
   const resolved = {};
 
-  if (plugin.cli) {
-    resolved.cli = tryResolve(plugin.cli);
+  if (typeof plugin === 'string' || plugin.cli) {
+    resolved.cli = typeof plugin === 'string' ? tryResolve(plugin) : tryResolve(plugin.cli);
   }
 
   if (plugin.server) {
@@ -55,8 +55,8 @@ const resolvePlugin = (appDirectory, plugin) => {
  */
 
 
-const loadPlugins = (appDirectory, pluginConfig) => {
-  const plugins = [...Object.keys(_utils.INTERNAL_PLUGINS).filter(name => (0, _utils.isDepExists)(appDirectory, name)).map(name => _utils.INTERNAL_PLUGINS[name]), ...pluginConfig];
+const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
+  const plugins = [...Object.keys(internalPlugins || _utils.INTERNAL_PLUGINS).filter(name => (0, _utils.isDepExists)(appDirectory, name)).map(name => (internalPlugins || _utils.INTERNAL_PLUGINS)[name]), ...pluginConfig];
   return plugins.map(plugin => {
     const {
       cli,

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
+import { INTERNAL_PLUGINS } from '@modern-js/utils';
 import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/types';
 import { Command } from './utils/commander';
@@ -74,15 +75,20 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
 export declare const usePlugins: (plugins: string[]) => void;
 export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
 export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
-export interface CoreOption {
-  dryRun?: boolean;
+export interface CoreOptions {
+  name?: string;
+  plugins?: typeof INTERNAL_PLUGINS;
+  beforeUsePlugins: (plugins: any, config: any) => {
+    cli: any;
+    server: any;
+  }[];
 }
 export declare const cli: {
-  init: (argv?: string[]) => Promise<{
+  init: (argv?: string[], options?: CoreOptions | undefined) => Promise<{
     loadedConfig: import("./config").LoadedConfig;
     appContext: IAppContext;
     resolved: NormalizedConfig;
   }>;
-  run: (argv: string[]) => Promise<void>;
+  run: (argv: string[], options?: CoreOptions | undefined) => Promise<void>;
   restart: () => Promise<void>;
 };

package/dist/types/loadPlugins.d.ts

@@ -10,7 +10,12 @@ export declare type PluginConfig = Array<PluginConfigItem>;
  * @returns Plugin Objects has been required.
  */
 
-export declare const loadPlugins: (appDirectory: string, pluginConfig: PluginConfig) => {
+export declare const loadPlugins: (appDirectory: string, pluginConfig: PluginConfig, internalPlugins?: {
+  [name: string]: {
+    cli?: string | undefined;
+    server?: string | undefined;
+  };
+} | undefined) => {
   cli: any;
   server: any;
 }[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.1",
+  "version": "1.1.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -38,9 +38,9 @@
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
     "@babel/runtime": "^7",
-    "@modern-js/load-config": "^1.1.0",
-    "@modern-js/plugin": "^1.1.1",
-    "@modern-js/utils": "^1.1.1",
+    "@modern-js/load-config": "^1.1.1",
+    "@modern-js/plugin": "^1.1.2",
+    "@modern-js/utils": "^1.1.2",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -57,7 +57,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.1.1",
+    "@modern-js/types": "^1.1.2",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",

package/src/index.ts

@@ -4,6 +4,7 @@ import {
   pkgUp,
   ensureAbsolutePath,
   logger,
+  INTERNAL_PLUGINS,
 } from '@modern-js/utils';
 import {
   createAsyncManager,
@@ -129,15 +130,17 @@ const initAppDir = async (): Promise<string> => {
   return path.dirname(pkg);
 };
 
-export interface CoreOption {
-  dryRun?: boolean;
+export interface CoreOptions {
+  name?: string;
+  plugins?: typeof INTERNAL_PLUGINS;
+  beforeUsePlugins: (plugins: any, config: any) => { cli: any; server: any }[];
 }
 
 const createCli = () => {
   let hooksRunner: HooksRunner;
   let isRestart = false;
 
-  const init = async (argv: string[] = []) => {
+  const init = async (argv: string[] = [], options?: CoreOptions) => {
     enable();
 
     manager.clear();
@@ -148,7 +151,11 @@ const createCli = () => {
 
     const loaded = await loadUserConfig(appDirectory);
 
-    const plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
+    let plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
+
+    if (options?.beforeUsePlugins) {
+      plugins = options.beforeUsePlugins(plugins, loaded.config);
+    }
 
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
 
@@ -204,8 +211,8 @@ const createCli = () => {
     return { loadedConfig: loaded, appContext, resolved };
   };
 
-  async function run(argv: string[]) {
-    const { loadedConfig, appContext, resolved } = await init(argv);
+  async function run(argv: string[], options?: CoreOptions) {
+    const { loadedConfig, appContext, resolved } = await init(argv, options);
 
     await hooksRunner.commands({ program });
 

package/src/loadEnv.ts

@@ -7,7 +7,9 @@ export const loadEnv = (
   appDirectory: string,
   mode: string = process.env.NODE_ENV as string,
 ) => {
-  [`.env.${mode}`, '.env']
+  // Don't change the order of the filenames， since they are ordered by the priority.
+  // Files on the left have more priority than files on the right.
+  [`.env.${mode}.local`, '.env.local', `.env.${mode}`, '.env']
     .map(name => path.resolve(appDirectory, name))
     .filter(
       filePath =>

package/src/loadPlugins.ts

@@ -37,8 +37,9 @@ const resolvePlugin = (appDirectory: string, plugin: PluginConfigItem) => {
 
   const resolved: PluginConfigItem = {};
 
-  if (plugin.cli) {
-    resolved.cli = tryResolve(plugin.cli);
+  if (typeof plugin === 'string' || plugin.cli) {
+    resolved.cli =
+      typeof plugin === 'string' ? tryResolve(plugin) : tryResolve(plugin.cli!);
   }
 
   if (plugin.server) {
@@ -57,11 +58,12 @@ const resolvePlugin = (appDirectory: string, plugin: PluginConfigItem) => {
 export const loadPlugins = (
   appDirectory: string,
   pluginConfig: PluginConfig,
+  internalPlugins?: typeof INTERNAL_PLUGINS,
 ) => {
   const plugins = [
-    ...Object.keys(INTERNAL_PLUGINS)
+    ...Object.keys(internalPlugins || INTERNAL_PLUGINS)
       .filter(name => isDepExists(appDirectory, name))
-      .map(name => INTERNAL_PLUGINS[name]),
+      .map(name => (internalPlugins || INTERNAL_PLUGINS)[name]),
     ...pluginConfig,
   ];
 

package/tests/loadEnv.test.ts

@@ -26,7 +26,7 @@ describe('load environment variables', () => {
 
   afterAll(() => {
     process.env = { ...defaultEnv };
-    fs.rmSync(fixture, {force: true, recursive: true})
+    fs.rmSync(fixture, { force: true, recursive: true });
   });
 
   test(`support .env file`, () => {
@@ -78,6 +78,52 @@ describe('load environment variables', () => {
     delete process.env.NODE_ENV;
   });
 
+  test(`should have correct priority`, () => {
+    createFixtures('priority', [
+      {
+        name: '.env',
+        content: `DB_HOST=localhost
+        DB_USER=user
+        DB_PASS=pass
+        `,
+      },
+      {
+        name: '.env.production',
+        content: `DB_USER=user_production
+        DB_PASS=pass_production
+        FOO=foo
+        BAR=bar
+        `,
+      },
+      {
+        name: '.env.local',
+        content: `FOO=foo_local
+        BAR=bar_local
+        `,
+      },
+      {
+        name: '.env.production.local',
+        content: `BAR=bar_production_local`,
+      },
+    ]);
+
+    process.env.NODE_ENV = 'production';
+
+    loadEnv(path.join(fixture, 'priority'));
+
+    expect(process.env.DB_HOST).toBe('localhost');
+
+    expect(process.env.DB_USER).toBe('user_production');
+
+    expect(process.env.DB_PASS).toBe('pass_production');
+
+    expect(process.env.FOO).toBe('foo_local');
+
+    expect(process.env.BAR).toBe('bar_production_local');
+
+    delete process.env.NODE_ENV;
+  });
+
   test(`support dotenv-expand`, () => {
     createFixtures('expand', [
       {