@modern-js/core 1.4.4 → 1.4.5

package/dist/js/modern/config/mergeConfig.js

@@ -8,12 +8,14 @@ import { isFunction } from '@modern-js/utils';
  * @returns - normalized user config.
  */
 export const mergeConfig = configs => mergeWith({}, ...configs, (target, source) => {
-  if (Array.isArray(target) && Array.isArray(source)) {
-    return [...target, ...source];
-  }
-
-  if (isFunction(source)) {
-    return Array.isArray(target) ? [...target, source] : [target, source].filter(Boolean);
+  if (Array.isArray(target)) {
+    if (Array.isArray(source)) {
+      return [...target, ...source];
+    } else {
+      return typeof source !== 'undefined' ? [...target, source] : target;
+    }
+  } else if (isFunction(source)) {
+    return typeof target !== 'undefined' ? [target, source] : [source];
   }
 
   return undefined;

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

@@ -2,9 +2,6 @@ import { ENTRY_NAME_PATTERN } from '@modern-js/utils';
 export const deploy = {
   type: 'object',
   properties: {
-    microFrontend: {
-      type: ['boolean', 'object']
-    },
     domain: {
       type: ['array', 'string']
     },

package/dist/js/modern/loadPlugins.js

@@ -82,7 +82,7 @@ export const loadPlugins = (appDirectory, userConfig, options = {}) => {
 
   const plugins = getAppPlugins(appDirectory, userConfig.plugins || [], internalPlugins);
   return plugins.map(plugin => {
-    const _plugin = typeof plugin === 'string' ? {
+    const _plugin = typeof plugin === 'string' || Array.isArray(plugin) ? {
       cli: plugin
     } : plugin;
 

package/dist/js/node/config/mergeConfig.js

@@ -18,12 +18,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @returns - normalized user config.
  */
 const mergeConfig = configs => (0, _lodash.default)({}, ...configs, (target, source) => {
-  if (Array.isArray(target) && Array.isArray(source)) {
-    return [...target, ...source];
-  }
-
-  if ((0, _utils.isFunction)(source)) {
-    return Array.isArray(target) ? [...target, source] : [target, source].filter(Boolean);
+  if (Array.isArray(target)) {
+    if (Array.isArray(source)) {
+      return [...target, ...source];
+    } else {
+      return typeof source !== 'undefined' ? [...target, source] : target;
+    }
+  } else if ((0, _utils.isFunction)(source)) {
+    return typeof target !== 'undefined' ? [target, source] : [source];
   }
 
   return undefined;

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

@@ -10,9 +10,6 @@ var _utils = require("@modern-js/utils");
 const deploy = {
   type: 'object',
   properties: {
-    microFrontend: {
-      type: ['boolean', 'object']
-    },
     domain: {
       type: ['array', 'string']
     },

package/dist/js/node/loadPlugins.js

@@ -92,7 +92,7 @@ const loadPlugins = (appDirectory, userConfig, options = {}) => {
 
   const plugins = getAppPlugins(appDirectory, userConfig.plugins || [], internalPlugins);
   return plugins.map(plugin => {
-    const _plugin = typeof plugin === 'string' ? {
+    const _plugin = typeof plugin === 'string' || Array.isArray(plugin) ? {
       cli: plugin
     } : plugin;
 

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

@@ -1,9 +1,6 @@
 export declare const deploy: {
   type: string;
   properties: {
-    microFrontend: {
-      type: string[];
-    };
     domain: {
       type: string[];
     };

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

@@ -396,9 +396,6 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
     deploy: {
       type: string;
       properties: {
-        microFrontend: {
-          type: string[];
-        };
         domain: {
           type: string[];
         };

package/dist/types/loadPlugins.d.ts

@@ -10,7 +10,7 @@ export declare type LoadedPlugin = {
 export declare type PluginConfigItem = {
   cli?: Plugin;
   server?: Plugin;
-} | string;
+} | Plugin;
 export declare type PluginConfig = Array<PluginConfigItem>;
 export declare type TransformPlugin = (plugin: PluginConfig, resolvedConfig: UserConfig, pluginOptions?: any) => PluginConfig;
 export declare function getAppPlugins(appDirectory: string, pluginConfig: PluginConfig, internalPlugins?: typeof INTERNAL_PLUGINS): PluginConfigItem[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.4",
+  "version": "1.4.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -82,7 +82,8 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",

package/tests/loadPlugin.test.ts

@@ -53,7 +53,7 @@ describe('load plugins', () => {
     );
 
     const plugins = loadPlugins(fixture, {
-      plugins: [{ cli: ['./test-plugin-c', 'c'] }],
+      plugins: [{ cli: ['./test-plugin-c', 'c'] }, ['./test-plugin-c', 'c2']],
     });
 
     expect(plugins).toEqual([
@@ -64,6 +64,13 @@ describe('load plugins', () => {
         },
         cliPkg: './test-plugin-c',
       },
+      {
+        cli: {
+          name: 'c2',
+          pluginPath: path.join(fixture, './test-plugin-c.js'),
+        },
+        cliPkg: './test-plugin-c',
+      },
     ]);
   });
 

package/tests/mergeConfig.test.ts

@@ -19,7 +19,7 @@ describe('load plugins', () => {
     });
   });
 
-  test(`should set value when property value is undefined `, () => {
+  test(`should set value when property value is not undefined `, () => {
     expect(
       mergeConfig([
         { source: { entries: { app: './App.tsx' } } },
@@ -37,6 +37,22 @@ describe('load plugins', () => {
     });
   });
 
+  test(`should ignore undefined property`, () => {
+    const config = mergeConfig([
+      { source: { entries: { app: './App.tsx' } } },
+      { source: { entries: undefined } },
+      { tools: { webpack: () => ({}) } },
+      { tools: { webpack: undefined } },
+    ]);
+    expect(config.source).toEqual({
+      entries: {
+        app: './App.tsx',
+      },
+    });
+    expect(Array.isArray(config.tools.webpack)).toBe(true);
+    expect(config.tools.webpack?.length).toBe(1);
+  });
+
   test(`should merge array value`, () => {
     expect(
       mergeConfig([
@@ -67,12 +83,15 @@ describe('load plugins', () => {
       { source: { alias: { a: 'b' } } },
       { source: { alias: () => ({ c: 'd' }) } },
       { tools: { webpack: () => ({}) } },
+      { tools: { webpack: { name: 'test' } } },
+      { tools: { webpack: () => ({}) } },
     ]);
     expect(Array.isArray(config.source.alias)).toBe(true);
     expect(config?.source?.alias?.length).toBe(2);
     expect(typeof (config.source.alias as Array<any>)[1]).toBe('function');
-
     expect(Array.isArray(config.tools.webpack)).toBe(true);
-    expect(config.tools.webpack?.length).toBe(1);
+    expect(config.tools.webpack?.length).toBe(3);
+    expect(typeof (config.tools.webpack as Array<any>)[0]).toBe('function');
+    expect(typeof (config.tools.webpack as Array<any>)[2]).toBe('function');
   });
 });

package/tests/schema.test.ts

@@ -8,16 +8,14 @@ describe('patch schemas', () => {
         schema: { type: 'string' },
       },
       {
-        target: 'deploy.microFrontend.foo',
+        target: 'deploy.foo',
         schema: { type: 'number' },
       },
     ]);
 
     expect(schema.properties).toHaveProperty('foo');
 
-    expect(
-      schema.properties.deploy.properties.microFrontend.properties,
-    ).toHaveProperty('foo');
+    expect(schema.properties.deploy.properties).toHaveProperty('foo');
   });
 
   test('should throw error when node is undefined', () => {