From 91a3c285bc9a7e55f9d2382450912c18eb9a46e9 Mon Sep 17 00:00:00 2001 From: liaoyu Date: Fri, 10 Jan 2025 14:20:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=93=E5=8D=B0=20dev=20server=20?= =?UTF-8?q?=E5=8F=AF=E8=AE=BF=E9=97=AE=20url=20(#178)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- npm-shrinkwrap.json | 17 +++++++++-------- package.json | 8 +++++--- src/bin.ts | 6 ++++-- src/serve.ts | 7 ++++--- src/webpack/swc.ts | 4 ++-- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index ab4a3f4..79e1727 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "fec-builder", - "version": "2.7.1", + "version": "2.7.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "fec-builder", - "version": "2.7.1", + "version": "2.7.2", "license": "Apache-2.0", "dependencies": { "@babel/core": "^7.12.3", @@ -39,6 +39,7 @@ "log4js": "^6.3.0", "mini-css-extract-plugin": "^1.3.9", "mustache": "^4.2.0", + "picocolors": "^1.1.1", "postcss-loader": "^4.3.0", "postcss-preset-env": "~7.2.3", "qiniu": "^7.3.2", @@ -10632,9 +10633,9 @@ "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" }, "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "node_modules/picomatch": { "version": "2.2.2", @@ -24678,9 +24679,9 @@ "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" }, "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "picomatch": { "version": "2.2.2", diff --git a/package.json b/package.json index 83c8698..a1b9b5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fec-builder", - "version": "2.7.1", + "version": "2.7.2", "bin": { "fec-builder": "./lib/bin.js" }, @@ -8,7 +8,8 @@ "dev": "ts-node ./src/bin.ts -r ./samples/typescript-react", "build": "rm -rf lib && tsc && chmod +x lib/bin.js", "build-config-doc": "ts-node src/schema2md.ts", - "prepublishOnly": "npm run build" + "prepublishOnly": "npm run build", + "lint": "tsc --noEmit" }, "engines": { "node": ">=12" @@ -44,6 +45,7 @@ "log4js": "^6.3.0", "mini-css-extract-plugin": "^1.3.9", "mustache": "^4.2.0", + "picocolors": "^1.1.1", "postcss-loader": "^4.3.0", "postcss-preset-env": "~7.2.3", "qiniu": "^7.3.2", @@ -78,6 +80,6 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/Front-End-Engineering-Cloud/builder.git" + "url": "https://github.com/qiniu/builder.git" } } diff --git a/src/bin.ts b/src/bin.ts index 2bddb9f..168b7a1 100644 --- a/src/bin.ts +++ b/src/bin.ts @@ -8,6 +8,8 @@ import { Env, setEnv } from './utils/build-env' import logger from './utils/logger' import { setNeedAnalyze } from './utils/build-conf' +const packageInfo = require('../package.json') + // 禁掉 auto freeze，否则有的插件改数据时会异常， // 比如 postcss-loader 会去 delete options 上的 plugins 字段； // 详情见 https://immerjs.github.io/immer/docs/freezing @@ -155,8 +157,8 @@ Object.entries(commands).forEach(([name, { desc, handler, isDefault }]) => { }) }) -// enable --version -parser.version() +parser + .version(packageInfo.version).alias('v', 'version') // enable --version .help('h').alias('h', 'help') .locale('en') .argv diff --git a/src/serve.ts b/src/serve.ts index ed0bf21..ee48ec4 100644 --- a/src/serve.ts +++ b/src/serve.ts @@ -13,6 +13,7 @@ import { getPageFilename, getPathFromUrl, logLifecycle, watchFile } from './util import { getConfigForDevServer } from './webpack' import { BuildConfig, DevProxy, findBuildConfig, watchBuildConfig } from './utils/build-conf' import { entries, mapValues } from 'lodash' +import colors from 'picocolors' import { abs } from './utils/paths' // 业务项目的配置文件，变更时需要重启 server @@ -55,6 +56,7 @@ async function runDevServer(port: number) { const webpackConfig = await getConfigForDevServer() logger.debug('webpack config:', webpackConfig) + const host = '0.0.0.0' const devServerConfig: WebpackDevServer.Configuration = { hotOnly: true, // 方便开发调试 @@ -64,7 +66,7 @@ async function runDevServer(port: number) { // 从而正确地建立 hot module replace 依赖的 ws 链接及其它请求，逻辑见： // 这里之所以要求使用页面的 window.location 信息，是因为 builder 在容器中 serve 时端口会被转发， // 即可能配置 port 为 80，在（宿主机）浏览器中通过 8080 端口访问 - public: '0.0.0.0:0', + public: `${host}:0`, publicPath: getPathFromUrl(buildConfig.publicUrl), stats: 'errors-only', proxy: getProxyConfig(buildConfig.devProxy), @@ -81,9 +83,8 @@ async function runDevServer(port: number) { }) }) - const host = '0.0.0.0' server.listen(port, host, () => { - logger.info(`Server started on ${host}:${port}`) + logger.info(`Server started on ${colors.cyan(`http://localhost:${port}`)}`) }) return () => new Promise(resolve => { diff --git a/src/webpack/swc.ts b/src/webpack/swc.ts index 9dff917..e6529d1 100644 --- a/src/webpack/swc.ts +++ b/src/webpack/swc.ts @@ -7,7 +7,7 @@ import { mergeWith } from 'lodash' import { parse } from 'jsonc-parser' import { shouldAddGlobalPolyfill, AddPolyfill } from '../utils/build-conf' -import { getBuildRoot } from '../utils/paths' +import { abs, getBuildRoot } from '../utils/paths' /** 读取 tsconfig.json 文件获取 compilerOptions 配置 */ function getTsCompilerOptions(): CompilerOptions | null { @@ -78,7 +78,7 @@ function transformTsCompilerOptions(options: CompilerOptions | null): SwcOptions }, }, paths, - baseUrl + ...(baseUrl && { baseUrl: abs(baseUrl) }) } } }