@modern-js/core 1.10.1 → 1.11.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # @modern-js/core
 
+## 1.11.0
+
+### Minor Changes
+
+- f66fa0e98: feat: support tools.webpackChain config
+
+### Patch Changes
+
+- 1dfe08fcd: feat(webpack): add CHAIN_ID constants for webpack chain
+- Updated dependencies [54fa1dbd6]
+- Updated dependencies [33de0f7ec]
+  - @modern-js/plugin@1.3.5
+  - @modern-js/utils@1.7.5
+
+## 1.10.3
+
+### Patch Changes
+
+- a37960018: refactor: modify deploy microFrontend type
+- Updated dependencies [b8cfc42cd]
+- Updated dependencies [804a5bb8a]
+  - @modern-js/utils@1.7.4
+
+## 1.10.2
+
+### Patch Changes
+
+- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
+- d9d398e16: add filter logic for merge config
+- Updated dependencies [d5913bd96]
+- Updated dependencies [d32f35134]
+- Updated dependencies [6ae4a34ae]
+- Updated dependencies [b80229c79]
+- Updated dependencies [948cc4436]
+  - @modern-js/plugin@1.3.4
+  - @modern-js/load-config@1.3.3
+  - @modern-js/utils@1.7.3
+
 ## 1.10.1
 
 ### Patch Changes

package/compiled/ajv/package.json

@@ -1 +1 @@
-{"name":"ajv","author":"Evgeny Poberezkin","version":"8.11.0","funding":{"type":"github","url":"https://github.com/sponsors/epoberezkin"},"license":"MIT","types":"dist/ajv.d.ts"}
+{"name":"ajv","author":"Evgeny Poberezkin","version":"8.11.0","funding":{"type":"github","url":"https://github.com/sponsors/epoberezkin"},"license":"MIT","types":"types/ajv.d.ts"}

package/dist/bin.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/bin.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require('../compiled/v8-compile-cache');
+// eslint-disable-next-line import/first
+const _1 = require(".");
+if (!process.env.NODE_ENV) {
+    const command = process.argv[2];
+    if (['build', 'start', 'deploy'].includes(command)) {
+        process.env.NODE_ENV = 'production';
+    }
+    else if (command === 'test') {
+        process.env.NODE_ENV = 'test';
+    }
+    else {
+        process.env.NODE_ENV = 'development';
+    }
+}
+const { version } = require('../package.json');
+_1.cli.run(process.argv.slice(2), { version });

package/dist/config/mergeConfig.d.ts

@@ -3,8 +3,9 @@ export interface NormalizedSourceConfig extends Omit<SourceConfig, 'alias' | 'mo
     alias: SourceConfig['alias'] | Array<SourceConfig['alias']>;
     moduleScopes: SourceConfig['moduleScopes'] | Array<SourceConfig['moduleScopes']>;
 }
