blackteay/fes.js
1
0
Fork 0
mirror of https://github.com/WeBankFinTech/fes.js.git synced 2025-04-05 11:18:54 +08:00
Code Issues Projects Releases Wiki Activity

feat: 升级 vite5 (#222)

Browse Source 
* feat: 升级 vite5

* fix: 优化 webpack publicPath

* fix: 优化文档

* chore: remove log

* chore: remove 无效代码
This commit is contained in:
qlin 2023-12-14 14:28:02 +08:00 committed by GitHub
parent fb54913109
commit fec7a8f1ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 3304 additions and 1241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.eslintrc.js
View File

@ -1,22 +0,0 @@
module.exports = {
extends: ['@webank/eslint-config-webank/vue.js'],
globals: {
// 这里填入你的项目需要的全局变量
// 这里值为 false 表示这个全局变量不允许被重新赋值，比如：
//
// Vue: false
__DEV__: false,
},
rules: {
'vue/comment-directive': 'off',
'global-require': 'off',
'import/no-unresolved': 'off',
'no-restricted-syntax': 'off',
'no-undefined': 'off',
'vue/valid-template-root': 'off',
'no-use-before-define': 'off',
},
env: {
jest: true,
},
};

2
.gitignore vendored
View File

@ -1,7 +1,5 @@
.DS_Store .DS_Store
.idea .idea
.git
.vscode
.history .history
.cache .cache
.temp .temp

4
.prettierrc.js
View File

@ -1,4 +0,0 @@
module.exports = {
// eslint-disable-next-line import/no-extraneous-dependencies, import/extensions
...require('@webank/eslint-config-webank/.prettierrc.js'),
};

48
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,48 @@
{
// Enable the ESlint flat config support
"eslint.experimental.useFlatConfig": true,
// Disable the default formatter, use eslint instead
"prettier.enable": false,
"editor.formatOnSave": false,
// Auto fix
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
},
// Silent the stylistic rules in you IDE, but still auto fix them
"eslint.rules.customizations": [
{ "rule": "style/*", "severity": "off" },
{ "rule": "*-indent", "severity": "off" },
{ "rule": "*-spacing", "severity": "off" },
{ "rule": "*-spaces", "severity": "off" },
{ "rule": "*-order", "severity": "off" },
{ "rule": "*-dangle", "severity": "off" },
{ "rule": "*-newline", "severity": "off" },
{ "rule": "*quotes", "severity": "off" },
{ "rule": "*semi", "severity": "off" }
],
// Enable eslint for all supported languages
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"vue",
"html",
"markdown",
"json",
"jsonc",
"yaml"
],
"pair-diff.patterns": [
{
"source": "./fixtures/output/**/*.*",
"target": "./fixtures/input/<base>"
}
]
}

2
build.config.js
View File

