@modern-js/core 1.13.1 → 1.14.0

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # @modern-js/core
 
+## 1.14.0
+
+### Minor Changes
+
+- 7b9067f: add babel plugin for web builder
+
+### Patch Changes
+
+- 22f4dca: chore: move pre-bundled ajv to @modern-js/utils
+
+  chore: 预打包的 ajv 产物移动至 @modern-js/utils 内
+
+- Updated dependencies [79e83ef]
+- Updated dependencies [3c20a5e]
+- Updated dependencies [22f4dca]
+- Updated dependencies [7b9067f]
+  - @modern-js/utils@1.9.0
+  - @modern-js/node-bundle-require@1.3.8
+
+## 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

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/index.d.ts

@@ -1,4 +1,4 @@
-import { ErrorObject } from '../../compiled/ajv';
+import type { ErrorObject } from '@modern-js/utils/ajv';
 import { defaults } from './defaults';
 import { NormalizedConfig } from './mergeConfig';
 import { PluginValidateSchema } from './schema';

package/dist/config/index.js

@@ -10,20 +10,26 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveConfig = exports.loadUserConfig = exports.assignPkgConfig = exports.defineConfig = exports.addServerConfigToDeps = exports.defaultsConfig = void 0;
 const utils_1 = require("@modern-js/utils");
 const lodash_1 = require("@modern-js/utils/lodash");
 const load_configs_1 = require("../load-configs");
-const ajv_1 = __importDefault(require("../../compiled/ajv"));
-const ajv_keywords_1 = __importDefault(require("../../compiled/ajv-keywords"));
-const better_ajv_errors_1 = __importDefault(require("../../compiled/better-ajv-errors"));
 const repeatKeyWarning_1 = require("../utils/repeatKeyWarning");
 const defaults_1 = require("./defaults");
 Object.defineProperty(exports, "defaultsConfig", { enumerable: true, get: function () { return defaults_1.defaults; } });
@@ -89,9 +95,12 @@ const showAdditionalPropertiesError = async (error) => {
 };
 const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
     var _a, _b;
+    const { default: Ajv } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/ajv')));
+    const { default: ajvKeywords } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/ajv-keywords')));
+    const { default: betterAjvErrors } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils/better-ajv-errors')));
     const { config: userConfig, jsConfig, pkgConfig } = loaded;
-    const ajv = new ajv_1.default({ $data: true, strict: false });
-    (0, ajv_keywords_1.default)(ajv);
+    const ajv = new Ajv({ $data: true, strict: false });
+    ajvKeywords(ajv);
     const validateSchema = (0, schema_1.patchSchema)(schemas);
     const validate = ajv.compile(validateSchema);
     (0, repeatKeyWarning_1.repeatKeyWarning)(validateSchema, jsConfig, pkgConfig);
@@ -99,7 +108,7 @@ const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort,
     const valid = validate(userConfig);
     if (!valid && ((_a = validate.errors) === null || _a === void 0 ? void 0 : _a.length)) {
         await onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
-        const errors = (0, better_ajv_errors_1.default)(validateSchema, userConfig, (_b = validate.errors) === null || _b === void 0 ? void 0 : _b.map(e => ({
+        const errors = betterAjvErrors(validateSchema, userConfig, (_b = validate.errors) === null || _b === void 0 ? void 0 : _b.map(e => ({
             ...e,
             dataPath: e.instancePath,
         })), {

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

@@ -1,4 +1,4 @@
-import type { JSONSchemaType } from '../../../compiled/ajv';
+import type { JSONSchemaType } from '@modern-js/utils/ajv';
 export interface PluginValidateSchema {
     target: string;
     schema: JSONSchemaType<any>;
@@ -340,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/types/index.d.ts

@@ -2,13 +2,14 @@
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { NextFunction, BffProxyOptions } from '@modern-js/types';
 import type { MetaOptions, ChainIdentifier, WatchOptions } from '@modern-js/utils';
-import type { TransformOptions, PluginItem as BabelPlugin } from '@babel/core';
+import type { BabelConfig } from '@modern-js/babel-preset-app';
 import type webpack from 'webpack';
 import type { RuleSetRule, Configuration as WebpackConfiguration, WebpackPluginInstance } from 'webpack';
 import type WebpackChain from '@modern-js/utils/webpack-chain';
 import type autoprefixer from 'autoprefixer';
 import type { BasePluginOptions, TerserOptions as RawTerserOptions } from 'terser-webpack-plugin';
 import type { AcceptedPlugin as PostCSSPlugin } from 'postcss';
+import { TransformOptions } from '@babel/core';
 import type { PluginConfig } from '../../loadPlugins';
 import type { TestConfig, JestConfig } from './test';
 import type { SassConfig, SassLoaderOptions } from './sass';
@@ -103,8 +104,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;
@@ -186,15 +188,6 @@ export declare type TsLoaderConfigUtils = {
     addExcludes: (excludes: string | RegExp | (string | RegExp)[]) => void;
 };
 export declare type TsLoaderConfig = TsLoaderOptions | ((config: TsLoaderOptions, utils: TsLoaderConfigUtils) => TsLoaderOptions | void);
-export declare type BabelConfigUtils = {
-    addPlugins: (plugins: BabelPlugin[]) => void;
-    addPresets: (presets: BabelPlugin[]) => void;
-    addIncludes: (includes: string | RegExp | (string | RegExp)[]) => void;
-    addExcludes: (excludes: string | RegExp | (string | RegExp)[]) => void;
-    removePlugins: (plugins: string | string[]) => void;
-    removePresets: (presets: string | string[]) => void;
-};
-export declare type BabelConfig = TransformOptions | ((config: TransformOptions, utils: BabelConfigUtils) => TransformOptions | void);
 export declare type AutoprefixerConfig = AutoprefixerOptions | ((config: AutoprefixerOptions) => AutoprefixerOptions | void);
 export declare type TerserConfig = TerserOptions | ((config: TerserOptions) => TerserOptions | void);
 export interface ToolsConfig {

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { INTERNAL_PLUGINS } from '@modern-js/utils';
-import type { ErrorObject } from '../compiled/ajv';
+import type { ErrorObject } from '@modern-js/utils/ajv';
 import { TransformPlugin } from './loadPlugins';
 import { IAppContext, initAppContext } from './context';
 export * from './config';

package/package.json

@@ -6,12 +6,11 @@
   "repository": "modern-js-dev/modern.js",
   "license": "MIT",
   "keywords": [
-    "react",
     "framework",
     "modern",
     "modern.js"
   ],
-  "version": "1.13.1",
+  "version": "1.14.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -39,13 +38,14 @@
     }
   },
   "dependencies": {
+    "@modern-js/node-bundle-require": "^1.3.8",
     "@modern-js/plugin": "^1.4.2",
-    "@modern-js/utils": "^1.8.0",
-    "@modern-js/node-bundle-require": "^1.3.7"
+    "@modern-js/utils": "^1.9.0"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/types": "1.6.0",
+    "@modern-js/babel-preset-app": "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,14 +53,12 @@
     "@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",
+    "electron-builder": "22.7.0",
     "jest": "^27",
     "postcss": "^8.4.14",
     "sass": "^1.45.0",
-    "electron-builder": "22.7.0",
     "terser-webpack-plugin": "^5.1.4",
     "typescript": "^4",
     "webpack": "^5.71.0"

package/compiled/ajv/codegen.js

@@ -1 +0,0 @@
-module.exports = require('./').codegen;