@modern-js/core 1.15.0 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,62 @@
 # @modern-js/core
 
+## 1.18.0
+
+### Patch Changes
+
+- 60a2e3a: feat: add compiler option for server
+  feat: 为 server 添加编译选项
+- 66ad36f: feat: add source.enableAsyncEntry config
+
+  feat: 新增 source.enableAsyncEntry 配置项
+
+- Updated dependencies [8280920]
+- Updated dependencies [5227370]
+- Updated dependencies [7928bae]
+  - @modern-js/utils@1.18.0
+  - @modern-js/node-bundle-require@1.18.0
+  - @modern-js/plugin@1.18.0
+
+## 1.17.0
+
+### Patch Changes
+
+- 367405a: fix(core): missing BabelConfig type
+
+  fix(core): 修复未导出 BabelConfig 类型的问题
+
+- 9f4e5ce: fix(core): cli -c option not work
+
+  fix(core): 修复命令行中 -c 选项不生效的问题
+
+- 58c53a7: fix: add merge check
+  fix: 添加合并属性的检查
+- Updated dependencies [1b9176f]
+- Updated dependencies [77d3a38]
+- Updated dependencies [151329d]
+- Updated dependencies [5af9472]
+- Updated dependencies [6b6a534]
+- Updated dependencies [6b43a2b]
+- Updated dependencies [a7be124]
+- Updated dependencies [31547b4]
+  - @modern-js/utils@1.17.0
+  - @modern-js/node-bundle-require@1.17.0
+  - @modern-js/plugin@1.17.0
+
+## 1.16.0
+
+### Patch Changes
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+  - @modern-js/utils@1.16.0
+  - @modern-js/node-bundle-require@1.16.0
+  - @modern-js/plugin@1.16.0
+
 ## 1.15.0
 
 ### Patch Changes
@@ -17,7 +74,7 @@
 
 ### Minor Changes
 
-- 7b9067f: add babel plugin for web builder
+- 7b9067f: add babel plugin for webpack-builder
 
 ### Patch Changes
 

package/dist/bin.js

@@ -34,7 +34,8 @@ const SUPPORT_CONFIG_PARAM_COMMANDS = [
     'start',
     'inspect',
 ];
-if (SUPPORT_CONFIG_PARAM_COMMANDS.includes(command) && cliParams.config) {
-    runOptions.configFile = cliParams.config;
+const customConfigFile = cliParams.config || cliParams.c;
+if (SUPPORT_CONFIG_PARAM_COMMANDS.includes(command) && customConfigFile) {
+    runOptions.configFile = customConfigFile;
 }
 _1.cli.run(process.argv.slice(2), runOptions);

package/dist/config/defaults.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaults = void 0;
 const sourceDefaults = {
     entries: undefined,
+    enableAsyncEntry: false,
     disableDefaultEntries: false,
     entriesDir: './src',
     configDir: './config',

package/dist/config/mergeConfig.js

@@ -12,8 +12,8 @@ const utils_1 = require("@modern-js/utils");
 const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source, key) => {
     // Do not use the following merge logic for source.designSystem and tools.tailwind(css)
     if (key === 'designSystem' ||
-        key === 'tailwind' ||
-        key === 'tailwindcss' ||
+        (key === 'tailwind' && typeof source === 'object') ||
+        (key === 'tailwindcss' && typeof source === 'object') ||
         key === 'devServer') {
         return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
     }

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

@@ -45,6 +45,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
                 alias: {
                     typeof: string[];
                 };
+                enableAsyncEntry: {
+                    type: string;
+                };
                 disableDefaultEntries: {
                     type: string;
                 };
@@ -400,6 +403,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
                 watchOptions: {
                     type: string;
                 };
+                compiler: {
+                    type: string;
+                };
             };
         };
         deploy: {

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

@@ -184,5 +184,8 @@ export declare const server: {
         watchOptions: {
             type: string;
         };
+        compiler: {
+            type: string;
+        };
     };
 };

package/dist/config/schema/server.js

@@ -105,5 +105,6 @@ exports.server = {
         proxy: { type: 'object' },
         enableMicroFrontendDebug: { type: 'boolean' },
         watchOptions: { type: 'object' },
+        compiler: { type: 'string' },
     },
 };

package/dist/config/schema/source.d.ts

@@ -36,6 +36,9 @@ export declare const source: {
         alias: {
             typeof: string[];
         };
+        enableAsyncEntry: {
+            type: string;
+        };
         disableDefaultEntries: {
             type: string;
         };

package/dist/config/schema/source.js

@@ -26,6 +26,7 @@ exports.source = {
         },
         preEntry: { type: ['string', 'array'] },
         alias: { typeof: ['object', 'function'] },
+        enableAsyncEntry: { type: 'boolean' },
         disableDefaultEntries: { type: 'boolean' },
         envVars: { type: 'array' },
         globalVars: { type: 'object' },

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

@@ -23,7 +23,7 @@ declare type AutoprefixerOptions = autoprefixer.Options;
 declare type TerserOptions = BasePluginOptions & {
     terserOptions?: Partial<RawTerserOptions>;
 };
-export type { TestConfig, JestConfig, UnbundleConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions, AutoprefixerOptions, TerserOptions, };
+export type { TestConfig, JestConfig, BabelConfig, UnbundleConfig, SassConfig, SassLoaderOptions, LessConfig, LessLoaderOptions, SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions, TransformOptions, AutoprefixerOptions, TerserOptions, };
 export interface SourceConfig {
     entries?: Record<string, string | {
         entry: string;
@@ -31,6 +31,7 @@ export interface SourceConfig {
         disableMount?: boolean;
     }>;
     preEntry?: string | string[];
+    enableAsyncEntry?: boolean;
     disableDefaultEntries?: boolean;
     entriesDir?: string;
     configDir?: string;
@@ -119,6 +120,7 @@ export interface ServerConfig {
     metrics?: boolean | Record<string, any>;
     enableMicroFrontendDebug?: boolean;
     watchOptions?: WatchOptions;
+    compiler?: 'babel' | 'typescript';
 }
 export declare type DevProxyOptions = string | Record<string, string>;
 export interface DevConfig {

package/dist/types/cli.d.ts

@@ -53,6 +53,10 @@ export interface Hooks {
         entrypoint: Entrypoint;
         code: string;
     }>;
+    modifyAsyncEntry: AsyncWaterfall<{
+        entrypoint: Entrypoint;
+        code: string;
+    }>;
     modifyFileSystemRoutes: AsyncWaterfall<{
         entrypoint: Entrypoint;
         routes: Route[];

package/package.json

@@ -10,7 +10,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.15.0",
+  "version": "1.18.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -38,16 +38,16 @@
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "1.15.0",
-    "@modern-js/plugin": "1.15.0",
-    "@modern-js/utils": "1.15.0"
+    "@modern-js/node-bundle-require": "1.18.0",
+    "@modern-js/plugin": "1.18.0",
+    "@modern-js/utils": "1.18.0"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/babel-preset-app": "1.15.0",
-    "@modern-js/types": "1.15.0",
-    "@scripts/build": "1.15.0",
-    "@scripts/jest-config": "1.15.0",
+    "@modern-js/babel-preset-app": "1.18.0",
+    "@modern-js/types": "1.18.0",
+    "@scripts/build": "1.18.0",
+    "@scripts/jest-config": "1.18.0",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__core": "^7.1.16",
     "@types/jest": "^27",