@ -1,4 +1,4 @@
module.exports = { export default {
pkgs: [ pkgs: [
'create-fes-app', 'create-fes-app',
'fes', 'fes',

5
docs/guide/upgrade3.md
View File

@ -4,11 +4,14 @@
1. 编译时的 [base](../reference/config/index.md/#base) 配置，移到了 [router.base](../reference/config/index.md/#router) 下。 1. 编译时的 [base](../reference/config/index.md/#base) 配置，移到了 [router.base](../reference/config/index.md/#router) 下。
2. [webpack-dev-server](https://github.com/webpack/webpack-dev-server) 从 `v3.x` 升级到了 `v4.x`，如果遇到配置不兼容，可以查看[webpack-dev-server 3.x 升级 4.x](https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md)。 2. [webpack-dev-server](https://github.com/webpack/webpack-dev-server) 从 `v3.x` 升级到了 `v4.x`，如果遇到配置不兼容，可以查看[webpack-dev-server 3.x 升级 4.x](https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md)。
3. [layout 插件](../reference/plugin/plugins/layout.md#_4-x-升级到-5-x) 有一些属性变更
3. [request 插件](../reference/plugin/plugins/request.md#_2-x-升级到-3-x) 有一些参数变更
## 继续使用 Webpack ## 继续使用 Webpack
1. 添加 Webpack 构建依赖包： `npm i @fesjs/builder-webpack -D`。 1. 添加 Webpack 构建依赖包： `npm i @fesjs/builder-webpack -D`。
2. 如果有，将 `public/index.html` 文件挪到项目根目录，移除 [html-webpack-plugin](https://github.com/jantimon/html-webpack-plugin) 相关配置，具体模版变量使用请查看[HTML 模版](../guide/template.html)。 2. 如果设置了 `publicPath: './'`，请更改为 `publicPath: ''`
3. 如果有，将 `public/index.html` 文件挪到项目根目录，移除 [html-webpack-plugin](https://github.com/jantimon/html-webpack-plugin) 相关配置，具体模版变量使用请查看[HTML 模版](../guide/template.html)。
## 换成 Vite ## 换成 Vite

19
docs/reference/plugin/plugins/request.md
View File

@ -31,12 +31,12 @@ export default defineRuntimeConfig({
dataHandler(data, response) { dataHandler(data, response) {
// 处理响应内容异常 // 处理响应内容异常
if (data.code !== '0') { if (data.code !== '0') {
if (data.code === '10000') { if (data.code === '10000')
FMesseage.error('hello world'); FMesseage.error('hello world');
}
if (data.code === '20000') { if (data.code === '20000')
FMesseage.error('hello world'); FMesseage.error('hello world');
}
throw new Error(response); throw new Error(response);
} }
// 响应数据格式化 // 响应数据格式化
@ -49,15 +49,18 @@ export default defineRuntimeConfig({
console.log(error.response.data); console.log(error.response.data);
console.log(error.response.status); console.log(error.response.status);
console.log(error.response.headers); console.log(error.response.headers);
} else if (error.request) { }
else if (error.request) {
// 请求已经成功发起，但没有收到响应 // 请求已经成功发起，但没有收到响应
// `error.request` 在浏览器中是 XMLHttpRequest 的实例， // `error.request` 在浏览器中是 XMLHttpRequest 的实例，
// 而在node.js中是 http.ClientRequest 的实例 // 而在node.js中是 http.ClientRequest 的实例
console.log(error.request); console.log(error.request);
} else if (error.type) { }
else if (error.type) {
// 插件异常 // 插件异常
console.log(error.msg); console.log(error.msg);
} else { }
else {
// 发送请求时出了点问题 // 发送请求时出了点问题
console.log('Error', error.message); console.log('Error', error.message);
} }
@ -192,4 +195,4 @@ export default {
1. 删除 dataField 配置，通过 dataHandler 实现类似功能，详情看上文案例 1. 删除 dataField 配置，通过 dataHandler 实现类似功能，详情看上文案例
2. errorHandler 改成了函数了，异常处理逻辑，查看上文案例 2. errorHandler 改成了函数了，异常处理逻辑，查看上文案例
3. 废弃 base 参数，用 baseURL 3. 废弃 base 参数，用 baseURL
4. 移除 skipErrorHandler 参数，直接传 errorHandler 可覆盖默认 errorHandler 4. 移除 skipErrorHandler 参数，目前还做了兼容，最好用 dataHandler 和 errorHandler 代替

20
eslint.config.js Normal file
View File

@ -0,0 +1,20 @@
// eslint.config.js
import antfu from '@antfu/eslint-config';
export default await antfu({
stylistic: {
indent: 4, // 4, or 'tab'
quotes: 'single', // or 'double'
semi: 'always',
},
typescript: true,
vue: true,
rules: {
'vue/block-order': [
'error',
{
order: ['template', 'script', 'style'],
},
],
},
});

14
package.json
View File

@ -7,6 +7,7 @@
"workspaces": [ "workspaces": [
"packages/*" "packages/*"
], ],
"type": "module",
"scripts": { "scripts": {
"bootstrap": "pnpm i", "bootstrap": "pnpm i",
"dev": "node scripts/build.mjs --watch", "dev": "node scripts/build.mjs --watch",
@ -37,16 +38,17 @@
"semver": "^7.3.6" "semver": "^7.3.6"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^2.1.1",
"@commitlint/cli": "^11.0.0", "@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0", "@commitlint/config-conventional": "^11.0.0",
"@webank/eslint-config-webank": "1.2.7",
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
"commitizen": "^4.3.0", "commitizen": "^4.3.0",
"cz-conventional-changelog": "^3.3.0", "cz-conventional-changelog": "^3.3.0",
"deepmerge": "^4.2.2", "deepmerge": "^4.2.2",
"eslint": "^8.54.0",
"fs-extra": "^11.1.1", "fs-extra": "^11.1.1",
"husky": "^8.0.3",
"lint-staged": "^13.2.0", "lint-staged": "^13.2.0",
"simple-git-hooks": "^2.9.0",
"typescript": "^5.0.4", "typescript": "^5.0.4",
"vitepress": "1.0.0-alpha.73", "vitepress": "1.0.0-alpha.73",
"vue": "^3.3.4", "vue": "^3.3.4",
@ -57,11 +59,9 @@
"npm run lint" "npm run lint"
] ]
}, },
"husky": { "simple-git-hooks": {
"hooks": { "pre-commit": "lint-staged",
"pre-commit": "lint-staged", "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
}, },
"config": { "config": {
"commitizen": { "commitizen": {

115
packages/fes-builder-vite/package.json
View File

@ -1,60 +1,59 @@
{ {
"name": "@fesjs/builder-vite", "name": "@fesjs/builder-vite",
"version": "3.0.4", "version": "3.0.4",
"description": "@fesjs/builder-vite", "description": "@fesjs/builder-vite",
"main": "lib/index.js", "author": "qlin",
"files": [ "license": "MIT",
"lib", "homepage": "https://github.com/WeBankFinTech/fes.js#readme",
"types.d.ts" "repository": {
], "type": "git",
"repository": { "url": "git+https://github.com/WeBankFinTech/fes.js.git",
"type": "git", "directory": "packages/fes-builder-vite"
"url": "git+https://github.com/WeBankFinTech/fes.js.git", },
"directory": "packages/fes-builder-vite" "bugs": {
}, "url": "https://github.com/WeBankFinTech/fes.js/issues"
"keywords": [ },
"fes" "keywords": [
], "fes"
"author": "qlin", ],
"license": "MIT", "main": "lib/index.js",
"bugs": { "files": [
"url": "https://github.com/WeBankFinTech/fes.js/issues" "lib",
}, "types.d.ts"
"homepage": "https://github.com/WeBankFinTech/fes.js#readme", ],
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
}, },
"dependencies": { "peerDependencies": {
"@babel/core": "^7.21.3", "@fesjs/fes": "^3.1.4",
"@fesjs/utils": "^3.0.1", "core-js": "^3.29.1"
"@vitejs/plugin-basic-ssl": "^1.0.1", },
"@vitejs/plugin-legacy": "^3.0.1", "dependencies": {
"@vitejs/plugin-vue": "^4.0.0", "@babel/core": "^7.23.3",
"@vitejs/plugin-vue-jsx": "^3.0.0", "@fesjs/utils": "^3.0.1",
"autoprefixer": "^10.4.4", "@rollup/pluginutils": "^5.1.0",
"babel-plugin-polyfill-corejs3": "^0.7.1", "@vitejs/plugin-basic-ssl": "^1.0.2",
"less": "^4.1.2", "@vitejs/plugin-legacy": "^5.2.0",
"postcss-flexbugs-fixes": "^5.0.2", "@vitejs/plugin-vue": "^4.5.0",
"postcss-safe-parser": "^6.0.0", "@vitejs/plugin-vue-jsx": "^3.1.0",
"rollup-plugin-visualizer": "^5.6.0", "autoprefixer": "^10.4.4",
"terser": "^5.16.8", "colorette": "^2.0.16",
"vite": "^4.2.1", "connect-history-api-fallback": "^2.0.0",
"@rollup/pluginutils": "^4.2.0", "consola": "^2.15.3",
"colorette": "^2.0.16", "dotenv": "^16.0.0",
"connect-history-api-fallback": "^2.0.0", "dotenv-expand": "^8.0.2",
"consola": "^2.15.3", "ejs": "^3.1.6",
"dotenv": "^16.0.0", "fast-glob": "^3.2.11",
"dotenv-expand": "^8.0.2", "fs-extra": "^10.0.1",
"ejs": "^3.1.6", "html-minifier-terser": "^6.1.0",
"fast-glob": "^3.2.11", "less": "^4.2.0",
"fs-extra": "^10.0.1", "node-html-parser": "^5.3.3",
"html-minifier-terser": "^6.1.0", "pathe": "^0.2.0",
"node-html-parser": "^5.3.3", "postcss-flexbugs-fixes": "^5.0.2",
"pathe": "^0.2.0" "postcss-safe-parser": "^6.0.0",
}, "rollup-plugin-visualizer": "^5.9.3",
"peerDependencies": { "terser": "^5.24.0",
"@fesjs/fes": "^3.1.4", "vite": "^5.0.3"
"core-js": "^3.29.1" },
}, "typings": "./types.d.ts"
"typings": "./types.d.ts"
} }

10
packages/fes-builder-vite/src/common/getConfig.js
View File

@ -1,5 +1,5 @@
import { join } from 'path'; import { join } from 'node:path';
import { existsSync } from 'fs'; import { existsSync } from 'node:fs';
import vue from '@vitejs/plugin-vue'; import vue from '@vitejs/plugin-vue';
import vueJsx from '@vitejs/plugin-vue-jsx'; import vueJsx from '@vitejs/plugin-vue-jsx';
import { createHtmlPlugin } from './vite-plugin-html'; import { createHtmlPlugin } from './vite-plugin-html';
@ -9,15 +9,15 @@ import getDefine from './getDefine';
function getPostcssConfig(api) { function getPostcssConfig(api) {
// TODO 支持其他 postcss 配置文件类型 // TODO 支持其他 postcss 配置文件类型
const configPath = `${api.paths.cwd}/postcss.config.js`; const configPath = `${api.paths.cwd}/postcss.config.js`;
if (existsSync(configPath)) { if (existsSync(configPath))
return require(`${api.paths.cwd}/postcss.config.js`); return require(`${api.paths.cwd}/postcss.config.js`);
}
return {}; return {};
} }
export function getInnerCommonConfig(api) { export function getInnerCommonConfig(api) {
const { deepmerge, resolveRuntimeEnv } = api.utils; const { deepmerge, resolveRuntimeEnv } = api.utils;
const { server, build, define, base, ...otherViteOption } = api.config.viteOption; const { base, ...otherViteOption } = api.config.viteOption;
const publicPath = base || api.config.publicPath || '/'; const publicPath = base || api.config.publicPath || '/';

6
packages/fes-builder-vite/src/common/getDefine.js
View File

@ -8,9 +8,13 @@ export default (api, publicPath) => {
...api.config.define, ...api.config.define,
...viteOption.define, ...viteOption.define,
}); });
const formatEnv = Object.keys(env).reduce((acc, cur) => {
acc[`process.env.${cur}`] = JSON.stringify(env[cur]);
return acc;
}, {});
return { return {
'process.env': env, ...formatEnv,
...define, ...define,
}; };
}; };

104
packages/fes-builder-vite/src/common/vite-plugin-html.js
View File

@ -1,7 +1,8 @@
import process from 'node:process';
import { render } from 'ejs'; import { render } from 'ejs';
import { expand } from 'dotenv-expand'; import { expand } from 'dotenv-expand';
import dotenv from 'dotenv'; import dotenv from 'dotenv';
import path, { join, dirname } from 'pathe'; import path, { dirname, join } from 'pathe';
import fse from 'fs-extra'; import fse from 'fs-extra';
import { normalizePath } from 'vite'; import { normalizePath } from 'vite';
import { parse } from 'node-html-parser'; import { parse } from 'node-html-parser';
@ -15,20 +16,18 @@ import history from './connectHistoryMiddleware';
function lookupFile(dir, formats, pathOnly = false) { function lookupFile(dir, formats, pathOnly = false) {
for (const format of formats) { for (const format of formats) {
const fullPath = join(dir, format); const fullPath = join(dir, format);
if (fse.pathExistsSync(fullPath) && fse.statSync(fullPath).isFile()) { if (fse.pathExistsSync(fullPath) && fse.statSync(fullPath).isFile())
return pathOnly ? fullPath : fse.readFileSync(fullPath, 'utf-8'); return pathOnly ? fullPath : fse.readFileSync(fullPath, 'utf-8');
}
} }
const parentDir = dirname(dir); const parentDir = dirname(dir);
if (parentDir !== dir) { if (parentDir !== dir)
return lookupFile(parentDir, formats, pathOnly); return lookupFile(parentDir, formats, pathOnly);
}
} }
function loadEnv(mode, envDir, prefix = '') { function loadEnv(mode, envDir, prefix = '') {
if (mode === 'local') { if (mode === 'local')
throw new Error(`"local" cannot be used as a mode name because it conflicts with the .local postfix for .env files.`); throw new Error(`"local" cannot be used as a mode name because it conflicts with the .local postfix for .env files.`);
}
const env = {}; const env = {};
const envFiles = [`.env.${mode}.local`, `.env.${mode}`, `.env.local`, `.env`]; const envFiles = [`.env.${mode}.local`, `.env.${mode}`, `.env.local`, `.env`];
for (const file of envFiles) { for (const file of envFiles) {
@ -40,11 +39,11 @@ function loadEnv(mode, envDir, prefix = '') {
ignoreProcessEnv: true, ignoreProcessEnv: true,
}); });
for (const [key, value] of Object.entries(parsed)) { for (const [key, value] of Object.entries(parsed)) {
if (key.startsWith(prefix) && env[key] === undefined) { if (key.startsWith(prefix) && env[key] === undefined)
env[key] = value; env[key] = value;
} else if (key === 'NODE_ENV') {
else if (key === 'NODE_ENV')
process.env.VITE_USER_NODE_ENV = value; process.env.VITE_USER_NODE_ENV = value;
}
} }
} }
} }
@ -52,7 +51,7 @@ function loadEnv(mode, envDir, prefix = '') {
} }
async function isDirEmpty(dir) { async function isDirEmpty(dir) {
return fse.readdir(dir).then((files) => files.length === 0); return fse.readdir(dir).then(files => files.length === 0);
} }
const DEFAULT_TEMPLATE = 'index.html'; const DEFAULT_TEMPLATE = 'index.html';
@ -65,7 +64,7 @@ function createPlugin(userOptions = {}) {
let env = {}; let env = {};
return { return {
name: 'vite:html', name: 'vite:html',
enforce: 'pre', order: 'pre',
configResolved(resolvedConfig) { configResolved(resolvedConfig) {
viteConfig = resolvedConfig; viteConfig = resolvedConfig;
env = loadEnv(viteConfig.mode, viteConfig.root, ''); env = loadEnv(viteConfig.mode, viteConfig.root, '');
@ -92,8 +91,9 @@ function createPlugin(userOptions = {}) {
filename, filename,
template: template2, template: template2,
}); });
} else { }
_pages = pages.map((page) => ({ else {
_pages = pages.map(page => ({
filename: page.filename || DEFAULT_TEMPLATE, filename: page.filename || DEFAULT_TEMPLATE,
template: page.template || DEFAULT_TEMPLATE, template: page.template || DEFAULT_TEMPLATE,
})); }));
@ -103,15 +103,15 @@ function createPlugin(userOptions = {}) {
const keys = Object.keys(proxy); const keys = Object.keys(proxy);
let indexPage = null; let indexPage = null;
for (const page of _pages) { for (const page of _pages) {
if (page.filename !== 'index.html') { if (page.filename !== 'index.html')
rewrites.push(createRewire(page.template, page, baseUrl, keys)); rewrites.push(createRewire(page.template, page, baseUrl, keys));
} else {
else
indexPage = page; indexPage = page;
}
} }
if (indexPage) { if (indexPage)
rewrites.push(createRewire('', indexPage, baseUrl, keys)); rewrites.push(createRewire('', indexPage, baseUrl, keys));
}
server.middlewares.use( server.middlewares.use(
history(viteConfig, { history(viteConfig, {
disableDotRule: undefined, disableDotRule: undefined,
@ -121,8 +121,8 @@ function createPlugin(userOptions = {}) {
); );
}, },
transformIndexHtml: { transformIndexHtml: {
enforce: 'pre', order: 'pre',
async transform(html, ctx) { async handler(html, ctx) {
const url = ctx.filename; const url = ctx.filename;
const base = viteConfig.base; const base = viteConfig.base;
const excludeBaseUrl = url.replace(base, '/'); const excludeBaseUrl = url.replace(base, '/');
@ -148,38 +148,36 @@ function createPlugin(userOptions = {}) {
if (isMpa(viteConfig) || pages.length) { if (isMpa(viteConfig) || pages.length) {
for (const page of pages) { for (const page of pages) {
const dir = path.dirname(page.template); const dir = path.dirname(page.template);
if (!ignoreDirs.includes(dir)) { if (!ignoreDirs.includes(dir))
outputDirs.push(dir); outputDirs.push(dir);
}
} }
} else { }
else {
const dir = path.dirname(template); const dir = path.dirname(template);
if (!ignoreDirs.includes(dir)) { if (!ignoreDirs.includes(dir))
outputDirs.push(dir); outputDirs.push(dir);
}
} }
const cwd = path.resolve(viteConfig.root, viteConfig.build.outDir); const cwd = path.resolve(viteConfig.root, viteConfig.build.outDir);
const htmlFiles = await fg( const htmlFiles = await fg(
outputDirs.map((dir) => `${dir}/*.html`), outputDirs.map(dir => `${dir}/*.html`),
{ cwd: path.resolve(cwd), absolute: true }, { cwd: path.resolve(cwd), absolute: true },
); );
await Promise.all( await Promise.all(
htmlFiles.map((file) => htmlFiles.map(file =>
fse.move(file, path.resolve(cwd, path.basename(file)), { fse.move(file, path.resolve(cwd, path.basename(file)), {
overwrite: true, overwrite: true,
}), }),
), ),
); );
const htmlDirs = await fg( const htmlDirs = await fg(
outputDirs.map((dir) => dir), outputDirs.map(dir => dir),
{ cwd: path.resolve(cwd), onlyDirectories: true, absolute: true }, { cwd: path.resolve(cwd), onlyDirectories: true, absolute: true },
); );
await Promise.all( await Promise.all(
htmlDirs.map(async (item) => { htmlDirs.map(async (item) => {
const isEmpty = await isDirEmpty(item); const isEmpty = await isDirEmpty(item);
if (isEmpty) { if (isEmpty)
return fse.remove(item); return fse.remove(item);
}
}), }),
); );
}, },
@ -189,7 +187,7 @@ function createPlugin(userOptions = {}) {
function createInput({ pages = [], template = DEFAULT_TEMPLATE }, viteConfig) { function createInput({ pages = [], template = DEFAULT_TEMPLATE }, viteConfig) {
const input = {}; const input = {};
if (isMpa(viteConfig) || pages?.length) { if (isMpa(viteConfig) || pages?.length) {
const templates = pages.map((page) => page.template); const templates = pages.map(page => page.template);
templates.forEach((temp) => { templates.forEach((temp) => {
let dirName = path.dirname(temp); let dirName = path.dirname(temp);
const file = path.basename(temp); const file = path.basename(temp);
@ -200,9 +198,9 @@ function createInput({ pages = [], template = DEFAULT_TEMPLATE }, viteConfig) {
return input; return input;
} }
const dir = path.dirname(template); const dir = path.dirname(template);
if (ignoreDirs.includes(dir)) { if (ignoreDirs.includes(dir))
return undefined; return undefined;
}
const file = path.basename(template); const file = path.basename(template);
const key = file.replace(/\.html/, ''); const key = file.replace(/\.html/, '');
return { return {
@ -229,11 +227,12 @@ async function renderHtml(html, config) {
function getPage({ pages = [], entry, template = DEFAULT_TEMPLATE, inject = {} }, name, viteConfig) { function getPage({ pages = [], entry, template = DEFAULT_TEMPLATE, inject = {} }, name, viteConfig) {
let page; let page;
if (isMpa(viteConfig) || pages?.length) { if (isMpa(viteConfig) || pages?.length)
page = getPageConfig(name, pages, DEFAULT_TEMPLATE); page = getPageConfig(name, pages, DEFAULT_TEMPLATE);
} else {
else
page = createSpaPage(entry, template, inject); page = createSpaPage(entry, template, inject);
}
return page; return page;
} }
@ -243,9 +242,9 @@ function isMpa(viteConfig) {
} }
function removeEntryScript(html, verbose = false) { function removeEntryScript(html, verbose = false) {
if (!html) { if (!html)
return html; return html;
}
const root = parse(html); const root = parse(html);
const scriptNodes = root.querySelectorAll('script[type=module]') || []; const scriptNodes = root.querySelectorAll('script[type=module]') || [];
const removedNode = []; const removedNode = [];
@ -253,9 +252,9 @@ function removeEntryScript(html, verbose = false) {
removedNode.push(item.toString()); removedNode.push(item.toString());
item.parentNode.removeChild(item); item.parentNode.removeChild(item);
}); });
verbose && verbose
removedNode.length && && removedNode.length
consola.warn(`vite-plugin-html: Since you have already configured entry, ${dim( && consola.warn(`vite-plugin-html: Since you have already configured entry, ${dim(
removedNode.toString(), removedNode.toString(),
)} is deleted. You may also delete it from the index.html. )} is deleted. You may also delete it from the index.html.
`); `);
@ -276,7 +275,7 @@ function getPageConfig(htmlName, pages, defaultPage) {
filename: defaultPage, filename: defaultPage,
template: `./${defaultPage}`, template: `./${defaultPage}`,
}; };
const page = pages.filter((page2) => path.resolve(`/${page2.template}`) === path.resolve(`/${htmlName}`))?.[0]; const page = pages.filter(page2 => path.resolve(`/${page2.template}`) === path.resolve(`/${htmlName}`))?.[0];
return page ?? defaultPageOption ?? undefined; return page ?? defaultPageOption ?? undefined;
} }
@ -287,10 +286,10 @@ function createRewire(reg, page, baseUrl, proxyUrlKeys) {
const pathname = parsedUrl.pathname; const pathname = parsedUrl.pathname;
const excludeBaseUrl = pathname.replace(baseUrl, '/'); const excludeBaseUrl = pathname.replace(baseUrl, '/');
const template = path.resolve(baseUrl, page.template); const template = path.resolve(baseUrl, page.template);
if (excludeBaseUrl === '/') { if (excludeBaseUrl === '/')
return template; return template;
}
const isApiUrl = proxyUrlKeys.some((item) => pathname.startsWith(path.resolve(baseUrl, item))); const isApiUrl = proxyUrlKeys.some(item => pathname.startsWith(path.resolve(baseUrl, item)));
return isApiUrl ? parsedUrl.path : template; return isApiUrl ? parsedUrl.path : template;
}, },
}; };
@ -312,13 +311,13 @@ function getOptions(_minify) {
} }
async function minifyHtml(html, minify$1) { async function minifyHtml(html, minify$1) {
if (typeof minify$1 === 'boolean' && !minify$1) { if (typeof minify$1 === 'boolean' && !minify$1)
return html; return html;
}
let minifyOptions = minify$1; let minifyOptions = minify$1;
if (typeof minify$1 === 'boolean' && minify$1) { if (typeof minify$1 === 'boolean' && minify$1)
minifyOptions = getOptions(minify$1); minifyOptions = getOptions(minify$1);
}
const res = await minify(html, minifyOptions); const res = await minify(html, minifyOptions);
return res; return res;
} }
@ -326,13 +325,12 @@ async function minifyHtml(html, minify$1) {
function createMinifyHtmlPlugin({ _minify = true } = {}) { function createMinifyHtmlPlugin({ _minify = true } = {}) {
return { return {
name: 'vite:minify-html', name: 'vite:minify-html',
enforce: 'post', order: 'post',
async generateBundle(_, outBundle) { async generateBundle(_, outBundle) {
if (_minify) { if (_minify) {
for (const bundle of Object.values(outBundle)) { for (const bundle of Object.values(outBundle)) {
if (bundle.type === 'asset' && htmlFilter(bundle.fileName) && typeof bundle.source === 'string') { if (bundle.type === 'asset' && htmlFilter(bundle.fileName) && typeof bundle.source === 'string')
bundle.source = await minifyHtml(bundle.source, _minify); bundle.source = await minifyHtml(bundle.source, _minify);
}
} }
} }
}, },

2
packages/fes-builder-webpack/package.json
View File

@ -62,7 +62,7 @@
"webpack": "^5.87.0", "webpack": "^5.87.0",
"webpack-5-chain": "^8.0.1", "webpack-5-chain": "^8.0.1",
"webpack-bundle-analyzer": "^4.4.0", "webpack-bundle-analyzer": "^4.4.0",
"webpack-dev-server": "^4.8.1", "webpack-dev-server": "^4.15.1",
"webpackbar": "^5.0.2" "webpackbar": "^5.0.2"
}, },
"peerDependencies": { "peerDependencies": {

25
packages/fes-builder-webpack/src/plugins/common/webpackConfig/index.js
View File

@ -1,5 +1,5 @@
import { join } from 'path'; import { join } from 'node:path';
import { existsSync } from 'fs'; import { existsSync } from 'node:fs';
import Config from 'webpack-5-chain'; import Config from 'webpack-5-chain';
import webpack from 'webpack'; import webpack from 'webpack';
import createCssWebpackConfig from './css'; import createCssWebpackConfig from './css';
@ -27,11 +27,10 @@ function genTranspileDepRegex(exclude) {
const deps = exclude.map((dep) => { const deps = exclude.map((dep) => {
if (typeof dep === 'string') { if (typeof dep === 'string') {
const depPath = join('node_modules', dep, '/'); const depPath = join('node_modules', dep, '/');
return /^win/.test(require('os').platform()) ? depPath.replace(/\\/g, '\\\\') : depPath; return require('node:os').platform().startsWith('win') ? depPath.replace(/\\/g, '\\\\') : depPath;
} }
if (dep instanceof RegExp) { if (dep instanceof RegExp)
return dep.source; return dep.source;
}
throw new Error('exclude only accepts an array of string or regular expressions'); throw new Error('exclude only accepts an array of string or regular expressions');
}); });
@ -76,7 +75,6 @@ export default async function getConfig({ api, cwd, config, env, entry = {}, mod
// --------------- output ----------- // --------------- output -----------
webpackConfig.output webpackConfig.output
.path(absoluteOutput) .path(absoluteOutput)
.publicPath(publicPath || '/')
.filename('static/[name].[contenthash:8].js') .filename('static/[name].[contenthash:8].js')
.chunkFilename('static/[name].[contenthash:8].chunk.js') .chunkFilename('static/[name].[contenthash:8].chunk.js')
.assetModuleFilename('static/[name][hash:8][ext]'); .assetModuleFilename('static/[name][hash:8][ext]');
@ -133,9 +131,9 @@ export default async function getConfig({ api, cwd, config, env, entry = {}, mod
.test(/\.(js|mjs|jsx|ts|tsx)$/) .test(/\.(js|mjs|jsx|ts|tsx)$/)
.exclude.add((filepath) => { .exclude.add((filepath) => {
// always transpile js in vue files // always transpile js in vue files
if (/(\.vue|\.jsx)$/.test(filepath)) { if (/(\.vue|\.jsx)$/.test(filepath))
return false; return false;
}
// Don't transpile node_modules // Don't transpile node_modules
return /node_modules/.test(filepath); return /node_modules/.test(filepath);
}) })
@ -153,9 +151,8 @@ export default async function getConfig({ api, cwd, config, env, entry = {}, mod
.include.add(/node_modules/) .include.add(/node_modules/)
.end() .end()
.exclude.add((filepath) => { .exclude.add((filepath) => {
if (transpileDepRegex && transpileDepRegex.test(filepath)) { if (transpileDepRegex && transpileDepRegex.test(filepath))
return true; return true;
}
return false; return false;
}) })
@ -195,12 +192,12 @@ export default async function getConfig({ api, cwd, config, env, entry = {}, mod
existsSync(join(cwd, 'public')) && { existsSync(join(cwd, 'public')) && {
from: join(cwd, 'public'), from: join(cwd, 'public'),
filter: (resourcePath) => { filter: (resourcePath) => {
if (resourcePath.indexOf('.DS_Store') !== -1) { if (resourcePath.includes('.DS_Store'))
return false; return false;
}
if (publicCopyIgnore.includes(resourcePath)) { if (publicCopyIgnore.includes(resourcePath))
return false; return false;
}
return true; return true;
}, },
to: absoluteOutput, to: absoluteOutput,

2
packages/fes-preset-built-in/src/plugins/features/publicPath.js
View File

@ -4,7 +4,7 @@ export default (api) => {
config: { config: {
default: '/', default: '/',
schema(joi) { schema(joi) {
return joi.string().regex(/\/$/).error(new Error('config.publicPath must end with /.')); return joi.string().allow('');
}, },
}, },
}); });

100
packages/fes-template-h5/package.json
View File

@ -1,52 +1,52 @@
{ {
"name": "@fesjs/template-h5", "name": "@fesjs/template-h5",
"version": "2.0.0", "version": "2.0.0",
"description": "fes 移动端项目模版", "private": true,
"scripts": { "description": "fes 移动端项目模版",
"prod": "FES_ENV=prod fes build", "author": "qlin",
"dev": "fes dev" "license": "MIT",
}, "homepage": "https://github.com/WeBankFinTech/fes.js#readme",
"keywords": [ "repository": {
"管理端", "type": "git",
"fes", "url": "git+https://github.com/WeBankFinTech/fes.js.git",
"fast", "directory": "packages/fes-template-h5"
"easy", },
"strong" "bugs": {
], "url": "https://github.com/WeBankFinTech/fes.js/issues"
"files": [ },
".eslintrc.js", "keywords": [
".gitignore", "管理端",
".fes.js", "fes",
".fes.prod.js", "fast",
"mock.js", "easy",
"package.json", "strong"
"README.md", ],
"tsconfig.json", "files": [
"/src", ".eslintrc.js",
"/config" ".fes.js",
], ".fes.prod.js",
"repository": { ".gitignore",
"type": "git", "/config",
"url": "git+https://github.com/WeBankFinTech/fes.js.git", "/src",
"directory": "packages/fes-template-h5" "README.md",
}, "mock.js",
"author": "qlin", "package.json",
"license": "MIT", "tsconfig.json"
"bugs": { ],
"url": "https://github.com/WeBankFinTech/fes.js/issues" "scripts": {
}, "prod": "FES_ENV=prod fes build",
"homepage": "https://github.com/WeBankFinTech/fes.js#readme", "dev": "fes dev"
"publishConfig": { },
"access": "public" "publishConfig": {
}, "access": "public"
"dependencies": { },
"postcss-px-to-viewport-8-plugin": "^1.2.3", "dependencies": {
"@fesjs/fes": "workspace:*", "@fesjs/builder-vite": "workspace:*",
"@fesjs/plugin-icon": "workspace:*", "@fesjs/fes": "workspace:*",
"@fesjs/plugin-request": "workspace:*", "@fesjs/plugin-icon": "workspace:*",
"@fesjs/builder-vite": "workspace:*", "@fesjs/plugin-request": "workspace:*",
"core-js": "^3.29.1", "core-js": "^3.29.1",
"vue": "^3.2.47" "postcss-px-to-viewport-8-plugin": "^1.2.3",
}, "vue": "^3.2.47"
"private": true }
} }

11
packages/fes-template-vite/.eslintrc.js
View File

@ -1,11 +0,0 @@
module.exports = {
extends: ['@webank/eslint-config-webank/vue.js'],
overrides: [
{
files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/**/*.spec.{j,t}s?(x)'],
},
],
env: {
jest: true,
},
};

2
packages/fes-template-vite/.fes.prod.js
View File

@ -1,6 +1,6 @@
import { defineBuildConfig } from '@fesjs/fes'; import { defineBuildConfig } from '@fesjs/fes';
export default defineBuildConfig({ export default defineBuildConfig({
builder: 'webpack', builder: 'vite',
publicPath: './', publicPath: './',
}); });

100
packages/fes-template-vite/package.json
View File

@ -1,66 +1,38 @@
{ {
"name": "@fesjs/template-vite", "name": "@fesjs/template-vite",
"version": "2.0.0", "version": "2.0.0",
"description": "fes项目模版", "private": true,
"scripts": { "description": "fes项目模版",
"build": "fes build", "author": "harrywan",
"prod": "FES_ENV=prod fes build", "license": "MIT",
"analyze": "ANALYZE=1 fes build", "scripts": {
"dev": "fes dev", "build": "fes build",
"test": "fes test" "prod": "FES_ENV=prod fes build",
}, "analyze": "ANALYZE=1 fes build",
"keywords": [ "dev": "fes dev",
"管理端", "test": "fes test"
"fes", },
"fast", "publishConfig": {
"easy", "access": "public"
"strong" },
], "dependencies": {
"files": [ "@fesjs/builder-vite": "workspace:*",
".eslintrc.js", "@fesjs/builder-webpack": "workspace:*",
".gitignore", "@fesjs/fes": "workspace:*",
".fes.js", "@fesjs/fes-design": "^0.8.0",
".fes.prod.js", "@fesjs/plugin-access": "workspace:*",
"mock.js", "@fesjs/plugin-enums": "workspace:*",
"package.json", "@fesjs/plugin-icon": "workspace:*",
"README.md", "@fesjs/plugin-jest": "workspace:*",
"tsconfig.json", "@fesjs/plugin-layout": "workspace:*",
"/src", "@fesjs/plugin-locale": "workspace:*",
"/config" "@fesjs/plugin-model": "workspace:*",
], "@fesjs/plugin-monaco-editor": "workspace:*",
"repository": { "@fesjs/plugin-pinia": "workspace:*",
"type": "git", "@fesjs/plugin-request": "workspace:*",
"url": "git+https://github.com/WeBankFinTech/fes.js.git", "@fesjs/plugin-sass": "workspace:*",
"directory": "packages/fes-template" "core-js": "^3.29.1",
}, "pinia": "^2.0.11",
"author": "harrywan", "vue": "^3.2.47"
"license": "MIT", }
"bugs": {
"url": "https://github.com/WeBankFinTech/fes.js/issues"
},
"homepage": "https://github.com/WeBankFinTech/fes.js#readme",
"publishConfig": {
"access": "public"
},
"dependencies": {
"@fesjs/builder-vite": "workspace:*",
"@fesjs/builder-webpack": "workspace:*",
"@fesjs/fes": "workspace:*",
"@fesjs/fes-design": "^0.8.0",
"@fesjs/plugin-access": "workspace:*",
"@fesjs/plugin-enums": "workspace:*",
"@fesjs/plugin-icon": "workspace:*",
"@fesjs/plugin-jest": "workspace:*",
"@fesjs/plugin-layout": "workspace:*",
"@fesjs/plugin-locale": "workspace:*",
"@fesjs/plugin-model": "workspace:*",
"@fesjs/plugin-monaco-editor": "workspace:*",
"@fesjs/plugin-pinia": "workspace:*",
"@fesjs/plugin-request": "workspace:*",
"@fesjs/plugin-sass": "workspace:*",
"core-js": "^3.29.1",
"pinia": "^2.0.11",
"vue": "^3.2.47"
},
"private": true
} }

1
packages/fes-template-vite/src/app.jsx
View File

@ -25,7 +25,6 @@ export const beforeRender = {
export const layout = { export const layout = {
logo: `${process.env.BASE_URL}wine-outline.svg`, logo: `${process.env.BASE_URL}wine-outline.svg`,
renderCustom: (props) => { renderCustom: (props) => {
console.log(props);
return <UserCenter />; return <UserCenter />;
}, },
}; };

8
packages/fes-template-vite/src/pages/menuTest/@id.vue → packages/fes-template-vite/src/pages/menuTest/[id].vue
View File

@ -1,13 +1,15 @@
<template> <template>
<div class="page"> <div class="page">
menuTest: {{route.params}} menuTest: {{ route.params }}
</div> </div>
</template> </template>
<config> <config>
{ {
"title": "menuTest-详情" "title": "menuTest-详情"
} }
</config> </config>
<script> <script>
import { useRoute } from '@fesjs/fes'; import { useRoute } from '@fesjs/fes';
@ -17,9 +19,9 @@ export default {
setup() { setup() {
const route = useRoute(); const route = useRoute();
return { return {
route route,
}; };
} },
}; };
</script> </script>

20
packages/fes-template-vite/src/pages/route/@id.vue → packages/fes-template-vite/src/pages/route/[id].vue
View File

@ -1,14 +1,9 @@
<template> <template>
<div> <div>
{{params.id}} {{ params.id }}
</div> </div>
</template> </template>
<config>
{
"name": "activeRoute",
"title": "动态路由"
}
</config>
<script> <script>
import { useRoute } from '@fesjs/fes'; import { useRoute } from '@fesjs/fes';
@ -16,8 +11,15 @@ export default {
setup() { setup() {
const { params } = useRoute(); const { params } = useRoute();
return { return {
params params,
}; };
} },
}; };
</script> </script>
<config>
{
"name": "activeRoute",
"title": "动态路由"
}
</config>

11
packages/fes-template/.eslintrc.js
View File

@ -1,11 +0,0 @@
module.exports = {
extends: ['@webank/eslint-config-webank/vue.js'],
overrides: [
{
files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/**/*.spec.{j,t}s?(x)'],
},
],
env: {
jest: true,
},
};

1
packages/fes-template/.fes.js
View File

@ -1,6 +1,7 @@
import { defineBuildConfig } from '@fesjs/fes'; import { defineBuildConfig } from '@fesjs/fes';
export default defineBuildConfig({ export default defineBuildConfig({
publicPath: '',
targets: { targets: {
chrome: '78', chrome: '78',
}, },

108
packages/fes-template/package.json
View File

@ -1,70 +1,42 @@
{ {
"name": "@fesjs/template", "name": "@fesjs/template",
"version": "2.0.0", "version": "2.0.0",
"description": "fes项目模版", "private": true,
"scripts": { "description": "fes项目模版",
"build": "fes build", "author": "harrywan",
"prod": "FES_ENV=prod fes build", "license": "MIT",
"analyze": "ANALYZE=1 fes build", "scripts": {
"dev": "fes dev", "build": "fes build",
"test": "fes test", "prod": "FES_ENV=prod fes build",
"prev": "fes preview" "analyze": "ANALYZE=1 fes build",
}, "dev": "fes dev",
"keywords": [ "test": "fes test",
"管理端", "prev": "fes preview"
"fes", },
"fast", "publishConfig": {
"easy", "access": "public"
"strong" },
], "dependencies": {
"files": [ "@fesjs/builder-webpack": "workspace:*",
".eslintrc.js", "@fesjs/fes": "workspace:*",
".gitignore", "@fesjs/fes-design": "^0.8.0",
".fes.js", "@fesjs/plugin-access": "workspace:*",
".fes.prod.js", "@fesjs/plugin-enums": "workspace:*",
"mock.js", "@fesjs/plugin-jest": "workspace:*",
"package.json", "@fesjs/plugin-layout": "workspace:*",
"README.md", "@fesjs/plugin-locale": "workspace:*",
"tsconfig.json", "@fesjs/plugin-login": "workspace:*",
"/src", "@fesjs/plugin-model": "workspace:*",
"/config" "@fesjs/plugin-monaco-editor": "workspace:*",
], "@fesjs/plugin-pinia": "workspace:*",
"repository": { "@fesjs/plugin-qiankun": "workspace:*",
"type": "git", "@fesjs/plugin-request": "workspace:*",
"url": "git+https://github.com/WeBankFinTech/fes.js.git", "@fesjs/plugin-sass": "workspace:*",
"directory": "packages/fes-template" "@fesjs/plugin-swc": "workspace:*",
}, "@fesjs/plugin-watermark": "workspace:*",
"author": "harrywan", "@fesjs/plugin-windicss": "workspace:*",
"license": "MIT", "core-js": "3.29.1",
"bugs": { "pinia": "^2.0.33",
"url": "https://github.com/WeBankFinTech/fes.js/issues" "vue": "^3.2.47"
}, }
"homepage": "https://github.com/WeBankFinTech/fes.js#readme",
"publishConfig": {
"access": "public"
},
"dependencies": {
"@fesjs/fes": "workspace:*",
"@fesjs/builder-webpack": "workspace:*",
"@fesjs/plugin-login": "workspace:*",
"@fesjs/plugin-access": "workspace:*",
"@fesjs/plugin-enums": "workspace:*",
"@fesjs/plugin-jest": "workspace:*",
"@fesjs/plugin-layout": "workspace:*",
"@fesjs/plugin-locale": "workspace:*",
"@fesjs/plugin-model": "workspace:*",
"@fesjs/plugin-monaco-editor": "workspace:*",
"@fesjs/plugin-pinia": "workspace:*",
"@fesjs/plugin-qiankun": "workspace:*",
"@fesjs/plugin-request": "workspace:*",
"@fesjs/plugin-sass": "workspace:*",
"@fesjs/plugin-watermark": "workspace:*",
"@fesjs/plugin-windicss": "workspace:*",
"@fesjs/plugin-swc": "workspace:*",
"@fesjs/fes-design": "^0.8.0",
"core-js": "3.29.1",
"pinia": "^2.0.33",
"vue": "^3.2.47"
},
"private": true
} }

14
packages/fes/src/cli.js
View File

@ -1,4 +1,5 @@
import { chalk, yParser, semver } from '@fesjs/utils'; import process from 'node:process';
import { chalk, semver, yParser } from '@fesjs/utils';
import fesPkg from '../package.json'; import fesPkg from '../package.json';
import { Service } from './serviceWithBuiltIn'; import { Service } from './serviceWithBuiltIn';
import fork from './utils/fork'; import fork from './utils/fork';
@ -10,6 +11,7 @@ const requiredVersion = fesPkg.engines.node;
function checkNodeVersion(wanted, id) { function checkNodeVersion(wanted, id) {
if (!semver.satisfies(process.version, wanted, { includePrerelease: true })) { if (!semver.satisfies(process.version, wanted, { includePrerelease: true })) {
// eslint-disable-next-line no-console
console.log(chalk.red(`You are using Node ${process.version}, but this version of ${id} requires Node ${wanted}.\nPlease upgrade your Node version.`)); console.log(chalk.red(`You are using Node ${process.version}, but this version of ${id} requires Node ${wanted}.\nPlease upgrade your Node version.`));
process.exit(1); process.exit(1);
} }
@ -37,11 +39,12 @@ const args = yParser(rawArgv);
child.kill('SIGTERM'); child.kill('SIGTERM');
process.exit(1); process.exit(1);
}); });
} else { }
else {
hackFesInBuild(); hackFesInBuild();
if (command === 'build') { if (command === 'build')
process.env.NODE_ENV = 'production'; process.env.NODE_ENV = 'production';
}
await new Service({ await new Service({
cwd: getCwd(), cwd: getCwd(),
pkg: getPkg(process.cwd()), pkg: getPkg(process.cwd()),
@ -51,7 +54,8 @@ const args = yParser(rawArgv);
rawArgv, rawArgv,
}); });
} }
} catch (e) { }
catch (e) {
console.error(chalk.red(e.message)); console.error(chalk.red(e.message));
console.error(e.stack); console.error(e.stack);
process.exit(1); process.exit(1);

21
packages/fes/src/utils/fork.js
View File

@ -1,11 +1,12 @@
import { fork } from 'child_process'; import { fork } from 'node:child_process';
import process from 'node:process';
const usedPorts = []; const usedPorts = [];
let CURRENT_PORT; let CURRENT_PORT;
export default function start({ scriptPath }) { export default function start({ scriptPath }) {
const execArgv = process.execArgv.slice(0); const execArgv = process.execArgv.slice(0);
const inspectArgvIndex = execArgv.findIndex((argv) => argv.includes('--inspect-brk')); const inspectArgvIndex = execArgv.findIndex(argv => argv.includes('--inspect-brk'));
if (inspectArgvIndex > -1) { if (inspectArgvIndex > -1) {
const inspectArgv = execArgv[inspectArgvIndex]; const inspectArgv = execArgv[inspectArgvIndex];
@ -15,13 +16,14 @@ export default function start({ scriptPath }) {
inspectArgv.replace(/--inspect-brk=(.*)/, (match, s1) => { inspectArgv.replace(/--inspect-brk=(.*)/, (match, s1) => {
let port; let port;
try { try {
port = parseInt(s1, 10) + 1; port = Number.parseInt(s1, 10) + 1;
} catch (e) { }
catch (e) {
port = 9230; // node default inspect port plus 1. port = 9230; // node default inspect port plus 1.
} }
if (usedPorts.includes(port)) { if (usedPorts.includes(port))
port += 1; port += 1;
}
usedPorts.push(port); usedPorts.push(port);
return `--inspect-brk=${port}`; return `--inspect-brk=${port}`;
}), }),
@ -29,10 +31,8 @@ export default function start({ scriptPath }) {
} }
// set port to env when current port has value // set port to env when current port has value
if (CURRENT_PORT) { if (CURRENT_PORT)
// @ts-ignore
process.env.PORT = CURRENT_PORT; process.env.PORT = CURRENT_PORT;
}
const child = fork(scriptPath, process.argv.slice(2), { const child = fork(scriptPath, process.argv.slice(2), {
execArgv, execArgv,
@ -45,7 +45,8 @@ export default function start({ scriptPath }) {
start({ start({
scriptPath, scriptPath,
}); });
} else if (type === 'UPDATE_PORT') { }
else if (type === 'UPDATE_PORT') {
// set current used port // set current used port
CURRENT_PORT = data.port; CURRENT_PORT = data.port;
} }

3564
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

51
scripts/build.mjs
View File

@ -1,9 +1,6 @@
/* eslint-disable import/extensions */ import path from 'node:path';
// 关闭 import 规则 import process from 'node:process';
/* eslint import/no-extraneous-dependencies: 0 */ import fs from 'node:fs';
import path from 'path';
import fs from 'fs';
import fse from 'fs-extra'; import fse from 'fs-extra';
import chalk from 'chalk'; import chalk from 'chalk';
import merge from 'deepmerge'; import merge from 'deepmerge';
@ -50,29 +47,28 @@ function getPkgSourcePath(pkgName) {
} }
function getOutputPath(config, pkgName) { function getOutputPath(config, pkgName) {
if (config.target === 'browser') { if (config.target === 'browser')
return path.join(getPkgPath(pkgName), ESM_OUTPUT_DIR); return path.join(getPkgPath(pkgName), ESM_OUTPUT_DIR);
}
return path.join(getPkgPath(pkgName), NODE_CJS_OUTPUT_DIR); return path.join(getPkgPath(pkgName), NODE_CJS_OUTPUT_DIR);
} }
function getGlobalConfig() { function getGlobalConfig() {
if (fs.existsSync(GLOBAL_CONFIG_PATH)) { if (fs.existsSync(GLOBAL_CONFIG_PATH))
return merge(DEFAULT_CONFIG, buildConfig); return merge(DEFAULT_CONFIG, buildConfig);
}
return DEFAULT_CONFIG; return DEFAULT_CONFIG;
} }
async function getPkgConfig(config, pkgName) { async function getPkgConfig(config, pkgName) {
const pkgConfigPath = path.join(getPkgPath(pkgName), CONFIG_FILE_NAME); const pkgConfigPath = path.join(getPkgPath(pkgName), CONFIG_FILE_NAME);
if (argv.watch) { if (argv.watch)
config.sourceMap = true; config.sourceMap = true;
}
if (fs.existsSync(pkgConfigPath)) { if (fs.existsSync(pkgConfigPath)) {
const content = await import(process.platform === 'win32' ? `file://${pkgConfigPath}` : pkgConfigPath); const content = await import(process.platform === 'win32' ? `file://${pkgConfigPath}` : pkgConfigPath);
const result = merge(config, content.default); const result = merge(config, content.default);
result.resolveCopy = result.copy.map((item) => path.join(getPkgPath(pkgName), 'src', item)); result.resolveCopy = result.copy.map(item => path.join(getPkgPath(pkgName), 'src', item));
return result; return result;
} }
@ -81,9 +77,9 @@ async function getPkgConfig(config, pkgName) {
function getNeedCompilerPkg(config) { function getNeedCompilerPkg(config) {
// 用户通过 cli 指定的包，优先级最高 // 用户通过 cli 指定的包，优先级最高
if (argv.pkg) { if (argv.pkg)
return Array.isArray(argv.pkg) ? argv.pkg : argv.pkg; return Array.isArray(argv.pkg) ? argv.pkg : argv.pkg;
}
// 默认编译所有 packages // 默认编译所有 packages
if (!config.pkgs?.length) { if (!config.pkgs?.length) {
const pkgs = fs.readdirSync(PACKAGE_PATH); const pkgs = fs.readdirSync(PACKAGE_PATH);
@ -111,18 +107,20 @@ function transformFile(filePath, outputPath, config, log) {
try { try {
const code = fs.readFileSync(filePath, 'utf-8'); const code = fs.readFileSync(filePath, 'utf-8');
const shortFilePath = genShortPath(filePath); const shortFilePath = genShortPath(filePath);
if (config.sourceMap) { if (config.sourceMap)
config.sourceFileName = filePath; config.sourceFileName = filePath;
}
const transformedCode = compiler(code, config); const transformedCode = compiler(code, config);
const type = config.target === 'browser' ? ESM_OUTPUT_DIR : NODE_CJS_OUTPUT_DIR; const type = config.target === 'browser' ? ESM_OUTPUT_DIR : NODE_CJS_OUTPUT_DIR;
log(`Transform to ${type} for ${config.target === 'browser' ? chalk.yellow(shortFilePath) : chalk.blue(shortFilePath)}`); log(`Transform to ${type} for ${config.target === 'browser' ? chalk.yellow(shortFilePath) : chalk.blue(shortFilePath)}`);
fse.outputFileSync(outputPath, transformedCode); fse.outputFileSync(outputPath, transformedCode);
} catch (error) { }
catch (error) {
console.error(error); console.error(error);
} }
} else { }
else {
fse.copySync(filePath, outputPath); fse.copySync(filePath, outputPath);
} }
} }
@ -135,10 +133,12 @@ function compilerPkg(codeDir, outputDir, config, log) {
const fileStats = fs.lstatSync(filePath); const fileStats = fs.lstatSync(filePath);
if (config.copy.includes(file)) { if (config.copy.includes(file)) {
fse.copySync(filePath, outputFilePath); fse.copySync(filePath, outputFilePath);
} else if (fileStats.isDirectory(filePath) && !/__tests__/.test(file)) { }
else if (fileStats.isDirectory(filePath) && !/__tests__/.test(file)) {
fse.ensureDirSync(outputFilePath); fse.ensureDirSync(outputFilePath);
compilerPkg(filePath, outputFilePath, config, log); compilerPkg(filePath, outputFilePath, config, log);
} else if (fileStats.isFile(filePath)) { }
else if (fileStats.isFile(filePath)) {
transformFile(filePath, outputFilePath, config, log); transformFile(filePath, outputFilePath, config, log);
} }
}); });
@ -155,13 +155,14 @@ function watchFile(dir, outputDir, config, log) {
const outputPath = changeFile.replace(dir, outputDir); const outputPath = changeFile.replace(dir, outputDir);
const stat = fs.lstatSync(changeFile); const stat = fs.lstatSync(changeFile);
log(`[${event}] ${shortChangeFile}`); log(`[${event}] ${shortChangeFile}`);
if (config.resolveCopy?.some((item) => changeFile.startsWith(item))) { if (config.resolveCopy?.some(item => changeFile.startsWith(item)))
fse.copySync(changeFile, outputPath); fse.copySync(changeFile, outputPath);
} else if (stat.isFile()) {
else if (stat.isFile())
transformFile(changeFile, outputPath, config, log); transformFile(changeFile, outputPath, config, log);
} else if (stat.isDirectory()) {
else if (stat.isDirectory())
compilerPkg(changeFile, outputPath, config); compilerPkg(changeFile, outputPath, config);
}
}); });
} }

10
scripts/compiler.mjs
View File

@ -15,7 +15,7 @@ function transformNodeCode(code, config) {
'@babel/preset-env', '@babel/preset-env',
{ {
modules: 'cjs', modules: 'cjs',
targets: { node: '12' }, targets: { node: '16' },
}, },
], ],
], ],
@ -42,11 +42,11 @@ function transformBrowserCode(code) {
} }
export default function compiler(code, config) { export default function compiler(code, config) {
if (!config.target || config.target === 'node') { if (!config.target || config.target === 'node')
return transformNodeCode(code, config); return transformNodeCode(code, config);
}
if (config.target === 'browser') { if (config.target === 'browser')
return transformBrowserCode(code); return transformBrowserCode(code);
}
throw new Error(`config target error: ${config.target}, only can use 'node' and 'browser'`); throw new Error(`config target error: ${config.target}, only can use 'node' and 'browser'`);
} }

6
scripts/randomColor.mjs
View File

@ -25,11 +25,11 @@ export default function (pkg) {
const color = colors[index]; const color = colors[index];
const str = chalk[color].bold(pkg); const str = chalk[color].bold(pkg);
cache[pkg] = str; cache[pkg] = str;
if (index === colors.length - 1) { if (index === colors.length - 1)
index = 0; index = 0;
} else {
else
index += 1; index += 1;
}
} }
return cache[pkg]; return cache[pkg];
} }

111
scripts/release.mjs
View File

@ -1,13 +1,13 @@
import fs from 'fs'; import fs from 'node:fs';
import * as url from 'url'; import process from 'node:process';
import path from 'path'; import * as url from 'node:url';
import path from 'node:path';
import minimist from 'minimist'; import minimist from 'minimist';
import chalk from 'chalk'; import chalk from 'chalk';
import semver from 'semver'; import semver from 'semver';
import enquirer from 'enquirer'; import enquirer from 'enquirer';
import { execa } from 'execa'; import { execa } from 'execa';
// eslint-disable-next-line import/extensions
import buildConfig from '../build.config.js'; import buildConfig from '../build.config.js';
const { prompt } = enquirer; const { prompt } = enquirer;
@ -18,39 +18,39 @@ const packages = buildConfig.pkgs;
const versionIncrements = ['patch', 'minor', 'major', 'prepatch', 'preminor', 'premajor', 'prerelease']; const versionIncrements = ['patch', 'minor', 'major', 'prepatch', 'preminor', 'premajor', 'prerelease'];
const incVersion = (version, i) => { function incVersion(version, i) {
let _preId = preId || semver.prerelease(version)?.[0]; let _preId = preId || semver.prerelease(version)?.[0];
if (!_preId && /pre/.test(i)) { if (!_preId && /pre/.test(i))
_preId = 'beta'; _preId = 'beta';
}
return semver.inc(version, i, _preId); return semver.inc(version, i, _preId);
}; }
const autoIncVersion = (version) => { function autoIncVersion(version) {
if (version.includes('-')) { if (version.includes('-'))
return semver.inc(version, 'prerelease'); return semver.inc(version, 'prerelease');
}
return semver.inc(version, 'patch'); return semver.inc(version, 'patch');
}; }
const run = (bin, args, opts = {}) => execa(bin, args, { stdio: 'inherit', ...opts }); const run = (bin, args, opts = {}) => execa(bin, args, { stdio: 'inherit', ...opts });
const dryRun = (bin, args, opts = {}) => console.log(chalk.blue(`[dryrun] ${bin} ${args.join(' ')}`), opts); const dryRun = (bin, args, opts = {}) => console.log(chalk.blue(`[dryrun] ${bin} ${args.join(' ')}`), opts);
const runIfNotDry = isDryRun ? dryRun : run; const runIfNotDry = isDryRun ? dryRun : run;
const getPkgRoot = (pkg) => path.resolve(__dirname, `../packages/${pkg}`); const getPkgRoot = pkg => path.resolve(__dirname, `../packages/${pkg}`);
const step = (msg) => console.log(chalk.cyan(msg)); const step = msg => console.log(chalk.cyan(msg));
const arrToObj = (arr, key) => function arrToObj(arr, key) {
arr.reduce((acc, cur) => { return arr.reduce((acc, cur) => {
acc[cur[key]] = cur; acc[cur[key]] = cur;
return acc; return acc;
}, {}); }, {});
}
// eslint-disable-next-line no-shadow
async function publishPackage(pkg, runIfNotDry) { async function publishPackage(pkg, runIfNotDry) {
step(`Publishing ${pkg.name}...`); step(`Publishing ${pkg.name}...`);
try { try {
let _releaseTag; let _releaseTag;
if (pkg.newVersion.includes('-')) { if (pkg.newVersion.includes('-'))
_releaseTag = 'next'; _releaseTag = 'next';
}
await runIfNotDry( await runIfNotDry(
// note: use of pnpm is intentional here as we rely on its publishing // note: use of pnpm is intentional here as we rely on its publishing
// behavior. // behavior.
@ -62,12 +62,13 @@ async function publishPackage(pkg, runIfNotDry) {
}, },
); );
console.log('Successfully published :', chalk.green(`${pkg.name}@${pkg.newVersion}`)); console.log('Successfully published :', chalk.green(`${pkg.name}@${pkg.newVersion}`));
} catch (e) { }
if (e.stderr.match(/previously published/)) { catch (e) {
if (e.stderr.match(/previously published/))
console.log(chalk.red(`Skipping already published: ${pkg.name}`)); console.log(chalk.red(`Skipping already published: ${pkg.name}`));
} else {
else
throw e; throw e;
}
} }
} }
@ -78,7 +79,7 @@ function readPackageJson(pkg) {
function writePackageJson(pkg, content) { function writePackageJson(pkg, content) {
const pkgPath = getPkgRoot(pkg); const pkgPath = getPkgRoot(pkg);
fs.writeFileSync(path.join(pkgPath, 'package.json'), `${JSON.stringify(content, null, 2)}\n`); fs.writeFileSync(path.join(pkgPath, 'package.json'), `${JSON.stringify(content, null, 4)}\n`);
} }
function readPackageVersionAndName(pkg) { function readPackageVersionAndName(pkg) {
@ -92,18 +93,16 @@ function readPackageVersionAndName(pkg) {
function updatePackage(pkgName, version, pkgs) { function updatePackage(pkgName, version, pkgs) {
const pkgJson = readPackageJson(pkgName); const pkgJson = readPackageJson(pkgName);
pkgJson.version = version; pkgJson.version = version;
pkgJson.dependencies && pkgJson.dependencies
Object.keys(pkgJson.dependencies).forEach((npmName) => { && Object.keys(pkgJson.dependencies).forEach((npmName) => {
if (pkgs[npmName]) { if (pkgs[npmName])
pkgJson.dependencies[npmName] = `^${pkgs[npmName].newVersion}`; pkgJson.dependencies[npmName] = `^${pkgs[npmName].newVersion}`;
} });
}); pkgJson.peerDependencies
pkgJson.peerDependencies && && Object.keys(pkgJson.peerDependencies).forEach((npmName) => {
Object.keys(pkgJson.peerDependencies).forEach((npmName) => { if (pkgs[npmName])
if (pkgs[npmName]) { pkgJson.peerDependencies[npmName] = `^${pkgs[npmName].newVersion}`;
pkgJson.peerDependencies[npmName] = `^${pkgs[npmName].newVersion}`; });
}
});
writePackageJson(pkgName, pkgJson); writePackageJson(pkgName, pkgJson);
} }
@ -111,20 +110,20 @@ function updateRootVersion(newRootVersion) {
const pkgPath = path.resolve(path.resolve(__dirname, '..'), 'package.json'); const pkgPath = path.resolve(path.resolve(__dirname, '..'), 'package.json');
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8')); const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
pkg.version = newRootVersion; pkg.version = newRootVersion;
fs.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`); fs.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 4)}\n`);
} }
function updateVersions(packagesVersion) { function updateVersions(packagesVersion) {
const pkgs = arrToObj(packagesVersion, 'name'); const pkgs = arrToObj(packagesVersion, 'name');
packagesVersion.forEach((p) => updatePackage(p.dirName, p.newVersion, pkgs)); packagesVersion.forEach(p => updatePackage(p.dirName, p.newVersion, pkgs));
} }
const isChangeInCurrentTag = async (pkg, newestTag) => { async function isChangeInCurrentTag(pkg, newestTag) {
const { stdout: pkgDiffContent } = await run('git', ['diff', newestTag, `packages/${pkg}`], { stdio: 'pipe' }); const { stdout: pkgDiffContent } = await run('git', ['diff', newestTag, `packages/${pkg}`], { stdio: 'pipe' });
return !!pkgDiffContent; return !!pkgDiffContent;
}; }
const filterChangedPackages = async () => { async function filterChangedPackages() {
const { stdout: newestTag } = await run('git', ['describe', '--abbrev=0', '--tags'], { stdio: 'pipe' }); const { stdout: newestTag } = await run('git', ['describe', '--abbrev=0', '--tags'], { stdio: 'pipe' });
const results = await Promise.all( const results = await Promise.all(
@ -135,7 +134,7 @@ const filterChangedPackages = async () => {
); );
return packages.filter((_v, index) => results[index]); return packages.filter((_v, index) => results[index]);
}; }
async function createPackageNewVersion(name, version) { async function createPackageNewVersion(name, version) {
// no explicit version, offer suggestions // no explicit version, offer suggestions
@ -143,7 +142,7 @@ async function createPackageNewVersion(name, version) {
type: 'select', type: 'select',
name: 'release', name: 'release',
message: `Select release type: ${name}`, message: `Select release type: ${name}`,
choices: versionIncrements.map((i) => `${i} (${incVersion(version, i)})`).concat(['custom']), choices: versionIncrements.map(i => `${i} (${incVersion(version, i)})`).concat(['custom']),
}); });
let newVersion; let newVersion;
@ -156,7 +155,8 @@ async function createPackageNewVersion(name, version) {
initial: version, initial: version,
}) })
).version; ).version;
} else { }
else {
newVersion = release.match(/\((.*)\)/)[1]; newVersion = release.match(/\((.*)\)/)[1];
} }
@ -176,7 +176,7 @@ async function genRootPackageVersion() {
} }
function genOtherPkgsVersion(packagesVersion) { function genOtherPkgsVersion(packagesVersion) {
const noChangedPkgs = packages.filter((name) => !packagesVersion.find((item) => item.dirName === name)); const noChangedPkgs = packages.filter(name => !packagesVersion.find(item => item.dirName === name));
const pkgs = arrToObj(packagesVersion, 'name'); const pkgs = arrToObj(packagesVersion, 'name');
const result = []; const result = [];
noChangedPkgs.forEach((currentPkg) => { noChangedPkgs.forEach((currentPkg) => {
@ -234,13 +234,12 @@ async function main() {
type: 'confirm', type: 'confirm',
name: 'yes', name: 'yes',
message: `These packages will be released: \n${packagesVersion message: `These packages will be released: \n${packagesVersion
.map((pkg) => `${chalk.magenta(pkg.name)}: v${pkg.version} > ${chalk.green(`v${pkg.newVersion}`)}`) .map(pkg => `${chalk.magenta(pkg.name)}: v${pkg.version} > ${chalk.green(`v${pkg.newVersion}`)}`)
.join('\n')}\nConfirm?`, .join('\n')}\nConfirm?`,
}); });
if (!yes) { if (!yes)
return; return;
}
const newRootVersion = await genRootPackageVersion(); const newRootVersion = await genRootPackageVersion();
@ -253,11 +252,11 @@ async function main() {
await run('pnpm', ['i']); await run('pnpm', ['i']);
// // build all packages with types // // build all packages with types
step('\nBuilding all packages...'); step('\nBuilding all packages...');
if (!isDryRun) { if (!isDryRun)
await run('pnpm', ['build']); await run('pnpm', ['build']);
} else {
else
console.log(`(skipped build)`); console.log(`(skipped build)`);
}
// generate changelog // generate changelog
step('\nGenerating changelog...'); step('\nGenerating changelog...');
@ -268,15 +267,15 @@ async function main() {
step('\nCommitting changes...'); step('\nCommitting changes...');
await runIfNotDry('git', ['add', '-A']); await runIfNotDry('git', ['add', '-A']);
await runIfNotDry('git', ['commit', '-m', `chore: v${newRootVersion}`]); await runIfNotDry('git', ['commit', '-m', `chore: v${newRootVersion}`]);
} else { }
else {
console.log('No changes to commit.'); console.log('No changes to commit.');
} }
// publish packages // publish packages
step('\nPublishing packages...'); step('\nPublishing packages...');
for (const pkg of packagesVersion) { for (const pkg of packagesVersion)
await publishPackage(pkg, runIfNotDry); await publishPackage(pkg, runIfNotDry);
}
// push to GitHub // push to GitHub
step('\nPushing to GitHub...'); step('\nPushing to GitHub...');
@ -284,9 +283,9 @@ async function main() {
await runIfNotDry('git', ['push', 'origin', `refs/tags/v${newRootVersion}`]); await runIfNotDry('git', ['push', 'origin', `refs/tags/v${newRootVersion}`]);
await runIfNotDry('git', ['push']); await runIfNotDry('git', ['push']);
if (isDryRun) { if (isDryRun)
console.log(`\nDry run finished - run git diff to see package changes.`); console.log(`\nDry run finished - run git diff to see package changes.`);
}
console.log(); console.log();
} }