@empjs/cli 3.0.0-rc.0 → 3.0.0-rc.10

package/dist/script/dev.d.ts

@@ -1,4 +1,4 @@
-import { RspackOptions } from '@rspack/core';
+import { type RspackOptions } from '@rspack/core';
 import { BaseScript } from '../script/base';
 declare class DevScript extends BaseScript {
     get rspackDevConfig(): RspackOptions;

package/dist/script/httpBase.d.ts

@@ -1,4 +1,4 @@
-import { Express } from 'express';
+import { type Express } from 'express';
 import { BaseScript } from '../script/base';
 export declare class HttpServer extends BaseScript {
     app: Express;

package/dist/store/empConfig.d.ts

@@ -1,7 +1,8 @@
-import { GlobalStore } from '../store';
-import { BuildType, DebugType, EMPShareType, HtmlType, RsTarget, ServerType } from '../types/config';
-import { Output } from '@rspack/core';
-import { EMPShareLib } from '../store/empShareLib';
+import type { GlobalStore } from '../store';
+import type { BuildType, DebugType, EMPShareType, HtmlType, RsTarget, ServerType } from '../types/config';
+import type { Output } from '@rspack/core';
+import { EMPShareLib } from '../store/empShare';
+import { EmpShareFastMode } from '../store/empShare/fastMode';
 import { LifeCycle } from '../store/lifeCycle';
 export declare class EmpConfig {
     private store;
@@ -25,6 +26,7 @@ export declare class EmpConfig {
     base: string;
     target: RsTarget;
     private assign;
+    empShareFastMode: EmpShareFastMode;
     empShareLib: EMPShareLib;
     /**
      * 是否启动 esm 模块
@@ -56,6 +58,10 @@ export declare class EmpConfig {
     syncEmpOptions(): Promise<void>;
     get moduleTransformRule(): any;
     get cacheDir(): string;
+    get ignoreWarnings(): (RegExp | ((args_0: Error, args_1: import("@rspack/core").Compilation, ...args_2: unknown[]) => boolean))[];
+    get autoPages(): {
+        path: string;
+    } | undefined;
 }
 declare const _default: EmpConfig;
 export default _default;

package/dist/store/empShare/fastMode.d.ts

@@ -0,0 +1,18 @@
+import type { EMPShareFastModeType } from '../../types/config';
+export declare class EmpShareFastMode {
+    fastMode: Required<EMPShareFastModeType>;
+    externalMF: {
+        '@module-federation/runtime': string;
+        '@module-federation/sdk': string;
+    };
+    externalReact: {
+        react: string;
+        'react-dom': string;
+        'react-router-dom': string;
+    };
+    externals: any;
+    getRuntimeLib(runtimeHost: string): string;
+    setup(): void;
+    injectLib(): void;
+    setExternals(): void;
+}

package/dist/store/{empShareLib.d.ts → empShare/index.d.ts}

@@ -1,6 +1,6 @@
-import { Configuration } from '@rspack/core';
-import type { EMPShareType } from '../types/config';
-import { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
+import type { ModuleFederationPlugin } from '@module-federation/enhanced/rspack';
+import type { Configuration } from '@rspack/core';
+import type { EMPShareType } from '../../types/config';
 export type externalAssetsType = {
     js: string[];
     css: string[];
@@ -17,7 +17,6 @@ export declare class EMPShareLib {
     private exp;
     config: EMPShareType;
     importMap: ImportMapType;
-    version: EMPShareType['mfVersion'];
     isEmpshare: boolean;
     setup(): Promise<void>;
     /**

package/dist/store/index.d.ts

@@ -1,9 +1,9 @@
-import { EMPModeType } from '../types/env';
-import WPChain from 'webpack-chain';
 import type { Configuration as RsConfig, RspackOptions } from '@rspack/core';
-import type { EmpOptions } from '../types/config';
-import { EmpConfig } from '../store/empConfig';
 import { deepAssign } from '../helper/utils';
+import { type EmpConfig } from '../store/empConfig';
+import type { EmpOptions } from '../types/config';
+import type { EMPModeType } from '../types/env';
+import WPChain from 'webpack-chain';
 export declare class GlobalStore {
     /**
      * EMP Version
@@ -79,6 +79,10 @@ export declare class GlobalStore {
     vCompare: (preVersion?: string, lastVersion?: string) => number;
     deepAssign: typeof deepAssign;
     getLanIp: () => string;
+    entries: {
+        [chunkName: string]: RspackOptions['entry'];
+    };
+    debug: EmpConfig['debug'];
     setup(mode: string, cliOptions: any): Promise<void>;
     /**
      * 初始化 基础变量

package/dist/store/lifeCycle.d.ts

@@ -5,6 +5,10 @@ export declare class LifeCycle {
     afterGetEmpOptions(): Promise<void>;
     beforePlugin(): Promise<void>;
     afterPlugin(): Promise<void>;
+    beforeModule(): Promise<void>;
+    afterModule(): Promise<void>;
+    beforeEmpPlugin(): Promise<void>;
+    afterEmpPlugin(): Promise<void>;
     beforeBuild(): Promise<void>;
     afterBulid(): Promise<void>;
     beforeDevServe(): Promise<void>;

package/dist/store/rspack/common.d.ts

@@ -3,6 +3,7 @@ declare class RspackCommon {
     store: GlobalStore;
     setup(store: GlobalStore): Promise<void>;
     common(): Promise<void>;
+    checkTsconfig(): Promise<void>;
     stats(): Promise<void>;
     devServer(): Promise<void>;
     optimization(): Promise<void>;

package/dist/store/rspack/entries.d.ts

@@ -1,6 +1,6 @@
+import type { RspackOptions } from '@rspack/core';
 import type { GlobalStore } from '../../store';
-import { EmpConfig } from '../empConfig';
-import { RspackOptions } from '@rspack/core';
+import type { EmpConfig } from '../empConfig';
 type EntriesConfigType = {
     [chunk: string]: {
         html: EmpConfig['html'];
@@ -12,13 +12,27 @@ declare class RspackEntries {
     entriesConfig: EntriesConfigType;
     setup(store: GlobalStore): Promise<void>;
     private setHtmlConfig;
+    /**
+     * chunk name 格式化 去除 后缀
+     * @param filename
+     * @returns
+     */
     private setChunk;
     private setTemplate;
     private setFavicion;
+    /**
+     *
+     * @param filename 文件名
+     * @param op html plugin 配置
+     * @param absPath 文件 绝对路径
+     */
     private setEntryItem;
     setRspackHtmlPlugin(config: EmpConfig['html'], chunk: string): void;
     setRspackEntry(entry: RspackOptions['entry']): void;
     init(): Promise<void>;
+    setAutoPage(): Promise<void>;
+    setDefaultEntry(): Promise<void>;
+    setEntryByConfig(): void;
     toConfig(): void;
 }
 declare const _default: RspackEntries;

package/dist/store/rspack/hook.d.ts

@@ -1,19 +1,21 @@
-import { HtmlType } from '../../types/config';
-import { EMPShareLib } from '../empShareLib';
-import { type Compiler } from '@rspack/core';
+import type { Compiler } from '@rspack/core';
+import type { EMPShareLib } from '../../store/empShare';
+import type { HtmlType } from '../../types/config';
 export declare const HtmlImportMapPluginName = "HtmlImportMapPlugin";
 export declare class HtmlImportMapPlugin {
     importMap: EMPShareLib['importMap'];
-    constructor(importMap: EMPShareLib['importMap']);
+    chunk: string;
+    constructor(importMap: EMPShareLib['importMap'], chunk: string);
     apply(compiler: any): void;
 }
 export declare const HtmlEmpShareLibPluginName = "HtmlEmpShareLibPlugin";
 export declare class HtmlEmpShareLibPlugin {
+    chunk: string;
     files: {
         css: string[];
         js: string[];
     };
-    constructor(files: HtmlType['files']);
+    constructor(files: HtmlType['files'], chunk: string);
     apply(compiler: any): void;
 }
 export declare class EmpPolyfillPlugin {

package/dist/types/config.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
+import type { InspectOptions } from 'node:util';
 import type { Configuration as RsConfig } from '@rspack/core';
-import { Configuration as devServerConfig } from '@rspack/dev-server';
-import Chain from 'webpack-chain';
-import { Externals, HtmlRspackPluginOptions, Output, Resolve, RuleSetRule, SwcJsMinimizerRspackPluginOptions } from '@rspack/core';
-import { EMP3PluginType } from './plugin';
-import { InspectOptions } from 'node:util';
+import type { Externals, HtmlRspackPluginOptions, Output, Resolve, RuleSetRule, SwcJsMinimizerRspackPluginOptions } from '@rspack/core';
+import type { Configuration as devServerConfig } from '@rspack/dev-server';
+import type { ModuleFederationPluginOptions } from '../store/empShare';
 import type { LifeCycle } from '../store/lifeCycle';
-import type { ModuleFederationPluginOptions } from '../store/empShareLib';
+import type Chain from 'webpack-chain';
+import type { EMP3PluginType } from './plugin';
 export type LoggerType = 'debug' | 'info' | 'warn' | 'error';
 export type DebugType = {
     loggerLevel: LoggerType;
@@ -15,6 +15,7 @@ export type DebugType = {
     showRsconfig: boolean | string | InspectOptions;
     showPerformance: boolean;
     rspackCache: boolean;
+    newTreeshaking: boolean;
     /**
      * 是否显示执行日志
      * @default false
@@ -99,6 +100,11 @@ export type BuildType = {
      * @default false
      */
     polyfill?: 'entry' | 'usage' | false;
+    /**
+     * 手动注入兼容代码,避免usage出现分析纰漏问题
+     * @default ['es.object.values', 'es.object.entries', 'es.array.flat']
+     */
+    polyfillInclude?: string[];
     /**
      * 选择core-js的兼容版本有助于切换适当的代码体积
      * @default stable
@@ -113,6 +119,15 @@ export type BuildType = {
      * 浏览器 兼容版本
      */
     browserslist: string[];
+    /**
+     * swc 配置
+     */
+    swcConfig: {
+        transform?: {
+            useDefineForClassFields?: boolean;
+        };
+        preserveAllComments?: boolean;
+    };
 };
 export type JscTarget = 'es3' | 'es5' | 'es2015' | 'es2016' | 'es2017' | 'es2018' | 'es2019' | 'es2020' | 'es2021' | 'es2022';
 export interface HtmlType extends HtmlRspackPluginOptions {
@@ -166,6 +181,28 @@ export interface ModuleTransform {
      */
     defaultExclude?: boolean;
 }
+export type EMPShareFastModeType = {
+    /**
+     * 共享库目录 优先读取 runtimeLib
+     */
+    runtimeHost?: string;
+    /**
+     * 共享库全路径
+     */
+    runtimeLib?: string;
+    /**
+     * 额外的库添加
+     */
+    externals?: any;
+    /**
+     * 当为 UMD时 暴露到 window 的全局变量
+     */
+    globalVal?: string;
+    /**
+     * 默认支持React
+     */
+    framework?: 'react';
+};
 export type EMPShareType = ModuleFederationPluginOptions & {
     /**
      * emp 基于库共享模块
@@ -177,10 +214,9 @@ export type EMPShareType = ModuleFederationPluginOptions & {
      */
     useImportMap?: boolean;
     /**
-     * module federation 版本
-     * @default 1
+     * 快速模式
      */
-    mfVersion?: 1 | 1.5;
+    fastMode?: EMPShareFastModeType;
 };
 export type EMPshareLibItemType = {
     [module: string]: {
@@ -216,6 +252,13 @@ export type ExternalsItemType = {
     type?: string;
 };
 export type RsTarget = RsConfig['target'];
+export type AutoPagesType = {
+    /**
+     * 基于src寻找入口目录
+     * @default pages
+     */
+    path?: string;
+};
 export type EmpOptions = {
     /**
      * publicPath 根路径 可参考webpack,业务模式默认为 auto
@@ -232,6 +275,11 @@ export type EmpOptions = {
      * 启动后 自动设置 base 为当前 Ip+port的路径如 base = http://127.0.0.1:8080/ 并且固定 ws 方便代理调试
      */
     autoDevBase?: boolean;
+    /**
+     * 启动后 进入自动搜寻入口的方式
+     * 可以通过 html 或 entries 设置 模版配置
+     */
+    autoPages?: boolean | AutoPagesType;
     /**
      * 项目代码路径
      * @default 'src'
@@ -294,4 +342,9 @@ export type EmpOptions = {
      * emp 执行周期
      */
     lifeCycle?: LifeCycle;
+    /**
+     * ignoreWarnings
+     * @default [/Conflicting order/]
+     */
+    ignoreWarnings?: RsConfig['ignoreWarnings'];
 };

package/emp-tsconfig.json

@@ -3,11 +3,7 @@
     "types": ["@empjs/cli/client"],
     "plugins": [{ "name": "typescript-plugin-css-modules" }],
     "target": "ESNext",
-    "lib": [
-      "DOM",
-      "DOM.Iterable",
-      "ESNext"
-    ],
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -23,11 +19,6 @@
     "jsx": "preserve",
     "verbatimModuleSyntax": true
   },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "dist",
-    "nodule_modules"
-  ]
-}
+  "include": ["src"],
+  "exclude": ["dist", "nodule_modules"]
+}

package/package.json

@@ -1,113 +1,96 @@
 {
-	"name": "@empjs/cli",
-	"version": "3.0.0-rc.0",
-	"description": "emp",
-	"license": "MIT",
-	"type": "module",
-	"files": [
-		"dist",
-		"bin",
-		"resource",
-		"template",
-		"client.d.ts",
-		"emp-tsconfig.json"
-	],
-	"maintainers": [
-		"xuhongbin",
-		"ckken"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/empjs/emp.git",
-		"directory": "packages/cli"
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"keywords": [
-		"rspack",
-		"rust",
-		"typescript"
-	],
-	"bin": {
-		"emp": "./bin/emp.js"
-	},
-	"main": "dist/index.js",
-	"module": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"exports": {
-		".": {
-			"import": {
-				"default": "./dist/index.js",
-				"types": "./dist/index.d.ts"
-			},
-			"require": {
-				"default": "./dist/index.js",
-				"types": "./dist/index.d.ts"
-			}
-		},
-		"./emp-tsconfig.json": "./emp-tsconfig.json"
-	},
-	"scripts": {
-		"d": "rimraf dist && pnpm run esdev:build",
-		"b": "rimraf dist && pnpm run esbuild:build",
-		"dev": "rimraf dist && pnpm run /^esdev:.*/",
-		"esdev:build": "cross-env ENV=dev node esbuild.js",
-		"esdev:tsc": "tsc -w",
-		"esdev:tsc-alias": "tsc-alias -w",
-		"build": "rimraf dist && pnpm run /^esbuild:.*/",
-		"esbuild:build": "cross-env ENV=prod node esbuild.js",
-		"esbuild:tsc": "tsc && tsc-alias",
-		"dts": "node dts-bundle.js"
-	},
-	"engines": {
-		"node": ">=20.0.0"
-	},
-	"author": "Ken",
-	"devDependencies": {
-		"@types/compression": "^1.7.2",
-		"@types/cors": "^2.8.12",
-		"@types/default-gateway": "^7.2.1",
-		"@types/express": "^4.17.13",
-		"@types/fs-extra": "^11.0.4",
-		"@types/watchpack": "^2.4.3",
-		"@types/webpack": "^5.28.4",
-		"@types/webpack-bundle-analyzer": "^4.6.2",
-		"@types/webpack-hot-middleware": "^2.25.9",
-		"@types/webpack-sources": "^3.2.2",
-		"cross-env": "^7.0.3",
-		"esbuild": "^0.19.5",
-		"rimraf": "^5.0.5",
-		"tsc-alias": "^1.8.8"
-	},
-	"dependencies": {
-		"@module-federation/enhanced": "^0.1.3",
-		"@rspack/core": "0.6.1",
-		"@rspack/dev-server": "0.6.1",
-		"@swc/helpers": "^0.5.7",
-		"@types/node": "^20.8.7",
-		"address": "^2.0.1",
-		"ansi-html-community": "^0.0.8",
-		"chalk": "^5.3.0",
-		"commander": "^11.1.0",
-		"compression": "^1.7.4",
-		"core-js": "^3.36.1",
-		"cors": "^2.8.5",
-		"default-gateway": "^7.2.2",
-		"express": "^4.18.2",
-		"fast-glob": "^3.3.1",
-		"fs-extra": "^11.2.0",
-		"gzip-size": "^7.0.0",
-		"html-entities": "^2.5.2",
-		"html-webpack-plugin": "^5.6.0",
-		"less-loader": "^11.1.3",
-		"open": "^10.1.0",
-		"postcss": "^8.4.33",
-		"postcss-loader": "^7.3.4",
-		"sass-loader": "^13.3.2",
-		"strip-ansi": "^7.1.0",
-		"typescript-plugin-css-modules": "^5.0.2",
-		"webpack-bundle-analyzer": "^4.9.1",
-		"webpack-chain": "^6.5.1"
-	}
-}
+  "name": "@empjs/cli",
+  "version": "3.0.0-rc.10",
+  "description": "emp",
+  "license": "MIT",
+  "type": "module",
+  "files": ["dist", "bin", "resource", "template", "client.d.ts", "emp-tsconfig.json"],
+  "maintainers": ["xuhongbin", "ckken", "doerme"],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/empjs/emp.git",
+    "directory": "packages/cli"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": ["rspack", "rust", "typescript"],
+  "bin": {
+    "emp": "./bin/emp.js"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": {
+        "default": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      },
+      "require": {
+        "default": "./dist/index.js",
+        "types": "./dist/index.d.ts"
+      }
+    },
+    "./emp-tsconfig.json": "./emp-tsconfig.json"
+  },
+  "scripts": {
+    "d": "rimraf dist && pnpm run esdev:build",
+    "b": "rimraf dist && pnpm run esbuild:build",
+    "dev": "rimraf dist && pnpm run /^esdev:.*/",
+    "esdev:build": "cross-env ENV=dev node esbuild.js",
+    "esdev:tsc": "tsc -w",
+    "esdev:tsc-alias": "tsc-alias -w",
+    "build": "rimraf dist && pnpm run /^esbuild:.*/",
+    "esbuild:build": "cross-env ENV=prod node esbuild.js",
+    "esbuild:tsc": "tsc && tsc-alias",
+    "dts": "node dts-bundle.js"
+  },
+  "engines": {
+    "node": ">=20.0.0"
+  },
+  "author": "Ken",
+  "devDependencies": {
+    "@types/compression": "^1.7.2",
+    "@types/cors": "^2.8.12",
+    "@types/default-gateway": "^7.2.1",
+    "@types/express": "^4.17.13",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^20.8.7",
+    "@types/watchpack": "^2.4.3",
+    "@types/webpack": "^5.28.4",
+    "@types/webpack-bundle-analyzer": "^4.6.2",
+    "@types/webpack-hot-middleware": "^2.25.9",
+    "@types/webpack-sources": "^3.2.2",
+    "cross-env": "^7.0.3",
+    "esbuild": "^0.19.5",
+    "rimraf": "^5.0.5",
+    "tsc-alias": "^1.8.8"
+  },
+  "dependencies": {
+    "@module-federation/enhanced": "^0.1.12",
+    "@rspack/core": "0.6.4",
+    "@rspack/dev-server": "0.6.4",
+    "@swc/helpers": "^0.5.11",
+    "address": "^2.0.2",
+    "ansi-html-community": "^0.0.8",
+    "chalk": "^5.3.0",
+    "commander": "^11.1.0",
+    "compression": "^1.7.4",
+    "core-js": "^3.37.0",
+    "cors": "^2.8.5",
+    "default-gateway": "^7.2.2",
+    "express": "^4.18.2",
+    "fast-glob": "^3.3.1",
+    "fs-extra": "^11.2.0",
+    "gzip-size": "^7.0.0",
+    "html-webpack-plugin": "^5.6.0",
+    "less-loader": "^12.2.0",
+    "open": "^10.1.0",
+    "sass-loader": "^14.2.0",
+    "strip-ansi": "^7.1.0",
+    "typescript-plugin-css-modules": "^5.1.0",
+    "webpack-bundle-analyzer": "^4.10.2",
+    "webpack-chain": "^6.5.1"
+  }
+}