From 40d8332030ce92ddfb41340e46a7687ea9c26e80 Mon Sep 17 00:00:00 2001 From: winixt Date: Tue, 29 Mar 2022 16:25:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=96=B0=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-build-vite/package.json | 3 +- .../{ => commands}/SFCConfigBlockPlugin.js | 0 .../src/commands/build/index.js | 3 + .../src/{dev.js => commands/dev/index.js} | 39 ++++-- .../fes-build-vite/src/common/getConfig.js | 3 + packages/fes-build-vite/src/index.js | 11 ++ packages/fes-build-webpack/src/index.js | 3 + .../src/plugins/commands/build/index.js | 7 +- .../src/plugins/commands/buildDevUtils.js | 8 +- .../src/plugins/commands/dev/index.js | 88 ++----------- .../src/plugins/registerMethods.js | 14 ++ .../src/utils/generateFiles.js | 53 -------- .../src/utils/getAppEntryPath.js | 13 -- .../generateFiles/core/plugin/index.js | 4 +- .../src/plugins/registerMethods.js | 16 +-- .../src/plugins/watch/watchMode.js | 123 ++++++++++++++++++ .../src/plugins/watch}/watchPkg.js | 0 packages/fes-utils/src/changePort.js | 6 + packages/fes-utils/src/generateFiles.js | 55 -------- .../src/{getAppEntryPath.js => getAppPath.js} | 0 packages/fes-utils/src/getHostName.js | 1 + packages/fes-utils/src/getPort.js | 8 ++ packages/fes-utils/src/index.js | 12 +- packages/fes/types.d.ts | 1 + 24 files changed, 239 insertions(+), 232 deletions(-) rename packages/fes-build-vite/src/{ => commands}/SFCConfigBlockPlugin.js (100%) create mode 100644 packages/fes-build-vite/src/commands/build/index.js rename packages/fes-build-vite/src/{dev.js => commands/dev/index.js} (61%) create mode 100644 packages/fes-build-vite/src/common/getConfig.js create mode 100644 packages/fes-build-vite/src/index.js create mode 100644 packages/fes-build-webpack/src/plugins/registerMethods.js delete mode 100644 packages/fes-build-webpack/src/utils/generateFiles.js delete mode 100644 packages/fes-build-webpack/src/utils/getAppEntryPath.js create mode 100644 packages/fes-preset-built-in/src/plugins/watch/watchMode.js rename packages/{fes-build-webpack/src/plugins/commands/dev => fes-preset-built-in/src/plugins/watch}/watchPkg.js (100%) create mode 100644 packages/fes-utils/src/changePort.js delete mode 100644 packages/fes-utils/src/generateFiles.js rename packages/fes-utils/src/{getAppEntryPath.js => getAppPath.js} (100%) create mode 100644 packages/fes-utils/src/getHostName.js create mode 100644 packages/fes-utils/src/getPort.js diff --git a/packages/fes-build-vite/package.json b/packages/fes-build-vite/package.json index 43a3e321..435258e2 100644 --- a/packages/fes-build-vite/package.json +++ b/packages/fes-build-vite/package.json @@ -1,9 +1,8 @@ { "name": "@fesjs/build-vite", - "version": "2.0.22", + "version": "1.0.0", "description": "@fesjs/build-vite", "main": "lib/index.js", - "types": "lib/index.d.ts", "files": [ "lib" ], diff --git a/packages/fes-build-vite/src/SFCConfigBlockPlugin.js b/packages/fes-build-vite/src/commands/SFCConfigBlockPlugin.js similarity index 100% rename from packages/fes-build-vite/src/SFCConfigBlockPlugin.js rename to packages/fes-build-vite/src/commands/SFCConfigBlockPlugin.js diff --git a/packages/fes-build-vite/src/commands/build/index.js b/packages/fes-build-vite/src/commands/build/index.js new file mode 100644 index 00000000..e8d5ab21 --- /dev/null +++ b/packages/fes-build-vite/src/commands/build/index.js @@ -0,0 +1,3 @@ +export default (api) => { + console.log(api, 'TODO: 实现 vite build'); +}; diff --git a/packages/fes-build-vite/src/dev.js b/packages/fes-build-vite/src/commands/dev/index.js similarity index 61% rename from packages/fes-build-vite/src/dev.js rename to packages/fes-build-vite/src/commands/dev/index.js index 1ac5693b..64053964 100644 --- a/packages/fes-build-vite/src/dev.js +++ b/packages/fes-build-vite/src/commands/dev/index.js @@ -1,21 +1,28 @@ import { createServer } from 'vite'; import vue from '@vitejs/plugin-vue'; import vueJsx from '@vitejs/plugin-vue-jsx'; -import SFCConfigBlockPlugin from './SFCConfigBlockPlugin'; +import SFCConfigBlockPlugin from '../SFCConfigBlockPlugin'; + +/** + * TODO + * 支持 https + * 如何处理 html + * dev 模式 port、https、css modules等能力和 webpack 对齐 + * proxy + * createRouteMiddleware 能力 + * 确认 mock mountElementId 能用 + * 其他插件如何对内部配置进行修改 + */ export default (api) => { const { paths, - utils: { chalk }, + utils: { chalk, rimraf, getPort, changePort, getHostName }, } = api; - const unwatchs = []; let server; function destroy() { - for (const unwatch of unwatchs) { - unwatch(); - } server?.close(); } @@ -32,7 +39,21 @@ export default (api) => { description: 'whether to turn on the https service', }, ], - async fn() { + async fn({ args = {} }) { + rimraf.sync(paths.absTmpPath); + + const port = await getPort(args.port || api.config.viteOption?.server?.port); + changePort(port); + + const hostname = getHostName(api.config.viteOption?.server?.host); + + await api.applyPlugins({ + key: 'onGenerateFiles', + type: api.ApplyPluginsType.event, + }); + + api.startWatch(); + server = await createServer({ mode: 'development', plugins: [vue(), SFCConfigBlockPlugin, vueJsx()], @@ -45,7 +66,9 @@ export default (api) => { }, }, server: { - port: 8000, + port, + host: hostname, + https: process.env.HTTPS || args.https, }, }); await server.listen(); diff --git a/packages/fes-build-vite/src/common/getConfig.js b/packages/fes-build-vite/src/common/getConfig.js new file mode 100644 index 00000000..84120a31 --- /dev/null +++ b/packages/fes-build-vite/src/common/getConfig.js @@ -0,0 +1,3 @@ +export function getConfig() { + return {}; +} diff --git a/packages/fes-build-vite/src/index.js b/packages/fes-build-vite/src/index.js new file mode 100644 index 00000000..31925908 --- /dev/null +++ b/packages/fes-build-vite/src/index.js @@ -0,0 +1,11 @@ +export default function () { + return { + plugins: [ + // bundle configs + + // commands + require.resolve('./commands/build'), + require.resolve('./commands/dev'), + ], + }; +} diff --git a/packages/fes-build-webpack/src/index.js b/packages/fes-build-webpack/src/index.js index 77fbf200..c32a4062 100644 --- a/packages/fes-build-webpack/src/index.js +++ b/packages/fes-build-webpack/src/index.js @@ -1,6 +1,9 @@ export default function () { return { plugins: [ + // register methods + require.resolve('./plugins/registerMethods'), + // bundle configs require.resolve('./plugins/features/alias'), require.resolve('./plugins/features/analyze'), diff --git a/packages/fes-build-webpack/src/plugins/commands/build/index.js b/packages/fes-build-webpack/src/plugins/commands/build/index.js index ffdf5a29..4475c0ce 100644 --- a/packages/fes-build-webpack/src/plugins/commands/build/index.js +++ b/packages/fes-build-webpack/src/plugins/commands/build/index.js @@ -12,7 +12,7 @@ const logger = new Logger('fes:build-webpack'); export default function (api) { const { paths, - utils: { rimraf, generateFiles }, + utils: { rimraf }, } = api; api.registerCommand({ @@ -27,7 +27,10 @@ export default function (api) { }); // generate files - await generateFiles({ api, watch: false }); + await api.applyPlugins({ + key: 'onGenerateFiles', + type: api.ApplyPluginsType.event, + }); // build const { bundleConfig } = await getBundleAndConfigs({ api }); diff --git a/packages/fes-build-webpack/src/plugins/commands/buildDevUtils.js b/packages/fes-build-webpack/src/plugins/commands/buildDevUtils.js index f235fa7b..dc95bb1c 100644 --- a/packages/fes-build-webpack/src/plugins/commands/buildDevUtils.js +++ b/packages/fes-build-webpack/src/plugins/commands/buildDevUtils.js @@ -4,7 +4,7 @@ */ import { join, resolve } from 'path'; -import { existsSync, readdirSync, readFileSync } from 'fs'; +import { existsSync, readFileSync } from 'fs'; import { rimraf, chalk } from '@fesjs/utils'; import zlib from 'zlib'; import getConfig from './webpackConfig'; @@ -75,11 +75,7 @@ export async function getBundleAndConfigs({ api }) { } export function cleanTmpPathExceptCache({ absTmpPath }) { - if (!existsSync(absTmpPath)) return; - readdirSync(absTmpPath).forEach((file) => { - if (file === '.cache') return; - rimraf.sync(join(absTmpPath, file)); - }); + rimraf.sync(absTmpPath); } // These sizes are pretty large. We'll warn for bundles exceeding them. diff --git a/packages/fes-build-webpack/src/plugins/commands/dev/index.js b/packages/fes-build-webpack/src/plugins/commands/dev/index.js index 432ceb6f..d1985bc6 100644 --- a/packages/fes-build-webpack/src/plugins/commands/dev/index.js +++ b/packages/fes-build-webpack/src/plugins/commands/dev/index.js @@ -6,7 +6,7 @@ export default (api) => { const { paths, - utils: { chalk, portfinder, generateFiles }, + utils: { chalk, getPort, getHostName, changePort }, } = api; const unwatchs = []; @@ -37,18 +37,12 @@ export default (api) => { async fn({ args = {} }) { const { cleanTmpPathExceptCache, getBundleAndConfigs } = require('../buildDevUtils'); const createRouteMiddleware = require('./createRouteMiddleware').default; - const { watchPkg } = require('./watchPkg'); - const defaultPort = process.env.PORT || args.port || api.config.devServer?.port; - port = await portfinder.getPortPromise({ - port: defaultPort ? parseInt(String(defaultPort), 10) : 8000, - }); - hostname = process.env.HOST || api.config.devServer?.host || 'localhost'; + console.log(args.port || api.config.devServer?.port); + port = await getPort(args.port || api.config.devServer?.port); + changePort(port); - process.send({ - type: 'UPDATE_PORT', - port, - }); + hostname = getHostName(api.config.devServer?.host); // enable https const isHTTPS = process.env.HTTPS || args.https; @@ -58,77 +52,13 @@ export default (api) => { cleanTmpPathExceptCache({ absTmpPath: paths.absTmpPath, }); - const watch = process.env.WATCH !== 'none'; - // generate files - const unwatchGenerateFiles = await generateFiles({ - api, - watch, + await api.applyPlugins({ + key: 'onGenerateFiles', + type: api.ApplyPluginsType.event, }); - if (unwatchGenerateFiles) unwatchs.push(unwatchGenerateFiles); - if (watch) { - // watch pkg changes - const unwatchPkg = watchPkg({ - cwd: api.cwd, - onChange() { - console.log(); - api.logger.info('Plugins in package.json changed.'); - api.restartServer(); - }, - }); - unwatchs.push(unwatchPkg); - - // watch config change - const unwatchConfig = api.service.configInstance.watch({ - userConfig: api.service.userConfig, - onChange: async ({ pluginChanged, valueChanged }) => { - if (pluginChanged.length) { - console.log(); - api.logger.info(`Plugins of ${pluginChanged.map((p) => p.key).join(', ')} changed.`); - api.restartServer(); - } - if (valueChanged.length) { - let reload = false; - let regenerateTmpFiles = false; - const fns = []; - const reloadConfigs = []; - valueChanged.forEach(({ key, pluginId }) => { - const { onChange } = api.service.plugins[pluginId].config || {}; - if (onChange === api.ConfigChangeType.regenerateTmpFiles) { - regenerateTmpFiles = true; - } - if (!onChange || onChange === api.ConfigChangeType.reload) { - reload = true; - reloadConfigs.push(key); - } - if (typeof onChange === 'function') { - fns.push(onChange); - } - }); - - if (reload) { - console.log(); - api.logger.info(`Config ${reloadConfigs.join(', ')} changed.`); - api.restartServer(); - } else { - api.service.userConfig = api.service.configInstance.getUserConfig(); - - await api.setConfig(); - - if (regenerateTmpFiles) { - await generateFiles({ - api, - }); - } else { - fns.forEach((fn) => fn()); - } - } - } - }, - }); - unwatchs.push(unwatchConfig); - } + api.startWatch(); // dev const { bundleConfig } = await getBundleAndConfigs({ api }); diff --git a/packages/fes-build-webpack/src/plugins/registerMethods.js b/packages/fes-build-webpack/src/plugins/registerMethods.js new file mode 100644 index 00000000..b262fba1 --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/registerMethods.js @@ -0,0 +1,14 @@ +export default function (api) { + [ + 'addHTMLHeadScripts', + 'addMiddlewares', + 'modifyBundleConfigOpts', + 'modifyBundleConfig', + 'modifyBabelOpts', + 'modifyBabelPresetOpts', + 'chainWebpack', + 'modifyPublicPathStr', + ].forEach((name) => { + api.registerMethod({ name }); + }); +} diff --git a/packages/fes-build-webpack/src/utils/generateFiles.js b/packages/fes-build-webpack/src/utils/generateFiles.js deleted file mode 100644 index 49b436d0..00000000 --- a/packages/fes-build-webpack/src/utils/generateFiles.js +++ /dev/null @@ -1,53 +0,0 @@ -import { chokidar, lodash, winPath } from '@fesjs/utils'; -import { getAppPath } from './getAppEntryPath'; - -export default async ({ api, watch }) => { - const { paths } = api; - - async function generate() { - api.logger.debug('generate files'); - await api.applyPlugins({ - key: 'onGenerateFiles', - type: api.ApplyPluginsType.event, - }); - } - - let watchers = []; - - await generate(); - - function unwatch() { - watchers.forEach((watcher) => { - watcher.close(); - }); - watchers = []; - } - - function createWatcher(path) { - const watcher = chokidar.watch(path, { - // ignore .dotfiles and _mock.js - ignored: /(^|[/\\])(_mock.js$|\..)/, - ignoreInitial: true, - }); - watcher.on( - 'all', - lodash.throttle(async () => { - await generate(); - }, 100), - ); - watchers.push(watcher); - } - - if (watch) { - const watcherPaths = await api.applyPlugins({ - key: 'addTmpGenerateWatcherPaths', - type: api.ApplyPluginsType.add, - initialValue: [paths.absPagesPath, getAppPath(paths.absSrcPath)], - }); - lodash.uniq(watcherPaths.map((p) => winPath(p))).forEach((p) => { - createWatcher(p); - }); - } - - return unwatch; -}; diff --git a/packages/fes-build-webpack/src/utils/getAppEntryPath.js b/packages/fes-build-webpack/src/utils/getAppEntryPath.js deleted file mode 100644 index 191033a7..00000000 --- a/packages/fes-build-webpack/src/utils/getAppEntryPath.js +++ /dev/null @@ -1,13 +0,0 @@ -import { join } from 'path'; -import { existsSync } from 'fs'; -import { winPath } from '@fesjs/utils'; - -export function getAppPath(absSrcPath) { - for (const suffix of ['.js', '.ts', '.jsm', '.jsx', '.tsx']) { - const p = winPath(join(absSrcPath, `app${suffix}`)); - if (existsSync(p)) { - return p; - } - } - return null; -} diff --git a/packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js b/packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js index bbe64a36..29eee282 100644 --- a/packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js +++ b/packages/fes-preset-built-in/src/plugins/generateFiles/core/plugin/index.js @@ -6,7 +6,7 @@ import { runtimePath } from '../../../../utils/constants'; export default function (api) { const { paths, - utils: { Mustache, getAppEntryPath }, + utils: { Mustache, getAppPath }, } = api; const absoluteFilePath = 'core/plugin.js'; @@ -36,7 +36,7 @@ export default function (api) { const plugins = await api.applyPlugins({ key: 'addRuntimePlugin', type: api.ApplyPluginsType.add, - initialValue: [getAppEntryPath(paths.absSrcPath)].filter(Boolean), + initialValue: [getAppPath(paths.absSrcPath)].filter(Boolean), }); api.writeTmpFile({ path: absoluteFilePath, diff --git a/packages/fes-preset-built-in/src/plugins/registerMethods.js b/packages/fes-preset-built-in/src/plugins/registerMethods.js index cd7de0ad..0341398c 100644 --- a/packages/fes-preset-built-in/src/plugins/registerMethods.js +++ b/packages/fes-preset-built-in/src/plugins/registerMethods.js @@ -1,6 +1,7 @@ import assert from 'assert'; import { dirname, join } from 'path'; import { existsSync, statSync, readFileSync, writeFileSync, copyFileSync } from 'fs'; +import { startWatch } from './watch/watchMode'; export default function (api) { [ @@ -21,14 +22,6 @@ export default function (api) { 'addTmpGenerateWatcherPaths', 'addBeforeMiddlewares', - 'addHTMLHeadScripts', - 'addMiddlewares', - 'modifyBundleConfigOpts', - 'modifyBundleConfig', - 'modifyBabelOpts', - 'modifyBabelPresetOpts', - 'chainWebpack', - 'modifyPublicPathStr', ].forEach((name) => { api.registerMethod({ name }); }); @@ -73,4 +66,11 @@ export default function (api) { }); }, }); + + api.registerMethod({ + name: 'startWatch', + fn() { + startWatch(api); + }, + }); } diff --git a/packages/fes-preset-built-in/src/plugins/watch/watchMode.js b/packages/fes-preset-built-in/src/plugins/watch/watchMode.js new file mode 100644 index 00000000..14aa30b4 --- /dev/null +++ b/packages/fes-preset-built-in/src/plugins/watch/watchMode.js @@ -0,0 +1,123 @@ +import { chokidar, winPath, lodash, getAppPath } from '@fesjs/utils'; +import { watchPkg } from './watchPkg'; + +async function generateWhenFilesChange({ api }) { + const { paths } = api; + + let watchers = []; + + function unwatch() { + watchers.forEach((watcher) => { + watcher.close(); + }); + watchers = []; + } + + function createWatcher(path) { + const watcher = chokidar.watch(path, { + // ignore .dotfiles and _mock.js + ignored: /(^|[/\\])(_mock.js$|\..)/, + ignoreInitial: true, + }); + watcher.on( + 'all', + lodash.throttle(async () => { + await api.applyPlugins({ + key: 'onGenerateFiles', + type: api.ApplyPluginsType.event, + }); + }, 100), + ); + watchers.push(watcher); + } + + const watcherPaths = await api.applyPlugins({ + key: 'addTmpGenerateWatcherPaths', + type: api.ApplyPluginsType.add, + initialValue: [paths.absPagesPath, getAppPath(paths.absSrcPath)], + }); + lodash.uniq(watcherPaths.map((p) => winPath(p))).forEach((p) => { + createWatcher(p); + }); + + return unwatch; +} + +export async function startWatch(api) { + if (process.env.WATCH === 'none') return; + + let unwatchs = []; + const destroy = () => { + for (const unwatch of unwatchs) { + unwatch(); + } + unwatchs = []; + api.restartServer(); + }; + + // generate files + const unwatchGenerateFiles = await generateWhenFilesChange({ api }); + unwatchs.push(unwatchGenerateFiles); + + // watch pkg changes + const unwatchPkg = watchPkg({ + cwd: api.cwd, + onChange() { + console.log(); + api.logger.info('Plugins in package.json changed.'); + destroy(); + }, + }); + unwatchs.push(unwatchPkg); + + // watch config change + const unwatchConfig = api.service.configInstance.watch({ + userConfig: api.service.userConfig, + onChange: async ({ pluginChanged, valueChanged }) => { + if (pluginChanged.length) { + console.log(); + api.logger.info(`Plugins of ${pluginChanged.map((p) => p.key).join(', ')} changed.`); + destroy(); + } + if (valueChanged.length) { + let reload = false; + let regenerateTmpFiles = false; + const fns = []; + const reloadConfigs = []; + valueChanged.forEach(({ key, pluginId }) => { + const { onChange } = api.service.plugins[pluginId].config || {}; + if (onChange === api.ConfigChangeType.regenerateTmpFiles) { + regenerateTmpFiles = true; + } + if (!onChange || onChange === api.ConfigChangeType.reload) { + reload = true; + reloadConfigs.push(key); + } + if (typeof onChange === 'function') { + fns.push(onChange); + } + }); + + if (reload) { + console.log(); + api.logger.info(`Config ${reloadConfigs.join(', ')} changed.`); + destroy(); + } else { + api.service.userConfig = api.service.configInstance.getUserConfig(); + + await api.setConfig(); + + if (regenerateTmpFiles) { + await api.applyPlugins({ + key: 'onGenerateFiles', + type: api.ApplyPluginsType.event, + }); + } else { + fns.forEach((fn) => fn()); + } + } + } + }, + }); + unwatchs.push(unwatchConfig); +} diff --git a/packages/fes-build-webpack/src/plugins/commands/dev/watchPkg.js b/packages/fes-preset-built-in/src/plugins/watch/watchPkg.js similarity index 100% rename from packages/fes-build-webpack/src/plugins/commands/dev/watchPkg.js rename to packages/fes-preset-built-in/src/plugins/watch/watchPkg.js diff --git a/packages/fes-utils/src/changePort.js b/packages/fes-utils/src/changePort.js new file mode 100644 index 00000000..16600f24 --- /dev/null +++ b/packages/fes-utils/src/changePort.js @@ -0,0 +1,6 @@ +export default (port) => { + process.send({ + type: 'UPDATE_PORT', + port, + }); +}; diff --git a/packages/fes-utils/src/generateFiles.js b/packages/fes-utils/src/generateFiles.js deleted file mode 100644 index 6348779a..00000000 --- a/packages/fes-utils/src/generateFiles.js +++ /dev/null @@ -1,55 +0,0 @@ -import * as chokidar from 'chokidar'; -import lodash from 'lodash'; -import winPath from './winPath'; -import getAppPath from './getAppEntryPath'; - -export default async ({ api, watch }) => { - const { paths } = api; - - async function generate() { - api.logger.debug('generate files'); - await api.applyPlugins({ - key: 'onGenerateFiles', - type: api.ApplyPluginsType.event, - }); - } - - let watchers = []; - - await generate(); - - function unwatch() { - watchers.forEach((watcher) => { - watcher.close(); - }); - watchers = []; - } - - function createWatcher(path) { - const watcher = chokidar.watch(path, { - // ignore .dotfiles and _mock.js - ignored: /(^|[/\\])(_mock.js$|\..)/, - ignoreInitial: true, - }); - watcher.on( - 'all', - lodash.throttle(async () => { - await generate(); - }, 100), - ); - watchers.push(watcher); - } - - if (watch) { - const watcherPaths = await api.applyPlugins({ - key: 'addTmpGenerateWatcherPaths', - type: api.ApplyPluginsType.add, - initialValue: [paths.absPagesPath, getAppPath(paths.absSrcPath)], - }); - lodash.uniq(watcherPaths.map((p) => winPath(p))).forEach((p) => { - createWatcher(p); - }); - } - - return unwatch; -}; diff --git a/packages/fes-utils/src/getAppEntryPath.js b/packages/fes-utils/src/getAppPath.js similarity index 100% rename from packages/fes-utils/src/getAppEntryPath.js rename to packages/fes-utils/src/getAppPath.js diff --git a/packages/fes-utils/src/getHostName.js b/packages/fes-utils/src/getHostName.js new file mode 100644 index 00000000..4a5041b6 --- /dev/null +++ b/packages/fes-utils/src/getHostName.js @@ -0,0 +1 @@ +export default (userHost) => process.env.HOST || userHost || 'localhost'; diff --git a/packages/fes-utils/src/getPort.js b/packages/fes-utils/src/getPort.js new file mode 100644 index 00000000..3d622ebe --- /dev/null +++ b/packages/fes-utils/src/getPort.js @@ -0,0 +1,8 @@ +import portfinder from 'portfinder'; + +export default async function getPort(userPort) { + const defaultPort = process.env.PORT || userPort; + return portfinder.getPortPromise({ + port: defaultPort ? parseInt(String(defaultPort), 10) : 8000, + }); +} diff --git a/packages/fes-utils/src/index.js b/packages/fes-utils/src/index.js index dd83f5ca..a7044ec1 100644 --- a/packages/fes-utils/src/index.js +++ b/packages/fes-utils/src/index.js @@ -25,8 +25,10 @@ import compatESModuleRequire from './compatESModuleRequire'; import cleanRequireCache from './cleanRequireCache'; import parseRequireDeps from './parseRequireDeps'; import mergeConfig from './mergeConfig'; -import getAppEntryPath from './getAppEntryPath'; -import generateFiles from './generateFiles'; +import getAppPath from './getAppPath'; +import getPort from './getPort'; +import changePort from './changePort'; +import getHostName from './getHostName'; export { chalk, @@ -58,6 +60,8 @@ export { mergeConfig, resolvePkg, resolveInnerDep, - generateFiles, - getAppEntryPath, + getAppPath, + getPort, + changePort, + getHostName, }; diff --git a/packages/fes/types.d.ts b/packages/fes/types.d.ts index 7a42ee55..06411f8a 100644 --- a/packages/fes/types.d.ts +++ b/packages/fes/types.d.ts @@ -1,5 +1,6 @@ import { Component, DefineComponent, App } from 'vue'; import { RouteRecordRaw, Router } from 'vue-router'; +// @ts-ignore import { Plugin } from '@fesjs/runtime'; // @ts-ignore import type { PluginRuntimeConfig, PluginBuildConfig } from '@@/configType';