@modern-js/core 1.4.1 → 1.4.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @modern-js/core
 
+## 1.4.2
+
+### Patch Changes
+
+- b376c8d6: feat: enhance custom env
+- e62c4efd: fix error typo for 'styledComponents'
+- e2a8233f: support add schem error hook to core.init
+
 ## 1.4.1
 
 ### Patch Changes

package/dist/js/modern/config/index.js

@@ -33,8 +33,8 @@ export const loadUserConfig = async (appDirectory, filePath, packageJsonConfig)
 };
 
 const showAdditionalPropertiesError = error => {
-  if (error.keyword === 'additionalProperties' && error.instancePath && error.params.additionalProperty) {
-    const target = `${error.instancePath.substr(1)}.${error.params.additionalProperty}`;
+  if (error.keyword === 'additionalProperties' && error.params.additionalProperty) {
+    const target = [error.instancePath.slice(1), error.params.additionalProperty].filter(Boolean).join('.');
     const name = Object.keys(PLUGIN_SCHEMAS).find(key => PLUGIN_SCHEMAS[key].some(schemaItem => schemaItem.target === target));
 
     if (name) {
@@ -45,7 +45,7 @@ const showAdditionalPropertiesError = error => {
 /* eslint-disable max-statements, max-params */
 
 
-export const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv) => {
+export const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
   var _validate$errors;
 
   const {
@@ -67,7 +67,7 @@ export const resolveConfig = async (loaded, configs, schemas, restartWithExistin
   if (!valid && (_validate$errors = validate.errors) !== null && _validate$errors !== void 0 && _validate$errors.length) {
     var _validate$errors2;
 
-    showAdditionalPropertiesError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
+    onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
     const errors = betterAjvErrors(validateSchema, userConfig, (_validate$errors2 = validate.errors) === null || _validate$errors2 === void 0 ? void 0 : _validate$errors2.map(e => _objectSpread(_objectSpread({}, e), {}, {
       dataPath: e.instancePath
     })), {

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

@@ -28,6 +28,9 @@ export const tools = {
     },
     minifyCss: {
       typeof: ['object', 'function']
+    },
+    styledComponents: {
+      typeof: ['object', 'function']
     }
   }
 };

package/dist/js/modern/index.js

@@ -65,11 +65,14 @@ const createCli = () => {
   let restartOptions; // eslint-disable-next-line max-statements
 
   const init = async (argv = [], options) => {
+    var _options$options$meta, _options$options;
+
     enable();
     manager.clear();
     restartOptions = options;
     const appDirectory = await initAppDir();
-    loadEnv(appDirectory);
+    const metaName = (_options$options$meta = options === null || options === void 0 ? void 0 : (_options$options = options.options) === null || _options$options === void 0 ? void 0 : _options$options.metaName) !== null && _options$options$meta !== void 0 ? _options$options$meta : 'MODERN';
+    loadEnv(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
     const loaded = await loadUserConfig(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
     let plugins = loadPlugins(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
 
@@ -100,7 +103,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv);
+    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv, options === null || options === void 0 ? void 0 : options.onSchemaError);
     const {
       resolved
     } = await hooksRunner.resolvedConfig({

package/dist/js/node/config/index.js

@@ -71,8 +71,8 @@ const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
 exports.loadUserConfig = loadUserConfig;
 
 const showAdditionalPropertiesError = error => {
-  if (error.keyword === 'additionalProperties' && error.instancePath && error.params.additionalProperty) {
-    const target = `${error.instancePath.substr(1)}.${error.params.additionalProperty}`;
+  if (error.keyword === 'additionalProperties' && error.params.additionalProperty) {
+    const target = [error.instancePath.slice(1), error.params.additionalProperty].filter(Boolean).join('.');
     const name = Object.keys(_utils.PLUGIN_SCHEMAS).find(key => _utils.PLUGIN_SCHEMAS[key].some(schemaItem => schemaItem.target === target));
 
     if (name) {
@@ -83,7 +83,7 @@ const showAdditionalPropertiesError = error => {
 /* eslint-disable max-statements, max-params */
 
 
-const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv) => {
+const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
   var _validate$errors;
 
   const {
@@ -105,7 +105,7 @@ const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort,
   if (!valid && (_validate$errors = validate.errors) !== null && _validate$errors !== void 0 && _validate$errors.length) {
     var _validate$errors2;
 
-    showAdditionalPropertiesError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
+    onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
     const errors = (0, _betterAjvErrors.default)(validateSchema, userConfig, (_validate$errors2 = validate.errors) === null || _validate$errors2 === void 0 ? void 0 : _validate$errors2.map(e => _objectSpread(_objectSpread({}, e), {}, {
       dataPath: e.instancePath
     })), {

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

@@ -34,6 +34,9 @@ const tools = {
     },
     minifyCss: {
       typeof: ['object', 'function']
+    },
+    styledComponents: {
+      typeof: ['object', 'function']
     }
   }
 };

package/dist/js/node/index.js

@@ -186,11 +186,14 @@ const createCli = () => {
   let restartOptions; // eslint-disable-next-line max-statements
 
   const init = async (argv = [], options) => {
+    var _options$options$meta, _options$options;
+
     (0, _node.enable)();
     manager.clear();
     restartOptions = options;
     const appDirectory = await initAppDir();
-    (0, _loadEnv.loadEnv)(appDirectory);
+    const metaName = (_options$options$meta = options === null || options === void 0 ? void 0 : (_options$options = options.options) === null || _options$options === void 0 ? void 0 : _options$options.metaName) !== null && _options$options$meta !== void 0 ? _options$options$meta : 'MODERN';
+    (0, _loadEnv.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
     const loaded = await (0, _config.loadUserConfig)(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
     let plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
 
@@ -222,7 +225,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv);
+    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv, options === null || options === void 0 ? void 0 : options.onSchemaError);
     const {
       resolved
     } = await hooksRunner.resolvedConfig({

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

@@ -1,3 +1,4 @@
+import { ErrorObject } from 'ajv';
 import { MetaOptions } from '@modern-js/utils';
 import { PluginConfig } from '../loadPlugins';
 import { defaults } from './defaults';
@@ -128,5 +129,5 @@ interface LoadedConfig {
 }
 export declare const defineConfig: (config: ConfigParam) => ConfigParam;
 export declare const loadUserConfig: (appDirectory: string, filePath?: string | undefined, packageJsonConfig?: string | undefined) => Promise<LoadedConfig>;
-export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[]) => Promise<NormalizedConfig>;
+export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[], onSchemaError?: (error: ErrorObject) => void) => Promise<NormalizedConfig>;
 export type { SourceConfig, OutputConfig, ServerConfig, DevConfig, DeployConfig, ToolsConfig, RuntimeConfig, RuntimeByEntriesConfig, UserConfig, ConfigParam, LoadedConfig };

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

@@ -456,6 +456,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         minifyCss: {
           typeof: string[];
         };
+        styledComponents: {
+          typeof: string[];
+        };
       };
     };
   };

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

@@ -29,5 +29,8 @@ export declare const tools: {
     minifyCss: {
       typeof: string[];
     };
+    styledComponents: {
+      typeof: string[];
+    };
   };
 };

package/dist/types/index.d.ts

@@ -1,6 +1,7 @@
 import { INTERNAL_PLUGINS } from '@modern-js/utils';
 import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners, AsyncWaterfall } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/types';
+import { ErrorObject } from 'ajv';
 import { Command } from './utils/commander';
 import { AppContext, ConfigContext, IAppContext, initAppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
 import { NormalizedConfig } from './config/mergeConfig';
@@ -109,6 +110,7 @@ export interface CoreOptions {
     server: any;
     serverPath: any;
   }[];
+  onSchemaError?: (error: ErrorObject) => void;
   options?: {
     metaName?: string;
     srcDir?: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.1",
+  "version": "1.4.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -62,7 +62,7 @@
   "devDependencies": {
     "btsm": "2.2.2",
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.3.1",
+    "@modern-js/types": "^1.3.2",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",

package/tests/index.test.ts

@@ -67,7 +67,7 @@ describe('@modern-js/core test', () => {
     };
     options.beforeUsePlugins.mockImplementation((plugins, _) => plugins);
     await cli.init(['dev'], options);
-    expect(loadEnv).toHaveBeenCalledWith(cwd);
+    expect(loadEnv).toHaveBeenCalledWith(cwd, undefined);
     expect(options.beforeUsePlugins).toHaveBeenCalledWith([], {});
     // TODO: add more test cases
   });

package/tests/loadEnv.test.ts

@@ -124,6 +124,34 @@ describe('load environment variables', () => {
     delete process.env.NODE_ENV;
   });
 
+  test(`get custom .env file by MODERN_ENV`, () => {
+    createFixtures('custom_environment', [
+      {
+        name: '.env',
+        content: `DB_HOST=localhost
+        DB_USER=root
+        DB_PASS=root
+        `,
+      },
+      {
+        name: '.env.staging',
+        content: `DB_HOST=localhost
+        DB_USER=root-local-dev
+        `,
+      },
+    ]);
+
+    loadEnv(path.join(fixture, 'custom_environment'), 'staging');
+
+    expect(process.env.DB_HOST).toBe('localhost');
+
+    expect(process.env.DB_USER).toBe('root-local-dev');
+
+    expect(process.env.DB_PASS).toBe('root');
+
+    delete process.env.MODERN_ENV;
+  });
+
   test(`support dotenv-expand`, () => {
     createFixtures('expand', [
       {