-export interface NormalizedToolsConfig extends Omit<ToolsConfig, 'webpack' | 'babel' | 'postcss' | 'autoprefixer' | 'lodash' | 'tsLoader' | 'terser' | 'minifyCss' | 'esbuild' | 'styledComponents'> {
+export interface NormalizedToolsConfig extends Omit<ToolsConfig, 'webpack' | 'webpackChain' | 'babel' | 'postcss' | 'autoprefixer' | 'lodash' | 'tsLoader' | 'terser' | 'minifyCss' | 'esbuild' | 'styledComponents'> {
     webpack: ToolsConfig['webpack'] | Array<NonNullable<ToolsConfig['webpack']>>;
+    webpackChain: ToolsConfig['webpackChain'] | Array<NonNullable<ToolsConfig['webpackChain']>>;
     babel: ToolsConfig['babel'] | Array<NonNullable<ToolsConfig['babel']>>;
     postcss: ToolsConfig['postcss'] | Array<NonNullable<ToolsConfig['postcss']>>;
     styledComponents: ToolsConfig['styledComponents'] | Array<NonNullable<ToolsConfig['styledComponents']>>;

package/dist/config/mergeConfig.js

@@ -9,7 +9,11 @@ const utils_1 = require("@modern-js/utils");
  * @param configs - Configuration from modern.config.ts or plugin's config hook.
  * @returns - normalized user config.
  */
-const mergeConfig = (configs) => (0, lodash_1.mergeWith)({}, ...configs, (target, source) => {
+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') {
+        return (0, lodash_1.mergeWith)({}, target !== null && target !== void 0 ? target : {}, source !== null && source !== void 0 ? source : {});
+    }
     if (Array.isArray(target)) {
         if (Array.isArray(source)) {
             return [...target, ...source];

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

@@ -432,6 +432,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
                 webpack: {
                     typeof: string[];
                 };
+                webpackChain: {
+                    typeof: string[];
+                };
                 babel: {
                     typeof: string[];
                 };

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

@@ -5,6 +5,9 @@ export declare const tools: {
         webpack: {
             typeof: string[];
         };
+        webpackChain: {
+            typeof: string[];
+        };
         babel: {
             typeof: string[];
         };

package/dist/config/schema/tools.js

@@ -6,6 +6,7 @@ exports.tools = {
     additionalProperties: false,
     properties: {
         webpack: { typeof: ['object', 'function'] },
+        webpackChain: { typeof: ['function'] },
         babel: { typeof: ['object', 'function'] },
         postcss: { typeof: ['object', 'function'] },
         lodash: { typeof: ['object', 'function'] },

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

@@ -5,7 +5,8 @@ import type { MetaOptions } from '@modern-js/utils';
 import type { TransformOptions } from '@babel/core';
 import type webpack from 'webpack';
 import type { Configuration as WebpackConfiguration } from 'webpack';
-import autoprefixer from 'autoprefixer';
+import type { ChainIdentifier, WebpackChain } from '@modern-js/webpack';
+import type autoprefixer from 'autoprefixer';
 import type { BasePluginOptions, TerserOptions as RawTerserOptions } from 'terser-webpack-plugin';
 import type { PluginConfig } from '../../loadPlugins';
 import type { TestConfig, JestConfig } from './test';
@@ -133,7 +134,7 @@ export interface MicroFrontend {
     moduleApp?: string;
 }
 export interface DeployConfig {
-    microFrontend?: false | MicroFrontend;
+    microFrontend?: boolean | MicroFrontend;
     domain?: string | Array<string>;
     domainByEntries?: Record<string, string | Array<string>>;
 }
@@ -148,14 +149,26 @@ export declare type DevServerConfig = {
 };
 export declare type WebpackConfig = WebpackConfiguration | ((config: WebpackConfiguration, utils: {
     env: string;
+    name: string;
     webpack: typeof webpack;
+    /**
+     * @deprecated please use `tools.webpackChain` instead.
+     */
+    chain: WebpackChain;
     [key: string]: any;
 }) => WebpackConfiguration | void);
+export declare type WebpackChainConfig = (chain: WebpackChain, utils: {
+    env: string;
+    name: string;
+    webpack: typeof webpack;
+    CHAIN_ID: ChainIdentifier;
+}) => void;
 export declare type BabelConfig = TransformOptions | ((config: TransformOptions, utils?: any) => TransformOptions | void);
 export declare type AutoprefixerConfig = AutoprefixerOptions | ((config: AutoprefixerOptions) => AutoprefixerOptions | void);
 export declare type TerserConfig = TerserOptions | ((config: TerserOptions) => TerserOptions | void);
 export interface ToolsConfig {
     webpack?: WebpackConfig;
+    webpackChain?: WebpackChainConfig;
     babel?: BabelConfig;
     autoprefixer?: AutoprefixerConfig;
     postcss?: ConfigFunction;

package/dist/index.d.ts

@@ -15,6 +15,7 @@ export type { PluginAPI } from './pluginAPI';
 export type { NormalizedConfig, IAppContext };
 declare const initAppDir: (cwd?: string | undefined) => Promise<string>;
 export interface CoreOptions {
+    version?: string;
     configFile?: string;
     serverConfigFile?: string;
     packageJsonConfig?: string;
@@ -29,6 +30,7 @@ export interface CoreOptions {
     };
 }
 export declare const mergeOptions: (options?: CoreOptions | undefined) => {
+    version?: string | undefined;
     configFile?: string | undefined;
     serverConfigFile: string;
     packageJsonConfig?: string | undefined;

package/dist/index.js

@@ -43,10 +43,6 @@ Object.defineProperty(exports, "ResolvedConfigContext", { enumerable: true, get:
 Object.defineProperty(exports, "useAppContext", { enumerable: true, get: function () { return pluginAPI_1.useAppContext; } });
 Object.defineProperty(exports, "useConfigContext", { enumerable: true, get: function () { return pluginAPI_1.useConfigContext; } });
 Object.defineProperty(exports, "useResolvedConfigContext", { enumerable: true, get: function () { return pluginAPI_1.useResolvedConfigContext; } });
-utils_1.program
-    .name('modern')
-    .usage('<command> [options]')
-    .version(process.env.MODERN_JS_VERSION || '0.1.0');
 const initAppDir = async (cwd) => {
     if (!cwd) {
         // eslint-disable-next-line no-param-reassign
@@ -69,6 +65,9 @@ const mergeOptions = (options) => {
     };
 };
 exports.mergeOptions = mergeOptions;
+const setProgramVersion = (version = 'unknown') => {
+    utils_1.program.name('modern').usage('<command> [options]').version(version);
+};
 const createCli = () => {
     let hooksRunner;
     let isRestart = false;
@@ -82,6 +81,7 @@ const createCli = () => {
         restartOptions = mergedOptions;
         const appDirectory = await initAppDir();
         (0, commander_1.initCommandsMap)();
+        setProgramVersion(options === null || options === void 0 ? void 0 : options.version);
         const metaName = (_b = (_a = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options) === null || _a === void 0 ? void 0 : _a.metaName) !== null && _b !== void 0 ? _b : 'MODERN';
         (0, loadEnv_1.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
         const loaded = await (0, config_1.loadUserConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);

package/dist/loadPlugins.js

@@ -31,7 +31,7 @@ function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
             .filter(name => {
             const config = allPlugins[name];
             if (config.forced === true) {
-                // 参考 packages/cli/core/src/cli.ts 文件
+                // 参考 packages/cli/core/src/bin.ts 文件
                 return true;
             }
             return (0, utils_1.isDepExists)(appDirectory, name);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.10.1",
+  "version": "1.11.0-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -27,8 +27,8 @@
       "default": "./dist/index.js"
     },
     "./bin": {
-      "jsnext:source": "./src/cli.ts",
-      "default": "./bin/modern-js.js"
+      "jsnext:source": "./src/bin.ts",
+      "default": "./dist/bin.js"
     }
   },
   "typesVersions": {
@@ -38,20 +38,21 @@
       ]
     }
   },
-  "bin": "./bin/modern-js.js",
+  "bin": "./dist/bin.js",
   "dependencies": {
-    "@modern-js/load-config": "^1.3.2",
-    "@modern-js/plugin": "^1.3.3",
-    "@modern-js/utils": "^1.7.2"
+    "@modern-js/load-config": "^1.3.3",
+    "@modern-js/plugin": "^1.3.5",
+    "@modern-js/utils": "^1.7.5"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/types": "1.5.2",
+    "@modern-js/types": "1.5.3",
+    "@modern-js/webpack": "1.8.0",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/babel__code-frame": "^7.0.3",
     "@types/babel__core": "^7.1.16",
-    "@types/jest": "^26",
+    "@types/jest": "^27",
     "@types/less": "^3.0.3",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -70,11 +71,34 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "wireit": {
+    "build": {
+      "command": "tsc",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": [
+        "dist/**/*"
+      ]
+    },
+    "test": {
+      "command": "jest",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json",
+        "tests/**/*"
+      ],
+      "output": []
+    }
+  },
   "scripts": {
     "new": "modern new",
-    "build": "tsc",
+    "build": "wireit",
     "dev": "tsc --watch",
-    "test": "jest"
+    "test": "wireit"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/.eslintrc.js

@@ -1,9 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@modern-js'],
-  ignorePatterns: ['compiled/'],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-  },
-};

package/bin/modern-js.js

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-
-require('../compiled/v8-compile-cache');
-const { cli } = require('../');
-const { version } = require('../package.json');
-
-process.env.MODERN_JS_VERSION = version;
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV =
-    // eslint-disable-next-line no-nested-ternary
-    ['build', 'start', 'deploy'].indexOf(process.argv[2]) !== -1
-      ? 'production'
-      : process.argv[2] === 'test'
-      ? 'test'
-      : 'development';
-}
-
-cli.run(process.argv.slice(2));

package/dist/cli.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/cli.js

@@ -1,33 +0,0 @@
-"use strict";
-// 这个文件跟 bin/modern-js.js 基本一样
-// 在开发阶段，因为 package.json 的 exports['./bin']['jsnext:source'] 配置
-// 了这个文件，所以需要保留, 后续如果找到更好的方式之后会移除这个文件
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const _1 = require(".");
-const { version } = require('../package.json');
-// XXX: 通过这个方式去掉了 package.json 里面对于 @modern-js/module-tools 的 devDependencies 依赖
-// 然后可以正常的执行 modern build
-const kModuleToolsCliPath = path_1.default.resolve(__dirname, '../../../solutions/module-tools/src/index.ts');
-process.env.MODERN_JS_VERSION = version;
-if (!process.env.NODE_ENV) {
-    process.env.NODE_ENV =
-        // eslint-disable-next-line no-nested-ternary
-        ['build', 'start', 'deploy'].includes(process.argv[2])
-            ? 'production'
-            : process.argv[2] === 'test'
-                ? 'test'
-                : 'development';
-}
-_1.cli.run(process.argv.slice(2), {
-    plugins: {
-        '@modern-js/module-tools': {
-            cli: kModuleToolsCliPath,
-            // 是否需要强制加载这个组件，跳过 loadPlugins 里面 filter 的检测逻辑
-            forced: true,
-        },
-    },
-});

package/jest.config.js

@@ -1,7 +0,0 @@
-const sharedConfig = require('@scripts/jest-config');
-
-/** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = {
-  ...sharedConfig,
-  rootDir: __dirname,
-};

package/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "target": "ES2019",
-    "declaration": true,
-    "outDir": "./dist",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "esModuleInterop": true
-  },
-  "include": ["src"]
-}