@modern-js/core 1.13.0 → 1.13.3

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @modern-js/core
 
+## 1.13.3
+
+### Patch Changes
+
+- f4822c0: feat(app-tools): start and inspect command support specify config file
+
+  feat(app-tools): start 和 inspect 命令支持指定配置文件
+
+- Updated dependencies [4f1889d]
+  - @modern-js/utils@1.8.1
+
+## 1.13.2
+
+### Patch Changes
+
+- bfc1264: fix(core): should keep single function value after merge config
+
+  fix(core): 修复合并配置后，函数类型的配置项变成数组类型的问题
+
+- 44e3bb1: feat: support response headers
+  feat: 支持设置响应头
+  - @modern-js/utils@1.8.0
+
+## 1.13.1
+
+### Patch Changes
+
+- 9d60891: feat(webpack): support source.preEntry config
+
+  feat(webpack): 新增 source.preEntry 配置项
+
+- 5876e63: fix: the SSG callback is called once for each baseUrl, when a user configures multiple baseUrl.
+  fix: 当用户配置了多个 baseUrl 时，将会为每个 baseUrl 调用一次 SSG 回调函数。
+- Updated dependencies [4fc801f]
+- Updated dependencies [c8614b8]
+  - @modern-js/utils@1.8.0
+
 ## 1.13.0
 
 ### Minor Changes

package/dist/bin.js

@@ -23,7 +23,18 @@ const cliParams = (0, utils_1.minimist)(process.argv.slice(2));
 const runOptions = {
     version,
 };
-if (['dev', 'build', 'deploy'].includes(command) && cliParams.config) {
+/**
+ * Commands that support specify config files
+ * Some commands can't support this feature, such as `new`
+ */
+const SUPPORT_CONFIG_PARAM_COMMANDS = [
+    'dev',
+    'build',
+    'deploy',
+    'start',
+    'inspect',
+];
+if (SUPPORT_CONFIG_PARAM_COMMANDS.includes(command) && cliParams.config) {
     runOptions.configFile = cliParams.config;
 }
 _1.cli.run(process.argv.slice(2), runOptions);

package/dist/config/mergeConfig.js

@@ -22,11 +22,17 @@ const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target
             return [...target, ...source];
         }
         else {
-            return typeof source !== 'undefined' ? [...target, source] : target;
+            return source !== undefined ? [...target, source] : target;
         }
     }
-    else if ((0, utils_1.isFunction)(source)) {
-        return typeof target !== 'undefined' ? [target, source] : [source];
+    else if ((0, utils_1.isFunction)(target) || (0, utils_1.isFunction)(source)) {
+        if (source === undefined) {
+            return target;
+        }
+        if (target === undefined) {
+            return source;
+        }
+        return [target, source];
     }
     return undefined;
 });

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

@@ -39,6 +39,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
                         };
                     };
                 };
+                preEntry: {
+                    type: string[];
+                };
                 alias: {
                     typeof: string[];
                 };
@@ -337,6 +340,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
                                     disableSpa: {
                                         type: string;
                                     };
+                                    resHeaders: {
+                                        type: string;
+                                    };
                                 };
                                 additionalProperties: boolean;
                             };

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

@@ -124,6 +124,9 @@ export declare const server: {
                             disableSpa: {
                                 type: string;
                             };
+                            resHeaders: {
+                                type: string;
+                            };
                         };
                         additionalProperties: boolean;
                     };

package/dist/config/schema/server.js

@@ -69,6 +69,7 @@ exports.server = {
                                 ],
                             },
                             disableSpa: { type: 'boolean' },
+                            resHeaders: { type: 'object' },
                         },
                         additionalProperties: false,
                     },

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

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

package/dist/config/schema/source.js

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

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

@@ -29,6 +29,7 @@ export interface SourceConfig {
         enableFileSystemRoutes?: boolean;
         disableMount?: boolean;
     }>;
+    preEntry?: string | string[];
     disableDefaultEntries?: boolean;
     entriesDir?: string;
     configDir?: string;
@@ -102,8 +103,9 @@ export interface OutputConfig {
 }
 export interface ServerConfig {
     routes?: Record<string, string | string[] | {
-        route: string | string[];
+        route?: string | string[];
         disableSpa?: boolean;
+        resHeaders?: Record<string, unknown>;
     }>;
     publicRoutes?: {
         [filepath: string]: string;

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

@@ -10,4 +10,6 @@ export declare type SSGSingleEntryOptions = boolean | {
     routes?: SSGRouteOptions[];
 };
 export declare type SSGMultiEntryOptions = Record<string, SSGSingleEntryOptions>;
-export declare type SSGConfig = boolean | SSGSingleEntryOptions | SSGMultiEntryOptions | ((entryName: string) => SSGSingleEntryOptions);
+export declare type SSGConfig = boolean | SSGSingleEntryOptions | SSGMultiEntryOptions | ((entryName: string, payload: {
+    baseUrl?: string;
+}) => SSGSingleEntryOptions);

package/package.json

@@ -6,12 +6,11 @@
   "repository": "modern-js-dev/modern.js",
   "license": "MIT",
   "keywords": [
-    "react",
     "framework",
     "modern",
     "modern.js"
   ],
-  "version": "1.13.0",
+  "version": "1.13.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -40,12 +39,12 @@
   },
   "dependencies": {
     "@modern-js/plugin": "^1.4.2",
-    "@modern-js/utils": "^1.7.12",
+    "@modern-js/utils": "^1.8.1",
     "@modern-js/node-bundle-require": "^1.3.7"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/types": "1.6.0",
+    "@modern-js/types": "1.6.2",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/babel__code-frame": "^7.0.3",
@@ -53,8 +52,6 @@
     "@types/jest": "^27",
     "@types/less": "^3.0.3",
     "@types/node": "^14",
-    "@types/react": "^17",
-    "@types/react-dom": "^17",
     "autoprefixer": "^10.3.1",
     "btsm": "2.2.2",
     "jest": "^27",