@modern-js/core 0.0.0-options-202112031520 → 0.0.0-options-202112061443

package/dist/js/modern/config/schema/server.js

@@ -165,6 +165,9 @@ export const server = {
     },
     enableMicroFrontendDebug: {
       type: 'boolean'
+    },
+    disableUserExtension: {
+      type: 'boolean'
     }
   }
 };

package/dist/js/modern/index.js

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import path from 'path';
 import { compatRequire, pkgUp, ensureAbsolutePath, logger } from '@modern-js/utils';
-import { createAsyncManager, createAsyncWorkflow, createParallelWorkflow, createAsyncWaterfall } from '@modern-js/plugin';
+import { createAsyncManager, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
 import { program } from "./utils/commander";
 import { resolveConfig, defineConfig, loadUserConfig } from "./config";
@@ -20,7 +20,6 @@ export * from '@modern-js/plugin/node';
 program.name('modern').usage('<command> [options]').version(process.env.MODERN_JS_VERSION || '0.1.0');
 const hooksMap = {
   config: createParallelWorkflow(),
-  resolvedConfig: createAsyncWaterfall(),
   validateSchema: createParallelWorkflow(),
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   prepare: createAsyncWorkflow(),
@@ -60,8 +59,8 @@ const createCli = () => {
     manager.clear();
     const appDirectory = await initAppDir();
     loadEnv(appDirectory);
-    const loaded = await loadUserConfig(appDirectory, options === null || options === void 0 ? void 0 : options.configFile);
-    let plugins = loadPlugins(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
+    const loaded = await loadUserConfig(appDirectory);
+    let plugins = loadPlugins(appDirectory, loaded.config.plugins || []);
 
     if (options !== null && options !== void 0 && options.beforeUsePlugins) {
       plugins = options.beforeUsePlugins(plugins, loaded.config);
@@ -90,12 +89,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, isRestart, argv);
-    const {
-      resolved
-    } = await hooksRunner.resolvedConfig({
-      resolved: config
-    }); // update context value
+    const resolved = await resolveConfig(loaded, extraConfigs, extraSchemas, isRestart, argv); // update context value
 
     manager.run(() => {
       ConfigContext.set(loaded.config);
@@ -150,4 +144,5 @@ const createCli = () => {
   };
 };
 
-export const cli = createCli();
+export const cli = createCli();
+export { loadUserConfig, initAppDir, initAppContext };

package/dist/js/node/config/schema/server.js

@@ -173,6 +173,9 @@ const server = {
     },
     enableMicroFrontendDebug: {
       type: 'boolean'
+    },
+    disableUserExtension: {
+      type: 'boolean'
     }
   }
 };

package/dist/js/node/index.js

@@ -10,10 +10,13 @@ var _exportNames = {
   mountHook: true,
   usePlugins: true,
   cli: true,
+  initAppDir: true,
   defineConfig: true,
+  loadUserConfig: true,
   defaultsConfig: true,
   mergeConfig: true,
   AppContext: true,
+  initAppContext: true,
   useAppContext: true,
   useConfigContext: true,
   useResolvedConfigContext: true
@@ -37,6 +40,19 @@ Object.defineProperty(exports, "defineConfig", {
     return _config.defineConfig;
   }
 });
+Object.defineProperty(exports, "initAppContext", {
+  enumerable: true,
+  get: function () {
+    return _context.initAppContext;
+  }
+});
+exports.initAppDir = void 0;
+Object.defineProperty(exports, "loadUserConfig", {
+  enumerable: true,
+  get: function () {
+    return _config.loadUserConfig;
+  }
+});
 exports.manager = void 0;
 Object.defineProperty(exports, "mergeConfig", {
   enumerable: true,
@@ -121,7 +137,6 @@ _commander.program.name('modern').usage('<command> [options]').version(process.e
 
 const hooksMap = {
   config: (0, _plugin.createParallelWorkflow)(),
-  resolvedConfig: (0, _plugin.createAsyncWaterfall)(),
   validateSchema: (0, _plugin.createParallelWorkflow)(),
   // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
   prepare: (0, _plugin.createAsyncWorkflow)(),
@@ -158,6 +173,8 @@ const initAppDir = async () => {
   return _path.default.dirname(pkg);
 };
 
+exports.initAppDir = initAppDir;
+
 const createCli = () => {
   let hooksRunner;
   let isRestart = false;
@@ -167,8 +184,8 @@ const createCli = () => {
     manager.clear();
     const appDirectory = await initAppDir();
     (0, _loadEnv.loadEnv)(appDirectory);
-    const loaded = await (0, _config.loadUserConfig)(appDirectory, options === null || options === void 0 ? void 0 : options.configFile);
-    let plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
+    const loaded = await (0, _config.loadUserConfig)(appDirectory);
+    let plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || []);
 
     if (options !== null && options !== void 0 && options.beforeUsePlugins) {
       plugins = options.beforeUsePlugins(plugins, loaded.config);
@@ -198,12 +215,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, isRestart, argv);
-    const {
-      resolved
-    } = await hooksRunner.resolvedConfig({
-      resolved: config
-    }); // update context value
+    const resolved = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, isRestart, argv); // update context value
 
     manager.run(() => {
       _context.ConfigContext.set(loaded.config);

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

@@ -75,6 +75,7 @@ export interface ServerConfig {
   logger?: Record<string, string>;
   measure?: Record<string, string>;
   enableMicroFrontendDebug?: boolean;
+  disableUserExtension?: boolean;
 }
 export interface DevConfig {
   assetPrefix?: string | boolean;

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

@@ -391,6 +391,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         enableMicroFrontendDebug: {
           type: string;
         };
+        disableUserExtension: {
+          type: string;
+        };
       };
     };
     deploy: {

package/dist/types/config/schema/server.d.ts

@@ -178,5 +178,8 @@ export declare const server: {
     enableMicroFrontendDebug: {
       type: string;
     };
+    disableUserExtension: {
+      type: string;
+    };
   };
 };

package/dist/types/index.d.ts

@@ -1,9 +1,9 @@
 import { INTERNAL_PLUGINS } from '@modern-js/utils';
-import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners, AsyncWaterfall } from '@modern-js/plugin';
+import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/types';
 import { Command } from './utils/commander';
-import { defineConfig, UserConfig, ToolsConfig } from './config';
-import { AppContext, IAppContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
+import { defineConfig, loadUserConfig, UserConfig, ToolsConfig } from './config';
+import { AppContext, IAppContext, initAppContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
 import { NormalizedConfig } from './config/mergeConfig';
 export type { Hooks };
 export { defaultsConfig, mergeConfig } from './config';
@@ -11,9 +11,6 @@ export * from '@modern-js/plugin';
 export * from '@modern-js/plugin/node';
 export declare type HooksRunner = Progresses2Runners<{
   config: ParallelWorkflow<void>;
-  resolvedConfig: AsyncWaterfall<{
-    resolved: NormalizedConfig;
-  }>;
   validateSchema: ParallelWorkflow<void>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -27,9 +24,6 @@ export declare type HooksRunner = Progresses2Runners<{
 }>;
 export declare const manager: import("@modern-js/plugin").AsyncManager<Hooks, {
   config: ParallelWorkflow<void, unknown>;
-  resolvedConfig: AsyncWaterfall<{
-    resolved: NormalizedConfig;
-  }>;
   validateSchema: ParallelWorkflow<void, unknown>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -43,9 +37,6 @@ export declare const manager: import("@modern-js/plugin").AsyncManager<Hooks, {
 }>;
 export declare const createPlugin: (initializer: import("@modern-js/plugin").AsyncInitializer<Partial<import("@modern-js/plugin").Progresses2Threads<{
   config: ParallelWorkflow<void, unknown>;
-  resolvedConfig: AsyncWaterfall<{
-    resolved: NormalizedConfig;
-  }>;
   validateSchema: ParallelWorkflow<void, unknown>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -58,9 +49,6 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
   beforeExit: AsyncWorkflow<void, void>;
 } & import("@modern-js/plugin").ClearDraftProgress<Hooks>>>>, options?: import("@modern-js/plugin").PluginOptions | undefined) => import("@modern-js/plugin").AsyncPlugin<Partial<import("@modern-js/plugin").Progresses2Threads<{
   config: ParallelWorkflow<void, unknown>;
-  resolvedConfig: AsyncWaterfall<{
-    resolved: NormalizedConfig;
-  }>;
   validateSchema: ParallelWorkflow<void, unknown>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -73,9 +61,6 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
   beforeExit: AsyncWorkflow<void, void>;
 } & import("@modern-js/plugin").ClearDraftProgress<Hooks>>>>, registerHook: (newShape: Partial<Hooks>) => void, mountHook: () => Progresses2Runners<{
   config: ParallelWorkflow<void, unknown>;
-  resolvedConfig: AsyncWaterfall<{
-    resolved: NormalizedConfig;
-  }>;
   validateSchema: ParallelWorkflow<void, unknown>;
   prepare: AsyncWorkflow<void, void>;
   commands: AsyncWorkflow<{
@@ -90,8 +75,9 @@ 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 };
+declare const initAppDir: () => Promise<string>;
 export interface CoreOptions {
-  configFile?: string;
+  name?: string;
   plugins?: typeof INTERNAL_PLUGINS;
   beforeUsePlugins: (plugins: any, config: any) => {
     cli: any;
@@ -106,4 +92,5 @@ export declare const cli: {
   }>;
   run: (argv: string[], options?: CoreOptions | undefined) => Promise<void>;
   restart: () => Promise<void>;
-};
+};
+export { loadUserConfig, initAppDir, initAppContext };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-options-202112031520",
+  "version": "0.0.0-options-202112061443",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",

package/src/config/index.ts

@@ -109,6 +109,7 @@ export interface ServerConfig {
   logger?: Record<string, string>;
   measure?: Record<string, string>;
   enableMicroFrontendDebug?: boolean;
+  disableUserExtension?: boolean;
 }
 
 export interface DevConfig {

package/src/config/schema/server.ts

@@ -102,5 +102,6 @@ export const server = {
     measure: { type: 'object' },
     proxy: { type: 'object' },
     enableMicroFrontendDebug: { type: 'boolean' },
+    disableUserExtension: { type: 'boolean' },
   },
 };

package/src/index.ts

@@ -268,3 +268,5 @@ const createCli = () => {
 };
 
 export const cli = createCli();
+
+export { loadUserConfig, initAppDir, initAppContext };