diff --git a/build.config.js b/build.config.js index 09da5329..732ca049 100644 --- a/build.config.js +++ b/build.config.js @@ -1,4 +1,3 @@ - module.exports = { // 需要编译的包 pkgs: [ @@ -21,7 +20,8 @@ module.exports = { 'fes-preset-built-in', 'fes-plugin-windicss', 'fes-runtime', - 'fes-utils' + 'fes-utils', + 'fes-build-webpack', ], - copy: [] + copy: [], }; diff --git a/packages/fes-build-vite/LICENSE b/packages/fes-build-vite/LICENSE new file mode 100644 index 00000000..0978fbf7 --- /dev/null +++ b/packages/fes-build-vite/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020-present webank + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/fes-build-vite/README.md b/packages/fes-build-vite/README.md new file mode 100644 index 00000000..e560ce4e --- /dev/null +++ b/packages/fes-build-vite/README.md @@ -0,0 +1,5 @@ + +# Fes.js vite 构建 + + + diff --git a/packages/fes-build-vite/package.json b/packages/fes-build-vite/package.json new file mode 100644 index 00000000..43a3e321 --- /dev/null +++ b/packages/fes-build-vite/package.json @@ -0,0 +1,35 @@ +{ + "name": "@fesjs/build-vite", + "version": "2.0.22", + "description": "@fesjs/build-vite", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "files": [ + "lib" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/WeBankFinTech/fes.js.git", + "directory": "packages/fes-build-vite" + }, + "keywords": [ + "fes" + ], + "author": "qlin", + "license": "MIT", + "bugs": { + "url": "https://github.com/WeBankFinTech/fes.js/issues" + }, + "homepage": "https://github.com/WeBankFinTech/fes.js#readme", + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@vitejs/plugin-vue": "^2.2.4", + "@vitejs/plugin-vue-jsx": "^1.3.8", + "vite": "^2.8.6" + }, + "peerDependencies": { + "@vue/compiler-sfc": "^3.0.5" + } +} \ No newline at end of file diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/SFCConfigBlockPlugin.js b/packages/fes-build-vite/src/SFCConfigBlockPlugin.js similarity index 100% rename from packages/fes-preset-built-in/src/plugins/commands/dev/SFCConfigBlockPlugin.js rename to packages/fes-build-vite/src/SFCConfigBlockPlugin.js diff --git a/packages/fes-build-vite/src/dev.js b/packages/fes-build-vite/src/dev.js new file mode 100644 index 00000000..e0a48452 --- /dev/null +++ b/packages/fes-build-vite/src/dev.js @@ -0,0 +1,100 @@ +import { createServer } from 'vite'; +import vue from '@vitejs/plugin-vue'; +import vueJsx from '@vitejs/plugin-vue-jsx'; +import SFCConfigBlockPlugin from './SFCConfigBlockPlugin'; + +const assert = require('assert'); + +export default (api) => { + const { + env, + paths, + utils: { chalk }, + } = api; + + const unwatchs = []; + let port; + let hostname; + let server; + + function destroy() { + for (const unwatch of unwatchs) { + unwatch(); + } + server?.close(); + } + + api.registerCommand({ + command: 'dev', + description: 'start a local http service for development', + options: [ + { + name: '--port', + description: 'http service port, like 8080', + }, + { + name: '--https', + description: 'whether to turn on the https service', + }, + ], + async fn() { + server = await createServer({ + mode: 'development', + plugins: [vue(), SFCConfigBlockPlugin, vueJsx()], + configFile: false, + resolve: { + alias: { + '@': paths.absSrcPath, + '@@': paths.absTmpPath, + '@fesInner': '/', + }, + }, + server: { + port: 8000, + }, + }); + await server.listen(); + + server.printUrls(); + + return { + destroy, + }; + }, + }); + + api.registerMethod({ + name: 'getPort', + fn() { + assert(env === 'development', 'api.getPort() is only valid in development.'); + return port; + }, + }); + + api.registerMethod({ + name: 'getHostname', + fn() { + assert(env === 'development', 'api.getHostname() is only valid in development.'); + return hostname; + }, + }); + + api.registerMethod({ + name: 'getServer', + fn() { + assert(env === 'development', 'api.getServer() is only valid in development.'); + return server; + }, + }); + + api.registerMethod({ + name: 'restartServer', + fn() { + console.log(chalk.gray('Try to restart dev server...')); + destroy(); + process.send({ + type: 'RESTART', + }); + }, + }); +}; diff --git a/packages/fes-build-webpack/LICENSE b/packages/fes-build-webpack/LICENSE new file mode 100644 index 00000000..0978fbf7 --- /dev/null +++ b/packages/fes-build-webpack/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020-present webank + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/fes-build-webpack/README.md b/packages/fes-build-webpack/README.md new file mode 100644 index 00000000..e8970956 --- /dev/null +++ b/packages/fes-build-webpack/README.md @@ -0,0 +1,5 @@ + +# Fes.js webpack 构建 + + + diff --git a/packages/fes-build-webpack/package.json b/packages/fes-build-webpack/package.json new file mode 100644 index 00000000..a7a84ae2 --- /dev/null +++ b/packages/fes-build-webpack/package.json @@ -0,0 +1,76 @@ +{ + "name": "@fesjs/build-webpack", + "version": "1.0.0", + "description": "@fesjs/build-webpack", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "files": [ + "lib" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/WeBankFinTech/fes.js.git", + "directory": "packages/fes-build-webpack" + }, + "keywords": [ + "fes" + ], + "author": "qlin", + "license": "MIT", + "bugs": { + "url": "https://github.com/WeBankFinTech/fes.js/issues" + }, + "homepage": "https://github.com/WeBankFinTech/fes.js#readme", + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@babel/core": "^7.12.13", + "@babel/plugin-proposal-do-expressions": "^7.12.13", + "@babel/plugin-proposal-export-default-from": "^7.12.13", + "@babel/plugin-proposal-function-bind": "^7.12.13", + "@babel/plugin-proposal-pipeline-operator": "^7.12.13", + "@babel/plugin-transform-runtime": "^7.12.13", + "@babel/preset-env": "^7.12.13", + "@babel/preset-typescript": "^7.15.0", + "@fesjs/compiler": "^2.0.5", + "@fesjs/utils": "^2.0.4", + "@soda/friendly-errors-webpack-plugin": "^1.8.0", + "@vue/babel-plugin-jsx": "^1.0.2", + "autoprefixer": "^10.2.4", + "babel-loader": "^8.2.2", + "babel-plugin-import": "1.13.3", + "cli-highlight": "^2.1.4", + "cliui": "7.0.4", + "connect-history-api-fallback": "^1.6.0", + "copy-webpack-plugin": "^7.0.0", + "css-loader": "^5.0.1", + "css-minimizer-webpack-plugin": "^3.0.0", + "file-loader": "^6.2.0", + "html-webpack-plugin": "^5.0.0", + "html-webpack-tags-plugin": "^3.0.0", + "less": "3.9.0", + "less-loader": "^8.0.0", + "mini-css-extract-plugin": "^1.3.5", + "postcss": "8.3.0", + "postcss-flexbugs-fixes": "^5.0.2", + "postcss-loader": "^4.2.0", + "postcss-safe-parser": "^5.0.2", + "raw-loader": "^4.0.2", + "style-loader": "^2.0.0", + "url-loader": "^4.1.1", + "vue-loader": "^16.1.2", + "webpack": "^5.24.2", + "webpack-bundle-analyzer": "^4.4.0", + "webpack-chain": "^6.5.1", + "webpack-dev-server": "^3.11.2", + "webpackbar": "^5.0.0-3" + }, + "peerDependencies": { + "@vue/compiler-sfc": "^3.0.5", + "core-js": "^3.8.3" + }, + "devDependencies": { + "core-js": "^3.8.3" + } +} diff --git a/packages/fes-build-webpack/src/index.js b/packages/fes-build-webpack/src/index.js new file mode 100644 index 00000000..77fbf200 --- /dev/null +++ b/packages/fes-build-webpack/src/index.js @@ -0,0 +1,37 @@ +export default function () { + return { + plugins: [ + // bundle configs + require.resolve('./plugins/features/alias'), + require.resolve('./plugins/features/analyze'), + require.resolve('./plugins/features/autoprefixer'), + require.resolve('./plugins/features/chainWebpack'), + require.resolve('./plugins/features/cssLoader'), + require.resolve('./plugins/features/copy'), + require.resolve('./plugins/features/define'), + require.resolve('./plugins/features/devServer'), + require.resolve('./plugins/features/devtool'), + require.resolve('./plugins/features/externals'), + require.resolve('./plugins/features/exportStatic'), + require.resolve('./plugins/features/extraBabelPlugins'), + require.resolve('./plugins/features/extraBabelPresets'), + require.resolve('./plugins/features/extraPostCSSPlugins'), + require.resolve('./plugins/features/html'), + require.resolve('./plugins/features/inlineLimit'), + require.resolve('./plugins/features/lessLoader'), + require.resolve('./plugins/features/outputPath'), + require.resolve('./plugins/features/postcssLoader'), + require.resolve('./plugins/features/publicPath'), + require.resolve('./plugins/features/runtimePublicPath'), + require.resolve('./plugins/features/targets'), + require.resolve('./plugins/features/terserOptions'), + require.resolve('./plugins/features/nodeModulesTransform'), + require.resolve('./plugins/features/vueLoader'), + + // commands + require.resolve('./plugins/commands/build'), + require.resolve('./plugins/commands/dev'), + require.resolve('./plugins/commands/webpack'), + ], + }; +} diff --git a/packages/fes-preset-built-in/src/plugins/commands/build/build.js b/packages/fes-build-webpack/src/plugins/commands/build/build.js similarity index 68% rename from packages/fes-preset-built-in/src/plugins/commands/build/build.js rename to packages/fes-build-webpack/src/plugins/commands/build/build.js index fceedf50..2a2673db 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/build/build.js +++ b/packages/fes-build-webpack/src/plugins/commands/build/build.js @@ -1,15 +1,10 @@ import webpack from 'webpack'; -export async function build({ - bundleConfig -}) { +export async function build({ bundleConfig }) { return new Promise((resolve, reject) => { const compiler = webpack(bundleConfig); compiler.run((err, stats) => { if (err || stats.hasErrors()) { - try { - console.log(stats.toString('errors-only')); - } catch (e) {} console.error(err); return reject(new Error('build failed')); } diff --git a/packages/fes-preset-built-in/src/plugins/commands/build/index.js b/packages/fes-build-webpack/src/plugins/commands/build/index.js similarity index 76% rename from packages/fes-preset-built-in/src/plugins/commands/build/index.js rename to packages/fes-build-webpack/src/plugins/commands/build/index.js index ef07f0e0..ffdf5a29 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/build/index.js +++ b/packages/fes-build-webpack/src/plugins/commands/build/index.js @@ -3,32 +3,27 @@ * https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/build/build.ts */ +import { relative } from 'path'; +import { existsSync } from 'fs'; import { Logger } from '@fesjs/compiler'; -const logger = new Logger('fes:plugin-built-in'); +const logger = new Logger('fes:build-webpack'); export default function (api) { const { paths, - utils: { rimraf } + utils: { rimraf, generateFiles }, } = api; api.registerCommand({ command: 'build', description: 'build application for production', async fn() { - const { relative } = require('path'); - const { existsSync } = require('fs'); - const { - cleanTmpPathExceptCache, - getBundleAndConfigs, - printFileSizes - } = require('../buildDevUtils'); - const generateFiles = require('../../../utils/generateFiles').default; + const { cleanTmpPathExceptCache, getBundleAndConfigs, printFileSizes } = require('../buildDevUtils'); const { build } = require('./build'); cleanTmpPathExceptCache({ - absTmpPath: paths.absTmpPath + absTmpPath: paths.absTmpPath, }); // generate files @@ -54,20 +49,20 @@ export default function (api) { key: 'onBuildComplete', type: api.ApplyPluginsType.event, args: { - stats - } + stats, + }, }); } catch (err) { await api.applyPlugins({ key: 'onBuildComplete', type: api.ApplyPluginsType.event, args: { - err - } + err, + }, }); // throw build error throw err; } - } + }, }); } diff --git a/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js b/packages/fes-build-webpack/src/plugins/commands/buildDevUtils.js similarity index 62% rename from packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js rename to packages/fes-build-webpack/src/plugins/commands/buildDevUtils.js index 3b9e4213..f235fa7b 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/buildDevUtils.js +++ b/packages/fes-build-webpack/src/plugins/commands/buildDevUtils.js @@ -9,9 +9,7 @@ import { rimraf, chalk } from '@fesjs/utils'; import zlib from 'zlib'; import getConfig from './webpackConfig'; -export async function getBundleAndConfigs({ - api -}) { +export async function getBundleAndConfigs({ api }) { // get config const env = api.env === 'production' ? 'production' : 'development'; const getConfigOpts = await api.applyPlugins({ @@ -22,21 +20,21 @@ export async function getBundleAndConfigs({ config: api.config, env, entry: { - index: join(api.paths.absTmpPath, 'fes.js') + index: join(api.paths.absTmpPath, 'fes.js'), }, // @ts-ignore async modifyBabelOpts(opts) { return api.applyPlugins({ type: api.ApplyPluginsType.modify, key: 'modifyBabelOpts', - initialValue: opts + initialValue: opts, }); }, async modifyBabelPresetOpts(opts) { return api.applyPlugins({ type: api.ApplyPluginsType.modify, key: 'modifyBabelPresetOpts', - initialValue: opts + initialValue: opts, }); }, async chainWebpack(webpackConfig, opts) { @@ -45,44 +43,38 @@ export async function getBundleAndConfigs({ key: 'chainWebpack', initialValue: webpackConfig, args: { - ...opts - } + ...opts, + }, }); }, async headScripts() { return api.applyPlugins({ key: 'addHTMLHeadScripts', type: api.ApplyPluginsType.add, - initialState: [] + initialState: [], }); }, publicPath: await api.applyPlugins({ key: 'modifyPublicPathStr', type: api.ApplyPluginsType.modify, initialValue: api.config.publicPath || '', - args: { - } - }) - + args: {}, + }), }, - args: { - } + args: {}, }); const bundleConfig = await api.applyPlugins({ type: api.ApplyPluginsType.modify, key: 'modifyBundleConfig', initialValue: await getConfig({ api, ...getConfigOpts }), - args: { - } + args: {}, }); return { bundleConfig }; } -export function cleanTmpPathExceptCache({ - absTmpPath -}) { +export function cleanTmpPathExceptCache({ absTmpPath }) { if (!existsSync(absTmpPath)) return; readdirSync(absTmpPath).forEach((file) => { if (file === '.cache') return; @@ -99,7 +91,7 @@ export function printFileSizes(stats, dir) { const json = stats.toJson({ hash: false, modules: false, - chunks: false + chunks: false, }); const filesize = (bytes) => { @@ -116,27 +108,24 @@ export function printFileSizes(stats, dir) { return `${bytes.toFixed(1)} ${unit[loop]}`; }; - const assets = json.assets - ? json.assets - : json?.children?.reduce((acc, child) => acc.concat(child?.assets), []); + const assets = json.assets ? json.assets : json?.children?.reduce((acc, child) => acc.concat(child?.assets), []); const seenNames = new Map(); - const isJS = val => /\.js$/.test(val); - const isCSS = val => /\.css$/.test(val); + const isJS = (val) => /\.js$/.test(val); + const isCSS = (val) => /\.css$/.test(val); - const orderedAssets = assets.map((a) => { - a.name = a.name.split('?')[0]; - // These sizes are pretty large - const isMainBundle = a.name.indexOf('fes.') === 0; - const maxRecommendedSize = isMainBundle - ? WARN_AFTER_BUNDLE_GZIP_SIZE - : WARN_AFTER_CHUNK_GZIP_SIZE; - const isLarge = maxRecommendedSize && a.size > maxRecommendedSize; - return { - ...a, - suggested: isLarge && isJS(a.name) - }; - }) + const orderedAssets = assets + .map((a) => { + a.name = a.name.split('?')[0]; + // These sizes are pretty large + const isMainBundle = a.name.indexOf('fes.') === 0; + const maxRecommendedSize = isMainBundle ? WARN_AFTER_BUNDLE_GZIP_SIZE : WARN_AFTER_CHUNK_GZIP_SIZE; + const isLarge = maxRecommendedSize && a.size > maxRecommendedSize; + return { + ...a, + suggested: isLarge && isJS(a.name), + }; + }) .filter((a) => { if (seenNames.has(a.name)) { return false; @@ -164,43 +153,30 @@ export function printFileSizes(stats, dir) { } ui.div( - `${makeRow( - chalk.cyan.bold('File'), - chalk.cyan.bold('Size'), - chalk.cyan.bold('Gzipped') - ) - }\n\n${ - // eslint-disable-next-line - orderedAssets.map(asset => makeRow(/js$/.test(asset.name) ? (asset.suggested ? chalk.yellow(join(dir, asset.name)) : chalk.green(join(dir, asset.name))) : chalk.blue(join(dir, asset.name)), - filesize(asset.size), - getGzippedSize(asset))) - .join('\n')}` + `${makeRow(chalk.cyan.bold('File'), chalk.cyan.bold('Size'), chalk.cyan.bold('Gzipped'))}\n\n${orderedAssets + .map((asset) => + makeRow( + /js$/.test(asset.name) + ? asset.suggested + ? chalk.yellow(join(dir, asset.name)) + : chalk.green(join(dir, asset.name)) + : chalk.blue(join(dir, asset.name)), + filesize(asset.size), + getGzippedSize(asset), + ), + ) + .join('\n')}`, ); + console.log(`${ui.toString()}\n\n ${chalk.gray('Images and other types of assets omitted.')}\n`); - console.log( - `${ui.toString()}\n\n ${chalk.gray( - 'Images and other types of assets omitted.' - )}\n` - ); - - if (orderedAssets?.some(asset => asset.suggested)) { - // We'll warn for bundles exceeding them. - // TODO: use umi docs + if (orderedAssets?.some((asset) => asset.suggested)) { + // We'll warn for bundles exceeding them. + // TODO: use umi docs console.log(); - console.log( - chalk.yellow('The bundle size is significantly larger than recommended.') - ); - console.log( - chalk.yellow( - 'Consider reducing it with code splitting' - ) - ); - console.log( - chalk.yellow( - 'You can also analyze the project dependencies using ANALYZE=1' - ) - ); + console.log(chalk.yellow('The bundle size is significantly larger than recommended.')); + console.log(chalk.yellow('Consider reducing it with code splitting')); + console.log(chalk.yellow('You can also analyze the project dependencies using ANALYZE=1')); console.log(); } } diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/cert/cert.pem b/packages/fes-build-webpack/src/plugins/commands/dev/cert/cert.pem similarity index 100% rename from packages/fes-preset-built-in/src/plugins/commands/dev/cert/cert.pem rename to packages/fes-build-webpack/src/plugins/commands/dev/cert/cert.pem diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/cert/key.pem b/packages/fes-build-webpack/src/plugins/commands/dev/cert/key.pem similarity index 100% rename from packages/fes-preset-built-in/src/plugins/commands/dev/cert/key.pem rename to packages/fes-build-webpack/src/plugins/commands/dev/cert/key.pem diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/createRouteMiddleware.js b/packages/fes-build-webpack/src/plugins/commands/dev/createRouteMiddleware.js similarity index 78% rename from packages/fes-preset-built-in/src/plugins/commands/dev/createRouteMiddleware.js rename to packages/fes-build-webpack/src/plugins/commands/dev/createRouteMiddleware.js index ebc2bb02..599013a7 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/createRouteMiddleware.js +++ b/packages/fes-build-webpack/src/plugins/commands/dev/createRouteMiddleware.js @@ -1,12 +1,11 @@ - import { extname, join } from 'path'; import historyFallback from 'connect-history-api-fallback'; const ASSET_EXT_NAMES = ['.ico', '.png', '.jpg', '.jpeg', '.gif', '.svg']; -export default api => (req, res, next) => { +export default (api) => (req, res, next) => { const proxyConfig = api.config.proxy; - if (proxyConfig && Object.keys(proxyConfig).some(path => req.path.startsWith(path))) { + if (proxyConfig && Object.keys(proxyConfig).some((path) => req.path.startsWith(path))) { return next(); } if (req.path === '/favicon.ico') { diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/devServer.js b/packages/fes-build-webpack/src/plugins/commands/dev/devServer.js similarity index 83% rename from packages/fes-preset-built-in/src/plugins/commands/dev/devServer.js rename to packages/fes-build-webpack/src/plugins/commands/dev/devServer.js index 0f2a616d..5fdba6c6 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/devServer.js +++ b/packages/fes-build-webpack/src/plugins/commands/dev/devServer.js @@ -3,17 +3,7 @@ import webpack from 'webpack'; import fs from 'fs'; import path from 'path'; - -export function startDevServer({ - webpackConfig, - host, - port, - proxy, - https, - beforeMiddlewares, - afterMiddlewares, - customerDevServerConfig -}) { +export function startDevServer({ webpackConfig, host, port, proxy, https, beforeMiddlewares, afterMiddlewares, customerDevServerConfig }) { const options = { contentBase: webpackConfig.output.path, hot: true, @@ -37,9 +27,9 @@ export function startDevServer({ }); }, headers: { - 'access-control-allow-origin': '*' + 'access-control-allow-origin': '*', }, - ...(customerDevServerConfig || {}) + ...(customerDevServerConfig || {}), }; if (https) { options.https = true; diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/fes.png b/packages/fes-build-webpack/src/plugins/commands/dev/fes.png similarity index 100% rename from packages/fes-preset-built-in/src/plugins/commands/dev/fes.png rename to packages/fes-build-webpack/src/plugins/commands/dev/fes.png diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/index-old.js b/packages/fes-build-webpack/src/plugins/commands/dev/index.js similarity index 94% rename from packages/fes-preset-built-in/src/plugins/commands/dev/index-old.js rename to packages/fes-build-webpack/src/plugins/commands/dev/index.js index 2bd9f365..6ee8245d 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/index-old.js +++ b/packages/fes-build-webpack/src/plugins/commands/dev/index.js @@ -9,7 +9,7 @@ export default (api) => { const { env, paths, - utils: { chalk, portfinder }, + utils: { chalk, portfinder, generateFiles }, } = api; const unwatchs = []; @@ -39,9 +39,7 @@ export default (api) => { ], async fn({ args = {} }) { const { cleanTmpPathExceptCache, getBundleAndConfigs } = require('../buildDevUtils'); - const { delay } = require('@fesjs/utils'); const createRouteMiddleware = require('./createRouteMiddleware').default; - const generateFiles = require('../../../utils/generateFiles').default; const { watchPkg } = require('./watchPkg'); const defaultPort = process.env.PORT || args.port || api.config.devServer?.port; @@ -135,11 +133,6 @@ export default (api) => { unwatchs.push(unwatchConfig); } - // delay dev server 启动，避免重复 compile - // https://github.com/webpack/watchpack/issues/25 - // https://github.com/yessky/webpack-mild-compile - await delay(500); - // dev const { bundleConfig } = await getBundleAndConfigs({ api }); diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/watchPkg.js b/packages/fes-build-webpack/src/plugins/commands/dev/watchPkg.js similarity index 88% rename from packages/fes-preset-built-in/src/plugins/commands/dev/watchPkg.js rename to packages/fes-build-webpack/src/plugins/commands/dev/watchPkg.js index 24292983..994aa031 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/watchPkg.js +++ b/packages/fes-build-webpack/src/plugins/commands/dev/watchPkg.js @@ -11,11 +11,8 @@ import { isPluginOrPreset, PluginType } from '@fesjs/compiler'; function getPlugins(opts) { return Object.keys({ ...opts.pkg.dependencies, - ...opts.pkg.devDependencies - }).filter(name => ( - isPluginOrPreset(PluginType.plugin, name) - || isPluginOrPreset(PluginType.preset, name) - )); + ...opts.pkg.devDependencies, + }).filter((name) => isPluginOrPreset(PluginType.plugin, name) || isPluginOrPreset(PluginType.preset, name)); } function getPluginsFromPkgPath(opts) { @@ -34,7 +31,7 @@ export function watchPkg(opts) { const pkgPath = join(opts.cwd, 'package.json'); const plugins = getPluginsFromPkgPath({ pkgPath }); const watcher = chokidar.watch(pkgPath, { - ignoreInitial: true + ignoreInitial: true, }); watcher.on('all', () => { const newPlugins = getPluginsFromPkgPath({ pkgPath }); diff --git a/packages/fes-build-webpack/src/plugins/commands/webpack/index.js b/packages/fes-build-webpack/src/plugins/commands/webpack/index.js new file mode 100644 index 00000000..8fe18deb --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/commands/webpack/index.js @@ -0,0 +1,50 @@ +export default function (api) { + api.registerCommand({ + command: 'webpack', + description: 'inspect webpack configurations', + options: [ + { + name: '--rule ', + description: 'inspect a specific module rule', + }, + { + name: '--plugin ', + description: 'inspect a specific plugin', + }, + { + name: '--rules', + description: 'list all module rule names', + }, + { + name: '--plugins', + description: 'list all plugin names', + }, + { + name: '--verbose', + description: 'show full function definitions in output', + }, + ], + async fn({ options }) { + const assert = require('assert'); + const { getBundleAndConfigs } = require('../buildDevUtils'); + const { toString } = require('webpack-chain'); + const { highlight } = require('cli-highlight'); + const { bundleConfig } = await getBundleAndConfigs({ api }); + + let config = bundleConfig; + assert(config, 'No valid config found with fes entry.'); + + if (options.rule) { + config = config.module.rules.find((r) => r.__ruleNames[0] === options.rule); + } else if (options.plugin) { + config = config.plugins.find((p) => p.__pluginName === options.plugin); + } else if (options.rules) { + config = config.module.rules.map((r) => r.__ruleNames[0]); + } else if (options.plugins) { + config = config.plugins.map((p) => p.__pluginName || p.constructor.name); + } + + console.log(highlight(toString(config, { verbose: options.verbose }), { language: 'js' })); + }, + }); +} diff --git a/packages/fes-build-webpack/src/plugins/commands/webpackConfig/css.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/css.js new file mode 100644 index 00000000..5fad5ec9 --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/css.js @@ -0,0 +1,112 @@ +// css less post-css mini-css css 压缩 +// extraPostCSSPlugins +// postcssLoader +// lessLoader +// css-loader +// 支持 热加载 +// 性能优化 +// css 压缩 https://github.com/webpack-contrib/css-minimizer-webpack-plugin +// 根据 entry 进行代码块拆分 +// 根据 entry 将文件输出到不同的文件夹 + +import { deepmerge } from '@fesjs/utils'; + +function createRules({ isDev, webpackConfig, config, lang, test, loader, options, browserslist, styleLoaderOption }) { + function applyLoaders(rule, cssLoaderOption = {}) { + if (isDev) { + rule.use('extra-css-loader').loader(require.resolve('style-loader')).options(Object.assign({}, styleLoaderOption)); + } else { + rule.use('extra-css-loader').loader(require('mini-css-extract-plugin').loader).options({}); + } + + rule.use('css-loader') + .loader(require.resolve('css-loader')) + .options( + deepmerge( + { + importLoaders: 1, + ...cssLoaderOption, + }, + config.cssLoader || {}, + ), + ); + + rule.use('postcss-loader') + .loader(require.resolve('postcss-loader')) + .options( + deepmerge( + { + postcssOptions: () => ({ + plugins: [ + // https://github.com/luisrudge/postcss-flexbugs-fixes + require('postcss-flexbugs-fixes'), + require('postcss-safe-parser'), + [require('autoprefixer'), { ...config.autoprefixer, overrideBrowserslist: browserslist }], + ...(config.extraPostCSSPlugins ? config.extraPostCSSPlugins : []), + ], + }), + }, + config.postcssLoader || {}, + ), + ); + + if (loader) { + rule.use(loader).loader(require.resolve(loader)).options(options); + } + } + + const rule = webpackConfig.module.rule(lang).test(test); + applyLoaders(rule.oneOf('css-modules').resourceQuery(/module/), { + modules: { + localIdentName: '[local]___[hash:base64:5]', + }, + }); + applyLoaders(rule.oneOf('css')); +} + +export default function createCssWebpackConfig({ isDev, config, webpackConfig, browserslist }) { + createRules({ + isDev, + webpackConfig, + config, + lang: 'css', + test: /\.css$/, + browserslist, + }); + + createRules({ + isDev, + webpackConfig, + config, + lang: 'less', + test: /\.less$/, + loader: 'less-loader', + options: { + lessOptions: { + javascriptEnabled: true, + ...config.lessLoader, + }, + }, + browserslist, + }); + + if (!isDev) { + webpackConfig.plugin('extra-css').use(require.resolve('mini-css-extract-plugin'), [ + { + filename: '[name].[contenthash:8].css', + chunkFilename: '[id].[contenthash:8].css', + }, + ]); + webpackConfig.optimization.minimizer('css').use(require.resolve('css-minimizer-webpack-plugin'), [{}]); + } + + return (options) => { + createRules({ + isDev, + config, + webpackConfig, + browserslist, + ...options, + }); + }; +} diff --git a/packages/fes-build-webpack/src/plugins/commands/webpackConfig/define.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/define.js new file mode 100644 index 00000000..a1f0e474 --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/define.js @@ -0,0 +1,6 @@ +import webpack from 'webpack'; +import resolveDefine from './resolveDefine'; + +export default function createDefineWebpackConfig({ config, webpackConfig }) { + webpackConfig.plugin('define').use(webpack.DefinePlugin, [resolveDefine(config)]); +} diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBabelOpts.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/getBabelOpts.js similarity index 62% rename from packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBabelOpts.js rename to packages/fes-build-webpack/src/plugins/commands/webpackConfig/getBabelOpts.js index f49583c8..e333e7d9 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/getBabelOpts.js +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/getBabelOpts.js @@ -1,13 +1,6 @@ -import { - winPath -} from '@fesjs/utils'; +import { winPath } from '@fesjs/utils'; -function getBabelOpts({ - cwd, - targets, - config, - presetOpts -}) { +function getBabelOpts({ cwd, targets, config, presetOpts }) { const presets = [ [ require.resolve('@babel/preset-env'), @@ -16,10 +9,10 @@ function getBabelOpts({ useBuiltIns: 'usage', corejs: { version: 3, - proposals: true + proposals: true, }, - modules: false - } + modules: false, + }, ], [ // FEATURE 实现类型安全检查 @@ -28,18 +21,18 @@ function getBabelOpts({ // https://babeljs.io/docs/en/babel-plugin-transform-typescript#impartial-namespace-support allowNamespaces: true, isTSX: true, - allExtensions: true - } + allExtensions: true, + }, ], - ...(config.extraBabelPresets || []) + ...(config.extraBabelPresets || []), ]; const plugins = [ require('@babel/plugin-proposal-export-default-from').default, [ require('@babel/plugin-proposal-pipeline-operator').default, { - proposal: 'minimal' - } + proposal: 'minimal', + }, ], require('@babel/plugin-proposal-do-expressions').default, require('@babel/plugin-proposal-function-bind').default, @@ -47,18 +40,12 @@ function getBabelOpts({ require.resolve('@babel/plugin-transform-runtime'), { useESModules: true, - ...presetOpts.transformRuntime - } + ...presetOpts.transformRuntime, + }, ], - ...(presetOpts.import - ? presetOpts.import.map(importOpts => [ - require.resolve('babel-plugin-import'), - importOpts, - importOpts.libraryName - ]) - : []), + ...(presetOpts.import ? presetOpts.import.map((importOpts) => [require.resolve('babel-plugin-import'), importOpts, importOpts.libraryName]) : []), require.resolve('@vue/babel-plugin-jsx'), - ...(config.extraBabelPlugins || []) + ...(config.extraBabelPlugins || []), ]; return { babelrc: false, @@ -66,23 +53,18 @@ function getBabelOpts({ cacheDirectory: process.env.BABEL_CACHE !== 'none' ? winPath(`${cwd}/.cache/babel-loader`) : false, presets, plugins, - overrides: [{ - test: [/[\\/]node_modules[\\/]/, /\.fes/], - sourceType: 'unambiguous' - }] + overrides: [ + { + test: [/[\\/]node_modules[\\/]/, /\.fes/], + sourceType: 'unambiguous', + }, + ], }; } - -export default async ({ - cwd, - config, - modifyBabelOpts, - modifyBabelPresetOpts, - targets -}) => { +export default async ({ cwd, config, modifyBabelOpts, modifyBabelPresetOpts, targets }) => { let presetOpts = { - transformRuntime: {} + transformRuntime: {}, }; if (modifyBabelPresetOpts) { presetOpts = await modifyBabelPresetOpts(presetOpts); @@ -91,7 +73,7 @@ export default async ({ cwd, config, presetOpts, - targets + targets, }); if (modifyBabelOpts) { babelOpts = await modifyBabelOpts(babelOpts); diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/html.js similarity index 68% rename from packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js rename to packages/fes-build-webpack/src/plugins/commands/webpackConfig/html.js index 265c39e0..c046a317 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/html.js +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/html.js @@ -1,24 +1,15 @@ import { join, resolve } from 'path'; import { existsSync } from 'fs'; -import { - winPath -} from '@fesjs/utils'; +import { winPath } from '@fesjs/utils'; import resolveDefine from './resolveDefine'; -export default async function createHtmlWebpackConfig({ - api, - cwd, - config, - webpackConfig, - headScripts, - isProd -}) { +export default async function createHtmlWebpackConfig({ api, cwd, config, webpackConfig, headScripts, isProd }) { const htmlOptions = { title: 'fes.js', filename: '[name].html', ...config.html, templateParameters: resolveDefine(config, true), - mountElementId: config.mountElementId + mountElementId: config.mountElementId, }; if (isProd) { @@ -27,10 +18,10 @@ export default async function createHtmlWebpackConfig({ removeComments: true, collapseWhitespace: true, collapseBooleanAttributes: true, - removeScriptTypeAttributes: true + removeScriptTypeAttributes: true, // more options: // https://github.com/kangax/html-minifier#options-quick-reference - } + }, }); } @@ -39,15 +30,11 @@ export default async function createHtmlWebpackConfig({ const publicCopyIgnore = []; // default, single page setup. - htmlOptions.template = existsSync(htmlPath) - ? htmlPath - : defaultHtmlPath; + htmlOptions.template = existsSync(htmlPath) ? htmlPath : defaultHtmlPath; publicCopyIgnore.push(winPath(htmlOptions.template)); - webpackConfig - .plugin('html') - .use(require.resolve('html-webpack-plugin'), [htmlOptions]); + webpackConfig.plugin('html').use(require.resolve('html-webpack-plugin'), [htmlOptions]); // 如果需要导出html，则根据路由生成对应的html文件 if (config.exportStatic) { @@ -62,11 +49,9 @@ export default async function createHtmlWebpackConfig({ title: route?.meta?.title || config.html.title || 'fes.js', filename: _fileName, templateParameters: resolveDefine(config, true), - mountElementId: config.mountElementId + mountElementId: config.mountElementId, }; - webpackConfig - .plugin(_fileName) - .use(require.resolve('html-webpack-plugin'), [_htmlOptions]); + webpackConfig.plugin(_fileName).use(require.resolve('html-webpack-plugin'), [_htmlOptions]); } if (route.children && route.children.length) { addHtml(route.children); @@ -79,16 +64,16 @@ export default async function createHtmlWebpackConfig({ if (headScripts) { const headScriptsMap = await headScripts(); - webpackConfig - .plugin('html-tags') - .use(require.resolve('html-webpack-tags-plugin'), [{ + webpackConfig.plugin('html-tags').use(require.resolve('html-webpack-tags-plugin'), [ + { append: false, - scripts: headScriptsMap.map(script => ({ - path: script.src - })) - }]); + scripts: headScriptsMap.map((script) => ({ + path: script.src, + })), + }, + ]); } return { - publicCopyIgnore + publicCopyIgnore, }; } diff --git a/packages/fes-build-webpack/src/plugins/commands/webpackConfig/index-default.html b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/index-default.html new file mode 100644 index 00000000..cdbba45c --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/index-default.html @@ -0,0 +1,17 @@ + + + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + +
+ + + \ No newline at end of file diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/index.js similarity index 74% rename from packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js rename to packages/fes-build-webpack/src/plugins/commands/webpackConfig/index.js index c837c2cc..83f88acd 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index.js +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/index.js @@ -13,18 +13,17 @@ function getTargetsAndBrowsersList({ config }) { let targets = config.targets || {}; targets = Object.keys(targets) - .filter(key => targets[key] !== false) + .filter((key) => targets[key] !== false) .reduce((memo, key) => { memo[key] = targets[key]; return memo; }, {}); - const browserslist = targets.browsers - || Object.keys(targets).map(key => `${key} >= ${targets[key] === true ? '0' : targets[key]}`); + const browserslist = targets.browsers || Object.keys(targets).map((key) => `${key} >= ${targets[key] === true ? '0' : targets[key]}`); return { targets, - browserslist + browserslist, }; } @@ -38,7 +37,7 @@ const DEFAULT_EXCLUDE_NODE_MODULES = [ 'lodash-es', 'webpack-dev-server', 'ansi-html', - 'html-entities' + 'html-entities', ]; function genTranspileDepRegex(exclude) { @@ -47,7 +46,8 @@ function genTranspileDepRegex(exclude) { if (typeof dep === 'string') { const depPath = join('node_modules', dep, '/'); return /^win/.test(require('os').platform()) ? depPath.replace(/\\/g, '\\\\') : depPath; - } if (dep instanceof RegExp) { + } + if (dep instanceof RegExp) { return dep.source; } @@ -56,19 +56,7 @@ function genTranspileDepRegex(exclude) { return deps.length ? new RegExp(deps.join('|')) : null; } - -export default async function getConfig({ - api, - cwd, - config, - env, - entry = {}, - modifyBabelOpts, - modifyBabelPresetOpts, - chainWebpack, - headScripts, - publicPath -}) { +export default async function getConfig({ api, cwd, config, env, entry = {}, modifyBabelOpts, modifyBabelPresetOpts, chainWebpack, headScripts, publicPath }) { const isDev = env === 'development'; const isProd = env === 'production'; const webpackConfig = new Config(); @@ -77,13 +65,13 @@ export default async function getConfig({ webpackConfig.mode(env); webpackConfig.stats('verbose'); webpackConfig.externals(config.externals || {}); - webpackConfig.devtool(isDev ? (config.devtool || 'cheap-module-source-map') : config.devtool); + webpackConfig.devtool(isDev ? config.devtool || 'cheap-module-source-map' : config.devtool); // --------------- cache ----------- webpackConfig.cache({ type: 'filesystem', version: require('../../../../package.json').version, - cacheDirectory: join(cwd, '.cache/webpack') + cacheDirectory: join(cwd, '.cache/webpack'), }); // --------------- entry ----------- @@ -93,19 +81,14 @@ export default async function getConfig({ }); // --------------- output ----------- - webpackConfig.output - .path(absoluteOutput) - .publicPath(publicPath) - .filename('[name].[contenthash:8].js') - .chunkFilename('[name].[contenthash:8].chunk.js'); + webpackConfig.output.path(absoluteOutput).publicPath(publicPath).filename('[name].[contenthash:8].js').chunkFilename('[name].[contenthash:8].chunk.js'); // --------------- resolve ----------- webpackConfig.resolve.extensions.merge(['.mjs', '.js', '.jsx', '.vue', '.ts', '.tsx', '.json', '.wasm']); if (config.alias) { Object.keys(config.alias).forEach((key) => { - webpackConfig.resolve.alias - .set(key, config.alias[key]); + webpackConfig.resolve.alias.set(key, config.alias[key]); }); } @@ -122,9 +105,9 @@ export default async function getConfig({ loader: require.resolve('file-loader'), options: { name: 'static/[name].[hash:8].[ext]', - esModule: false - } - } + esModule: false, + }, + }, }); webpackConfig.module @@ -134,7 +117,7 @@ export default async function getConfig({ .loader(require.resolve('file-loader')) .options({ name: 'static/[name].[hash:8].[ext]', - esModule: false + esModule: false, }); webpackConfig.module @@ -144,7 +127,7 @@ export default async function getConfig({ .loader(require.resolve('file-loader')) .options({ name: 'static/[name].[hash:8].[ext]', - esModule: false + esModule: false, }); webpackConfig.module @@ -153,7 +136,7 @@ export default async function getConfig({ .use('raw-loader') .loader(require.resolve('raw-loader')) .options({ - esModule: false + esModule: false, }); const { targets, browserslist } = getTargetsAndBrowsersList({ config }); @@ -162,7 +145,7 @@ export default async function getConfig({ config, modifyBabelOpts, modifyBabelPresetOpts, - targets + targets, }); // --------------- js ----------- @@ -182,7 +165,8 @@ export default async function getConfig({ } // Don't transpile node_modules return /node_modules/.test(filepath); - }).end() + }) + .end() .use('babel-loader') .loader(require.resolve('babel-loader')) .options(babelOpts); @@ -193,14 +177,16 @@ export default async function getConfig({ webpackConfig.module .rule('js-in-node_modules') .test(/\.(js|mjs)$/) - .include.add(/node_modules/).end() + .include.add(/node_modules/) + .end() .exclude.add((filepath) => { if (transpileDepRegex && transpileDepRegex.test(filepath)) { return true; } return false; - }).end() + }) + .end() .use('babel-loader') .loader(require.resolve('babel-loader')) .options(babelOpts); @@ -211,13 +197,13 @@ export default async function getConfig({ isDev, config, webpackConfig, - browserslist + browserslist, }); // --------------- vue ----------- createVueWebpackConfig({ config, - webpackConfig + webpackConfig, }); // --------------- html ----------- @@ -227,47 +213,50 @@ export default async function getConfig({ config, webpackConfig, headScripts, - isProd + isProd, }); // --------------- copy ----------- - const copyPatterns = [existsSync(join(cwd, 'public')) && { - from: join(cwd, 'public'), - filter: (resourcePath) => { - if (resourcePath.indexOf('.DS_Store') !== -1) { - return false; - } - if (publicCopyIgnore.includes(resourcePath)) { - return false; - } - return true; + const copyPatterns = [ + existsSync(join(cwd, 'public')) && { + from: join(cwd, 'public'), + filter: (resourcePath) => { + if (resourcePath.indexOf('.DS_Store') !== -1) { + return false; + } + if (publicCopyIgnore.includes(resourcePath)) { + return false; + } + return true; + }, + to: absoluteOutput, }, - to: absoluteOutput - }, ...((config.copy || []).map((item) => { - if (typeof item === 'string') { + ...(config.copy || []).map((item) => { + if (typeof item === 'string') { + return { + from: join(cwd, item.from), + to: absoluteOutput, + }; + } return { from: join(cwd, item.from), - to: absoluteOutput + to: join(absoluteOutput, item.to), }; - } - return { - from: join(cwd, item.from), - to: join(absoluteOutput, item.to) - }; - }))].filter(Boolean); + }), + ].filter(Boolean); // const publicCopyIgnore = ['.DS_Store']; if (copyPatterns.length) { - webpackConfig - .plugin('copy') - .use(require.resolve('copy-webpack-plugin'), [{ - patterns: copyPatterns - }]); + webpackConfig.plugin('copy').use(require.resolve('copy-webpack-plugin'), [ + { + patterns: copyPatterns, + }, + ]); } // --------------- define ----------- createDefineWebpackConfig({ config, - webpackConfig + webpackConfig, }); // --------------- 分包 ----------- @@ -278,16 +267,16 @@ export default async function getConfig({ name: 'chunk-vendors', test: /[\\/]node_modules[\\/]/, priority: -10, - chunks: 'initial' + chunks: 'initial', }, common: { name: 'chunk-common', minChunks: 2, priority: -20, chunks: 'initial', - reuseExistingChunk: true - } - } + reuseExistingChunk: true, + }, + }, }); } @@ -295,23 +284,19 @@ export default async function getConfig({ createMinimizerWebpackConfig({ isProd, config, - webpackConfig + webpackConfig, }); // --------------- 构建输出 ---------- - webpackConfig - .plugin('progress') - .use(require.resolve('webpackbar')); + webpackConfig.plugin('progress').use(require.resolve('webpackbar')); - webpackConfig - .plugin('friendly-errors') - .use(require('@soda/friendly-errors-webpack-plugin')); + webpackConfig.plugin('friendly-errors').use(require('@soda/friendly-errors-webpack-plugin')); // --------------- chainwebpack ----------- if (chainWebpack) { await chainWebpack(webpackConfig, { createCSSRule, - webpack + webpack, }); } // 用户配置的 chainWebpack 优先级最高 @@ -319,7 +304,7 @@ export default async function getConfig({ await config.chainWebpack(webpackConfig, { createCSSRule, env, - webpack + webpack, }); } diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/minimizer.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/minimizer.js similarity index 65% rename from packages/fes-preset-built-in/src/plugins/commands/webpackConfig/minimizer.js rename to packages/fes-build-webpack/src/plugins/commands/webpackConfig/minimizer.js index c64e013c..507b8c52 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/minimizer.js +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/minimizer.js @@ -2,7 +2,7 @@ import { deepmerge } from '@fesjs/utils'; const defaultTerserOptions = { compress: { - // turn off flags with small gains to speed up minification + // turn off flags with small gains to speed up minification arrows: false, collapse_vars: false, // 0.3kb comparisons: false, @@ -30,31 +30,21 @@ const defaultTerserOptions = { // required features to drop conditional branches conditionals: true, dead_code: true, - evaluate: true + evaluate: true, }, mangle: { - safari10: true - } + safari10: true, + }, }; -const terserOptions = config => ({ - terserOptions: deepmerge( - defaultTerserOptions, - config.terserOptions || {} - ), - extractComments: false +const terserOptions = (config) => ({ + terserOptions: deepmerge(defaultTerserOptions, config.terserOptions || {}), + extractComments: false, }); - -export default function createMinimizerWebpackConfig({ - isProd, - config, - webpackConfig -}) { +export default function createMinimizerWebpackConfig({ isProd, config, webpackConfig }) { if (isProd) { - webpackConfig.optimization - .minimizer('terser') - .use(require.resolve('terser-webpack-plugin'), [terserOptions(config)]); + webpackConfig.optimization.minimizer('terser').use(require.resolve('terser-webpack-plugin'), [terserOptions(config)]); } if (process.env.FES_ENV === 'test') { webpackConfig.optimization.minimize(false); diff --git a/packages/fes-build-webpack/src/plugins/commands/webpackConfig/pitcher.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/pitcher.js new file mode 100644 index 00000000..0af92651 --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/pitcher.js @@ -0,0 +1,10 @@ +const pitcher = (code) => code; + +export const pitch = function () { + const context = this; + if (/&blockType=config/.test(context.resourceQuery)) { + return ''; + } +}; + +export default pitcher; diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/resolveDefine.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/resolveDefine.js similarity index 95% rename from packages/fes-preset-built-in/src/plugins/commands/webpackConfig/resolveDefine.js rename to packages/fes-build-webpack/src/plugins/commands/webpackConfig/resolveDefine.js index 59a1b8f1..22f2e628 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/resolveDefine.js +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/resolveDefine.js @@ -25,7 +25,7 @@ export default function resolveDefine(opts = {}, raw) { const define = { __VUE_OPTIONS_API__: true, __VUE_PROD_DEVTOOLS__: false, - ...opts.define + ...opts.define, }; for (const key in define) { @@ -36,6 +36,6 @@ export default function resolveDefine(opts = {}, raw) { return { 'process.env': env, - ...define + ...define, }; } diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/vue.js b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/vue.js similarity index 50% rename from packages/fes-preset-built-in/src/plugins/commands/webpackConfig/vue.js rename to packages/fes-build-webpack/src/plugins/commands/webpackConfig/vue.js index 40eef753..e180b9c5 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/vue.js +++ b/packages/fes-build-webpack/src/plugins/commands/webpackConfig/vue.js @@ -1,9 +1,4 @@ -import qs from 'qs'; - -export default function createVueWebpackConfig({ - config, - webpackConfig -}) { +export default function createVueWebpackConfig({ config, webpackConfig }) { webpackConfig.module .rule('vue') .test(/\.vue$/) @@ -11,7 +6,7 @@ export default function createVueWebpackConfig({ .loader(require.resolve('vue-loader')) .options({ babelParserPlugins: ['jsx', 'classProperties', 'decorators-legacy'], - ...(config.vueLoader || {}) + ...(config.vueLoader || {}), }) .end(); @@ -21,11 +16,10 @@ export default function createVueWebpackConfig({ if (!query) { return false; } - const parsed = qs.parse(query.slice(1)); - return parsed.vue != null; - }).use('vue-custom-loader').loader(require.resolve('./pitcher')); + return query.startsWith('?vue&type=custom'); + }) + .use('vue-custom-loader') + .loader(require.resolve('./pitcher')); - webpackConfig - .plugin('vue-loader-plugin') - .use(require('vue-loader').VueLoaderPlugin); + webpackConfig.plugin('vue-loader-plugin').use(require('vue-loader').VueLoaderPlugin); } diff --git a/packages/fes-preset-built-in/src/plugins/features/alias.js b/packages/fes-build-webpack/src/plugins/features/alias.js similarity index 91% rename from packages/fes-preset-built-in/src/plugins/features/alias.js rename to packages/fes-build-webpack/src/plugins/features/alias.js index 85b531d4..234f2eb9 100644 --- a/packages/fes-preset-built-in/src/plugins/features/alias.js +++ b/packages/fes-build-webpack/src/plugins/features/alias.js @@ -7,9 +7,8 @@ export default (api) => { schema(joi) { return joi.object(); }, - default: { - } - } + default: {}, + }, }); api.chainWebpack(async (memo) => { diff --git a/packages/fes-preset-built-in/src/plugins/features/analyze.js b/packages/fes-build-webpack/src/plugins/features/analyze.js similarity index 80% rename from packages/fes-preset-built-in/src/plugins/features/analyze.js rename to packages/fes-build-webpack/src/plugins/features/analyze.js index 50ace33d..2176dccb 100644 --- a/packages/fes-preset-built-in/src/plugins/features/analyze.js +++ b/packages/fes-build-webpack/src/plugins/features/analyze.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'analyze', @@ -13,7 +12,7 @@ export default (api) => { generateStatsFile: joi.boolean(), statsFilename: joi.string(), logLevel: joi.string().valid('info', 'warn', 'error', 'silent'), - defaultSizes: joi.string().valid('stat', 'parsed', 'gzip') + defaultSizes: joi.string().valid('stat', 'parsed', 'gzip'), }) .unknown(true); }, @@ -25,17 +24,13 @@ export default (api) => { generateStatsFile: !!process.env.ANALYZE_DUMP, statsFilename: process.env.ANALYZE_DUMP || 'stats.json', logLevel: process.env.ANALYZE_LOG_LEVEL || 'info', - defaultSizes: 'parsed' // stat // gzip - } + defaultSizes: 'parsed', // stat // gzip + }, }, - enableBy: () => !!process.env.ANALYZE + enableBy: () => !!process.env.ANALYZE, }); api.chainWebpack((webpackConfig) => { - webpackConfig - .plugin('bundle-analyzer') - .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [ - api.config?.analyze || {} - ]); + webpackConfig.plugin('bundle-analyzer').use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin, [api.config?.analyze || {}]); return webpackConfig; }); }; diff --git a/packages/fes-build-webpack/src/plugins/features/autoprefixer.js b/packages/fes-build-webpack/src/plugins/features/autoprefixer.js new file mode 100644 index 00000000..0475423d --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/features/autoprefixer.js @@ -0,0 +1,13 @@ +export default (api) => { + api.describe({ + key: 'autoprefixer', + config: { + default: { + flexbox: 'no-2009', + }, + schema(joi) { + return joi.object().description('postcss autoprefixer, default flexbox: no-2009'); + }, + }, + }); +}; diff --git a/packages/fes-preset-built-in/src/plugins/features/chainWebpack.js b/packages/fes-build-webpack/src/plugins/features/chainWebpack.js similarity index 86% rename from packages/fes-preset-built-in/src/plugins/features/chainWebpack.js rename to packages/fes-build-webpack/src/plugins/features/chainWebpack.js index 88495f0c..d6580d98 100644 --- a/packages/fes-preset-built-in/src/plugins/features/chainWebpack.js +++ b/packages/fes-build-webpack/src/plugins/features/chainWebpack.js @@ -4,7 +4,7 @@ export default (api) => { config: { schema(joi) { return joi.function(); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/copy.js b/packages/fes-build-webpack/src/plugins/features/copy.js similarity index 71% rename from packages/fes-preset-built-in/src/plugins/features/copy.js rename to packages/fes-build-webpack/src/plugins/features/copy.js index 252914ef..e858da1d 100644 --- a/packages/fes-preset-built-in/src/plugins/features/copy.js +++ b/packages/fes-build-webpack/src/plugins/features/copy.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'copy', @@ -8,12 +7,12 @@ export default (api) => { joi.alternatives( joi.object({ from: joi.string(), - to: joi.string() + to: joi.string(), }), - joi.string() - ) + joi.string(), + ), ); - } - } + }, + }, }); }; diff --git a/packages/fes-build-webpack/src/plugins/features/cssLoader.js b/packages/fes-build-webpack/src/plugins/features/cssLoader.js new file mode 100644 index 00000000..8592a51f --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/features/cssLoader.js @@ -0,0 +1,22 @@ +export default (api) => { + api.describe({ + key: 'cssLoader', + config: { + default: {}, + schema(joi) { + return joi + .object({ + url: joi.alternatives(joi.boolean(), joi.function()), + import: joi.alternatives(joi.boolean(), joi.function()), + modules: joi.alternatives(joi.boolean(), joi.string(), joi.object()), + sourceMap: joi.boolean(), + importLoaders: joi.number(), + onlyLocals: joi.boolean(), + esModule: joi.boolean(), + localsConvention: joi.string().valid('asIs', 'camelCase', 'camelCaseOnly', 'dashes', 'dashesOnly'), + }) + .description('more css-loader options see https://webpack.js.org/loaders/css-loader/#options'); + }, + }, + }); +}; diff --git a/packages/fes-preset-built-in/src/plugins/features/define.js b/packages/fes-build-webpack/src/plugins/features/define.js similarity index 78% rename from packages/fes-preset-built-in/src/plugins/features/define.js rename to packages/fes-build-webpack/src/plugins/features/define.js index ca340a48..0ac230b7 100644 --- a/packages/fes-preset-built-in/src/plugins/features/define.js +++ b/packages/fes-build-webpack/src/plugins/features/define.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'define', @@ -6,8 +5,7 @@ export default (api) => { schema(joi) { return joi.object(); }, - default: { - } - } + default: {}, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/devServer.js b/packages/fes-build-webpack/src/plugins/features/devServer.js similarity index 85% rename from packages/fes-preset-built-in/src/plugins/features/devServer.js rename to packages/fes-build-webpack/src/plugins/features/devServer.js index 262c79b5..70efc553 100644 --- a/packages/fes-preset-built-in/src/plugins/features/devServer.js +++ b/packages/fes-build-webpack/src/plugins/features/devServer.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'devServer', @@ -13,17 +12,17 @@ export default (api) => { joi .object({ key: joi.string(), - cert: joi.string() + cert: joi.string(), }) .unknown(), - joi.boolean() + joi.boolean(), ), headers: joi.object(), - writeToDisk: joi.alternatives(joi.boolean(), joi.function()) + writeToDisk: joi.alternatives(joi.boolean(), joi.function()), }) .description('devServer configs') .unknown(true); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/devtool.js b/packages/fes-build-webpack/src/plugins/features/devtool.js similarity index 86% rename from packages/fes-preset-built-in/src/plugins/features/devtool.js rename to packages/fes-build-webpack/src/plugins/features/devtool.js index be5c4d18..0f0006df 100644 --- a/packages/fes-preset-built-in/src/plugins/features/devtool.js +++ b/packages/fes-build-webpack/src/plugins/features/devtool.js @@ -1,11 +1,10 @@ - export default (api) => { api.describe({ key: 'devtool', config: { schema(joi) { return joi.string(); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/exportStatic.js b/packages/fes-build-webpack/src/plugins/features/exportStatic.js similarity index 64% rename from packages/fes-preset-built-in/src/plugins/features/exportStatic.js rename to packages/fes-build-webpack/src/plugins/features/exportStatic.js index e7ddbc76..a841bac8 100644 --- a/packages/fes-preset-built-in/src/plugins/features/exportStatic.js +++ b/packages/fes-build-webpack/src/plugins/features/exportStatic.js @@ -5,13 +5,11 @@ export default (api) => { schema(joi) { return joi.object({ htmlSuffix: joi.boolean(), - dynamicRoot: joi.boolean() + dynamicRoot: joi.boolean(), }); - } + }, }, // TODO: api.EnableBy.config 读取的 userConfig，modifyDefaultConfig hook 修改后对这个判断不起效 - enableBy: () => ('exportStatic' in api.userConfig - ? api.userConfig.exportStatic - : api.config?.exportStatic) + enableBy: () => ('exportStatic' in api.userConfig ? api.userConfig.exportStatic : api.config?.exportStatic), }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/externals.js b/packages/fes-build-webpack/src/plugins/features/externals.js similarity index 91% rename from packages/fes-preset-built-in/src/plugins/features/externals.js rename to packages/fes-build-webpack/src/plugins/features/externals.js index 1c7d3438..c8c74186 100644 --- a/packages/fes-preset-built-in/src/plugins/features/externals.js +++ b/packages/fes-build-webpack/src/plugins/features/externals.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'externals', @@ -6,7 +5,7 @@ export default (api) => { schema(joi) { // https://webpack.js.org/configuration/externals/#externals return joi.alternatives(joi.object(), joi.string(), joi.function()); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/extraBabelPlugins.js b/packages/fes-build-webpack/src/plugins/features/extraBabelPlugins.js similarity index 86% rename from packages/fes-preset-built-in/src/plugins/features/extraBabelPlugins.js rename to packages/fes-build-webpack/src/plugins/features/extraBabelPlugins.js index 0719d858..c70e294b 100644 --- a/packages/fes-preset-built-in/src/plugins/features/extraBabelPlugins.js +++ b/packages/fes-build-webpack/src/plugins/features/extraBabelPlugins.js @@ -1,11 +1,10 @@ - export default (api) => { api.describe({ key: 'extraBabelPlugins', config: { schema(joi) { return joi.array(); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/extraBabelPresets.js b/packages/fes-build-webpack/src/plugins/features/extraBabelPresets.js similarity index 86% rename from packages/fes-preset-built-in/src/plugins/features/extraBabelPresets.js rename to packages/fes-build-webpack/src/plugins/features/extraBabelPresets.js index 7b620e09..73e3aabc 100644 --- a/packages/fes-preset-built-in/src/plugins/features/extraBabelPresets.js +++ b/packages/fes-build-webpack/src/plugins/features/extraBabelPresets.js @@ -1,11 +1,10 @@ - export default (api) => { api.describe({ key: 'extraBabelPresets', config: { schema(joi) { return joi.array(); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/extraPostCSSPlugins.js b/packages/fes-build-webpack/src/plugins/features/extraPostCSSPlugins.js similarity index 86% rename from packages/fes-preset-built-in/src/plugins/features/extraPostCSSPlugins.js rename to packages/fes-build-webpack/src/plugins/features/extraPostCSSPlugins.js index 98dac1fd..96fe3d78 100644 --- a/packages/fes-preset-built-in/src/plugins/features/extraPostCSSPlugins.js +++ b/packages/fes-build-webpack/src/plugins/features/extraPostCSSPlugins.js @@ -1,11 +1,10 @@ - export default (api) => { api.describe({ key: 'extraPostCSSPlugins', config: { schema(joi) { return joi.array(); - } - } + }, + }, }); }; diff --git a/packages/fes-build-webpack/src/plugins/features/html.js b/packages/fes-build-webpack/src/plugins/features/html.js new file mode 100644 index 00000000..db1113e0 --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/features/html.js @@ -0,0 +1,11 @@ +export default (api) => { + api.describe({ + key: 'html', + config: { + schema(joi) { + return joi.object().description('more html-webpack-plugin options see https://github.com/jantimon/html-webpack-plugin#configuration'); + }, + default: {}, + }, + }); +}; diff --git a/packages/fes-preset-built-in/src/plugins/features/inlineLimit.js b/packages/fes-build-webpack/src/plugins/features/inlineLimit.js similarity index 86% rename from packages/fes-preset-built-in/src/plugins/features/inlineLimit.js rename to packages/fes-build-webpack/src/plugins/features/inlineLimit.js index ae8ae0ff..11d75793 100644 --- a/packages/fes-preset-built-in/src/plugins/features/inlineLimit.js +++ b/packages/fes-build-webpack/src/plugins/features/inlineLimit.js @@ -1,11 +1,10 @@ - export default (api) => { api.describe({ key: 'inlineLimit', config: { schema(joi) { return joi.number(); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/lessLoader.js b/packages/fes-build-webpack/src/plugins/features/lessLoader.js similarity index 87% rename from packages/fes-preset-built-in/src/plugins/features/lessLoader.js rename to packages/fes-build-webpack/src/plugins/features/lessLoader.js index 9a892724..a1c08e8c 100644 --- a/packages/fes-preset-built-in/src/plugins/features/lessLoader.js +++ b/packages/fes-build-webpack/src/plugins/features/lessLoader.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'lessLoader', @@ -6,7 +5,7 @@ export default (api) => { default: {}, schema(joi) { return joi.object(); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/nodeModulesTransform.js b/packages/fes-build-webpack/src/plugins/features/nodeModulesTransform.js similarity index 66% rename from packages/fes-preset-built-in/src/plugins/features/nodeModulesTransform.js rename to packages/fes-build-webpack/src/plugins/features/nodeModulesTransform.js index 157272e8..404320c5 100644 --- a/packages/fes-preset-built-in/src/plugins/features/nodeModulesTransform.js +++ b/packages/fes-build-webpack/src/plugins/features/nodeModulesTransform.js @@ -1,16 +1,15 @@ - export default (api) => { api.describe({ key: 'nodeModulesTransform', config: { default: { - exclude: [] + exclude: [], }, schema(joi) { return joi.object({ - exclude: joi.array().items(joi.string()) + exclude: joi.array().items(joi.string()), }); - } - } + }, + }, }); }; diff --git a/packages/fes-build-webpack/src/plugins/features/outputPath.js b/packages/fes-build-webpack/src/plugins/features/outputPath.js new file mode 100644 index 00000000..0b27c6ec --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/features/outputPath.js @@ -0,0 +1,11 @@ +export default (api) => { + api.describe({ + key: 'outputPath', + config: { + default: 'dist', + schema(joi) { + return joi.string().not('src', 'public', 'pages', 'mock', 'config').allow(''); + }, + }, + }); +}; diff --git a/packages/fes-preset-built-in/src/plugins/features/postcssLoader.js b/packages/fes-build-webpack/src/plugins/features/postcssLoader.js similarity index 86% rename from packages/fes-preset-built-in/src/plugins/features/postcssLoader.js rename to packages/fes-build-webpack/src/plugins/features/postcssLoader.js index a7003306..6a681cfe 100644 --- a/packages/fes-preset-built-in/src/plugins/features/postcssLoader.js +++ b/packages/fes-build-webpack/src/plugins/features/postcssLoader.js @@ -1,11 +1,10 @@ - export default (api) => { api.describe({ key: 'postcssLoader', config: { schema(joi) { return joi.object(); - } - } + }, + }, }); }; diff --git a/packages/fes-build-webpack/src/plugins/features/publicPath.js b/packages/fes-build-webpack/src/plugins/features/publicPath.js new file mode 100644 index 00000000..c8e17255 --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/features/publicPath.js @@ -0,0 +1,11 @@ +export default (api) => { + api.describe({ + key: 'publicPath', + config: { + default: '/', + schema(joi) { + return joi.string().regex(/\/$/).error(new Error('config.publicPath must end with /.')); + }, + }, + }); +}; diff --git a/packages/fes-preset-built-in/src/plugins/features/runtimePublicPath.js b/packages/fes-build-webpack/src/plugins/features/runtimePublicPath.js similarity index 82% rename from packages/fes-preset-built-in/src/plugins/features/runtimePublicPath.js rename to packages/fes-build-webpack/src/plugins/features/runtimePublicPath.js index 6d8ed4fe..8345320b 100644 --- a/packages/fes-preset-built-in/src/plugins/features/runtimePublicPath.js +++ b/packages/fes-build-webpack/src/plugins/features/runtimePublicPath.js @@ -1,12 +1,11 @@ - export default (api) => { api.describe({ key: 'runtimePublicPath', config: { schema(joi) { return joi.boolean(); - } + }, }, - default: false + default: false, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/targets.js b/packages/fes-build-webpack/src/plugins/features/targets.js similarity index 85% rename from packages/fes-preset-built-in/src/plugins/features/targets.js rename to packages/fes-build-webpack/src/plugins/features/targets.js index f3fb0ee1..847bd248 100644 --- a/packages/fes-preset-built-in/src/plugins/features/targets.js +++ b/packages/fes-build-webpack/src/plugins/features/targets.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'targets', @@ -8,11 +7,11 @@ export default (api) => { firefox: 64, safari: 10, edge: 13, - ios: 10 + ios: 10, }, schema(joi) { return joi.object(); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/terserOptions.js b/packages/fes-build-webpack/src/plugins/features/terserOptions.js similarity index 86% rename from packages/fes-preset-built-in/src/plugins/features/terserOptions.js rename to packages/fes-build-webpack/src/plugins/features/terserOptions.js index a0178731..1afe1f05 100644 --- a/packages/fes-preset-built-in/src/plugins/features/terserOptions.js +++ b/packages/fes-build-webpack/src/plugins/features/terserOptions.js @@ -1,11 +1,10 @@ - export default (api) => { api.describe({ key: 'terserOptions', config: { schema(joi) { return joi.object(); - } - } + }, + }, }); }; diff --git a/packages/fes-build-webpack/src/plugins/features/vueLoader.js b/packages/fes-build-webpack/src/plugins/features/vueLoader.js new file mode 100644 index 00000000..3f1d3524 --- /dev/null +++ b/packages/fes-build-webpack/src/plugins/features/vueLoader.js @@ -0,0 +1,10 @@ +export default (api) => { + api.describe({ + key: 'vueLoader', + config: { + schema(joi) { + return joi.object({}).description('more vue-loader options see https://vue-loader.vuejs.org/'); + }, + }, + }); +}; diff --git a/packages/fes-build-webpack/src/utils/constants.js b/packages/fes-build-webpack/src/utils/constants.js new file mode 100644 index 00000000..f9766e28 --- /dev/null +++ b/packages/fes-build-webpack/src/utils/constants.js @@ -0,0 +1,6 @@ +import { winPath } from '@fesjs/utils'; +import { dirname } from 'path'; + +export const runtimePath = winPath( + dirname(require.resolve('@fesjs/runtime/package.json')) +); diff --git a/packages/fes-build-webpack/src/utils/generateExports.js b/packages/fes-build-webpack/src/utils/generateExports.js new file mode 100644 index 00000000..23fa254f --- /dev/null +++ b/packages/fes-build-webpack/src/utils/generateExports.js @@ -0,0 +1,60 @@ +import { lodash, winPath } from '@fesjs/utils'; +import assert from 'assert'; +import path from 'path'; + +const reserveLibrarys = ['fes']; // reserve library +// todo 插件导出内容冲突问题待解决 +const reserveExportsNames = [ + 'Link', + 'NavLink', + 'Redirect', + 'dynamic', + 'withRouter', + 'Route' +]; + +export default function generateExports(basePath, { item, fesExportsHook }) { + assert(item.source, 'source should be supplied.'); + const source = path.relative(path.basename(basePath), item.source); + assert( + item.exportAll || item.specifiers, + 'exportAll or specifiers should be supplied.' + ); + assert( + !reserveLibrarys.includes(source), + `${source} is reserve library, Please don't use it.` + ); + if (item.exportAll) { + return `export * from '${winPath(source)}';`; + } + assert( + Array.isArray(item.specifiers), + `specifiers should be Array, but got ${item.specifiers.toString()}.` + ); + const specifiersStrArr = item.specifiers.map((specifier) => { + if (typeof specifier === 'string') { + assert( + !reserveExportsNames.includes(specifier), + `${specifier} is reserve name, you can use 'exported' to set alias.` + ); + assert( + !fesExportsHook[specifier], + `${specifier} is Defined, you can use 'exported' to set alias.` + ); + fesExportsHook[specifier] = true; + return specifier; + } + assert( + lodash.isPlainObject(specifier), + `Configure item context should be Plain Object, but got ${specifier}.` + ); + assert( + specifier.local && specifier.exported, + 'local and exported should be supplied.' + ); + return `${specifier.local} as ${specifier.exported}`; + }); + return `export { ${specifiersStrArr.join(', ')} } from '${winPath( + source + )}';`; +} diff --git a/packages/fes-preset-built-in/src/utils/generateFiles.js b/packages/fes-build-webpack/src/utils/generateFiles.js similarity index 74% rename from packages/fes-preset-built-in/src/utils/generateFiles.js rename to packages/fes-build-webpack/src/utils/generateFiles.js index 1399f1ba..49b436d0 100644 --- a/packages/fes-preset-built-in/src/utils/generateFiles.js +++ b/packages/fes-build-webpack/src/utils/generateFiles.js @@ -8,7 +8,7 @@ export default async ({ api, watch }) => { api.logger.debug('generate files'); await api.applyPlugins({ key: 'onGenerateFiles', - type: api.ApplyPluginsType.event + type: api.ApplyPluginsType.event, }); } @@ -27,13 +27,13 @@ export default async ({ api, watch }) => { const watcher = chokidar.watch(path, { // ignore .dotfiles and _mock.js ignored: /(^|[/\\])(_mock.js$|\..)/, - ignoreInitial: true + ignoreInitial: true, }); watcher.on( 'all', lodash.throttle(async () => { await generate(); - }, 100) + }, 100), ); watchers.push(watcher); } @@ -42,16 +42,11 @@ export default async ({ api, watch }) => { const watcherPaths = await api.applyPlugins({ key: 'addTmpGenerateWatcherPaths', type: api.ApplyPluginsType.add, - initialValue: [ - paths.absPagesPath, - getAppPath(paths.absSrcPath) - ] + initialValue: [paths.absPagesPath, getAppPath(paths.absSrcPath)], + }); + lodash.uniq(watcherPaths.map((p) => winPath(p))).forEach((p) => { + createWatcher(p); }); - lodash - .uniq(watcherPaths.map(p => winPath(p))) - .forEach((p) => { - createWatcher(p); - }); } return unwatch; diff --git a/packages/fes-preset-built-in/src/utils/getAppEntryPath.js b/packages/fes-build-webpack/src/utils/getAppEntryPath.js similarity index 100% rename from packages/fes-preset-built-in/src/utils/getAppEntryPath.js rename to packages/fes-build-webpack/src/utils/getAppEntryPath.js diff --git a/packages/fes-compiler/src/service/utils/pluginUtils.js b/packages/fes-compiler/src/service/utils/pluginUtils.js index 8259a1f0..9b7631b7 100644 --- a/packages/fes-compiler/src/service/utils/pluginUtils.js +++ b/packages/fes-compiler/src/service/utils/pluginUtils.js @@ -1,19 +1,11 @@ -import { - dirname, join, basename, relative, extname -} from 'path'; -import { - compatESModuleRequire, - resolve, - winPath, - pkgUp, - lodash -} from '@fesjs/utils'; +import { dirname, join, basename, relative, extname } from 'path'; +import { compatESModuleRequire, resolve, winPath, pkgUp, lodash } from '@fesjs/utils'; import { PluginType } from '../enums'; const RE = { [PluginType.plugin]: /^(@fesjs\/|@webank\/fes-|fes-)plugin-/, - [PluginType.preset]: /^(@fesjs\/|@webank\/fes-|fes-)preset-/ + [PluginType.preset]: /^(@fesjs\/|@webank\/fes-|fes-)preset-/, }; export function isPluginOrPreset(type, name) { @@ -25,25 +17,36 @@ export function isPluginOrPreset(type, name) { return re.test(name); } +function filterPluginAndPreset(type, pkg) { + return Object.keys(pkg.devDependencies || {}) + .concat(Object.keys(pkg.dependencies || {})) + .filter(isPluginOrPreset.bind(null, type)); +} + +function filterBuilder(pkg) { + return Object.keys(pkg.devDependencies || {}) + .concat(Object.keys(pkg.dependencies || {})) + .filter((name) => /^@fesjs\/build-/.test(name)); +} + export function getPluginsOrPresets(type, opts) { const upperCaseType = type.toUpperCase(); return [ - // dependencies // opts - ...((opts[type === PluginType.preset ? 'presets' : 'plugins']) || []), + ...(opts[type === PluginType.preset ? 'presets' : 'plugins'] || []), // env ...(process.env[`FES_${upperCaseType}S`] || '').split(',').filter(Boolean), - ...Object.keys(opts.pkg.devDependencies || {}) - .concat(Object.keys(opts.pkg.dependencies || {})) - .filter(isPluginOrPreset.bind(null, type)), + ...filterPluginAndPreset(type, opts.pkg), + // 构建只允许是 presets + ...(type === PluginType.preset ? filterBuilder(opts.pkg) : []), // user config - ...((opts[ - type === PluginType.preset ? 'userConfigPresets' : 'userConfigPlugins' - ]) || []) - ].map(path => resolve.sync(path, { - basedir: opts.cwd, - extensions: ['.js', '.ts'] - })); + ...(opts[type === PluginType.preset ? 'userConfigPresets' : 'userConfigPlugins'] || []), + ].map((path) => + resolve.sync(path, { + basedir: opts.cwd, + extensions: ['.js', '.ts'], + }), + ); } // e.g. @@ -52,7 +55,7 @@ export function getPluginsOrPresets(type, opts) { function nameToKey(name) { return name .split('.') - .map(part => lodash.camelCase(part)) + .map((part) => lodash.camelCase(part)) .join('.'); } @@ -70,8 +73,7 @@ export function pathToObj({ path, type, cwd }) { if (pkgJSONPath) { // eslint-disable-next-line pkg = require(pkgJSONPath); - isPkgPlugin = winPath(join(dirname(pkgJSONPath), pkg.main || 'index.js')) - === winPath(path); + isPkgPlugin = winPath(join(dirname(pkgJSONPath), pkg.main || 'index.js')) === winPath(path); } let id; @@ -87,9 +89,7 @@ export function pathToObj({ path, type, cwd }) { id = id.replace('@fesjs/preset-built-in/lib/plugins', '@@'); id = id.replace(/\.js$/, ''); - const key = isPkgPlugin - ? pkgNameToKey(pkg.name, type) - : nameToKey(basename(path, extname(path))); + const key = isPkgPlugin ? pkgNameToKey(pkg.name, type) : nameToKey(basename(path, extname(path))); return { id, @@ -106,28 +106,32 @@ export function pathToObj({ path, type, cwd }) { throw new Error(`Register ${path} failed, since ${e.message}`); } }, - defaultConfig: null + defaultConfig: null, }; } export function resolvePresets(opts) { const type = PluginType.preset; const presets = [...getPluginsOrPresets(type, opts)]; - return presets.map(path => pathToObj({ - type, - path, - cwd: opts.cwd - })); + return presets.map((path) => + pathToObj({ + type, + path, + cwd: opts.cwd, + }), + ); } export function resolvePlugins(opts) { const type = PluginType.plugin; const plugins = getPluginsOrPresets(type, opts); - return plugins.map(path => pathToObj({ - path, - type, - cwd: opts.cwd - })); + return plugins.map((path) => + pathToObj({ + path, + type, + cwd: opts.cwd, + }), + ); } export function isValidPlugin(plugin) { diff --git a/packages/fes-preset-built-in/package.json b/packages/fes-preset-built-in/package.json index 76f0467a..d42020b3 100644 --- a/packages/fes-preset-built-in/package.json +++ b/packages/fes-preset-built-in/package.json @@ -25,59 +25,14 @@ "access": "public" }, "dependencies": { - "@babel/core": "^7.12.13", - "@babel/plugin-proposal-do-expressions": "^7.12.13", - "@babel/plugin-proposal-export-default-from": "^7.12.13", - "@babel/plugin-proposal-function-bind": "^7.12.13", - "@babel/plugin-proposal-pipeline-operator": "^7.12.13", - "@babel/plugin-transform-runtime": "^7.12.13", - "@babel/preset-env": "^7.12.13", - "@babel/preset-typescript": "^7.15.0", "@fesjs/compiler": "^2.0.5", "@fesjs/utils": "^2.0.4", - "@soda/friendly-errors-webpack-plugin": "^1.8.0", - "@vitejs/plugin-vue": "^2.2.4", - "@vitejs/plugin-vue-jsx": "^1.3.8", - "@vue/babel-plugin-jsx": "^1.0.2", - "autoprefixer": "^10.2.4", - "babel-loader": "^8.2.2", - "babel-plugin-import": "1.13.3", "body-parser": "^1.19.0", - "cli-highlight": "^2.1.4", - "cliui": "7.0.4", - "connect-history-api-fallback": "^1.6.0", "cookie-parser": "^1.4.5", - "copy-webpack-plugin": "^7.0.0", - "core-js": "^3.8.3", - "css-loader": "^5.0.1", - "css-minimizer-webpack-plugin": "^3.0.0", "envinfo": "^7.7.3", - "file-loader": "^6.2.0", - "html-webpack-plugin": "^5.0.0", - "html-webpack-tags-plugin": "^3.0.0", - "less": "3.9.0", - "less-loader": "^8.0.0", - "mini-css-extract-plugin": "^1.3.5", - "mockjs": "^1.1.0", - "postcss": "8.3.0", - "postcss-flexbugs-fixes": "^5.0.2", - "postcss-loader": "^4.2.0", - "postcss-safe-parser": "^5.0.2", - "qs": "^6.10.2", - "raw-loader": "^4.0.2", - "style-loader": "^2.0.0", - "url-loader": "^4.1.1", - "vite": "^2.8.6", - "vue-loader": "^16.1.2", - "webpack": "^5.24.2", - "webpack-bundle-analyzer": "^4.4.0", - "webpack-chain": "^6.5.1", - "webpack-dev-server": "^3.11.2", - "webpackbar": "^5.0.0-3" + "mockjs": "^1.1.0" }, "peerDependencies": { - "@vue/compiler-sfc": "^3.0.5", - "core-js": "^3.8.3" - }, - "devDependencies": {} -} + "@vue/compiler-sfc": "^3.0.5" + } +} \ No newline at end of file diff --git a/packages/fes-preset-built-in/src/index.js b/packages/fes-preset-built-in/src/index.js index 10e82558..9da5e5aa 100644 --- a/packages/fes-preset-built-in/src/index.js +++ b/packages/fes-preset-built-in/src/index.js @@ -11,50 +11,22 @@ export default function () { require.resolve('./plugins/generateFiles/fes'), // bundle configs - require.resolve('./plugins/features/alias'), - require.resolve('./plugins/features/analyze'), - require.resolve('./plugins/features/autoprefixer'), require.resolve('./plugins/features/base'), - require.resolve('./plugins/features/chainWebpack'), - require.resolve('./plugins/features/cssLoader'), - require.resolve('./plugins/features/copy'), require.resolve('./plugins/features/checkVuePackage'), - require.resolve('./plugins/features/define'), - require.resolve('./plugins/features/devServer'), - require.resolve('./plugins/features/devtool'), require.resolve('./plugins/features/dynamicImport'), - require.resolve('./plugins/features/externals'), - require.resolve('./plugins/features/exportStatic'), - require.resolve('./plugins/features/extraBabelPlugins'), - require.resolve('./plugins/features/extraBabelPresets'), - require.resolve('./plugins/features/extraPostCSSPlugins'), - require.resolve('./plugins/features/html'), require.resolve('./plugins/features/globalCSS'), - require.resolve('./plugins/features/inlineLimit'), - require.resolve('./plugins/features/lessLoader'), require.resolve('./plugins/features/mountElementId'), require.resolve('./plugins/features/mock'), - require.resolve('./plugins/features/outputPath'), require.resolve('./plugins/features/plugins'), - require.resolve('./plugins/features/postcssLoader'), require.resolve('./plugins/features/proxy'), - require.resolve('./plugins/features/publicPath'), - require.resolve('./plugins/features/runtimePublicPath'), require.resolve('./plugins/features/singular'), - require.resolve('./plugins/features/targets'), - require.resolve('./plugins/features/terserOptions'), - require.resolve('./plugins/features/nodeModulesTransform'), - require.resolve('./plugins/features/vueLoader'), - // misc - require.resolve('./plugins/misc/route'), + // route + require.resolve('./plugins/route'), // commands - require.resolve('./plugins/commands/build'), - require.resolve('./plugins/commands/dev'), require.resolve('./plugins/commands/help'), require.resolve('./plugins/commands/info'), - require.resolve('./plugins/commands/webpack') - ] + ], }; } diff --git a/packages/fes-preset-built-in/src/plugins/commands/dev/index.js b/packages/fes-preset-built-in/src/plugins/commands/dev/index.js deleted file mode 100644 index 1e14d9b6..00000000 --- a/packages/fes-preset-built-in/src/plugins/commands/dev/index.js +++ /dev/null @@ -1,227 +0,0 @@ -/** - * @copy 该文件代码大部分出自 umi，有需要请参考： - * https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/dev/dev.ts - */ -import { createServer } from 'vite'; -import vue from '@vitejs/plugin-vue'; -import vueJsx from '@vitejs/plugin-vue-jsx'; -import SFCConfigBlockPlugin from './SFCConfigBlockPlugin'; - -const assert = require('assert'); - -export default (api) => { - const { - env, - paths, - utils: { chalk, portfinder }, - } = api; - - const unwatchs = []; - let port; - let hostname; - let server; - - function destroy() { - for (const unwatch of unwatchs) { - unwatch(); - } - server?.close(); - } - - api.registerCommand({ - command: 'dev', - description: 'start a local http service for development', - options: [ - { - name: '--port', - description: 'http service port, like 8080', - }, - { - name: '--https', - description: 'whether to turn on the https service', - }, - ], - async fn({ args = {} }) { - const { cleanTmpPathExceptCache } = require('../buildDevUtils'); - const generateFiles = require('../../../utils/generateFiles').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'; - - process.send({ - type: 'UPDATE_PORT', - port, - }); - - // enable https - // const isHTTPS = process.env.HTTPS || args.https; - - cleanTmpPathExceptCache({ - absTmpPath: paths.absTmpPath, - }); - const watch = process.env.WATCH !== 'none'; - - // generate files - const unwatchGenerateFiles = await generateFiles({ - api, - watch, - }); - 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); - } - - server = await createServer({ - mode: 'development', - plugins: [vue(), SFCConfigBlockPlugin, vueJsx()], - configFile: false, - resolve: { - alias: { - '@': paths.absSrcPath, - '@@': paths.absTmpPath, - '@fesInner': '/', - }, - }, - optimizeDeps: { - // exclude: ['@fesjs/fes'], - }, - server: { - port: 8000, - }, - }); - await server.listen(); - - server.printUrls(); - - // dev - // const { bundleConfig } = await getBundleAndConfigs({ api }); - - // const beforeMiddlewares = await api.applyPlugins({ - // key: 'addBeforeMiddlewares', - // type: api.ApplyPluginsType.add, - // initialValue: [], - // args: {} - // }); - // const middlewares = await api.applyPlugins({ - // key: 'addMiddlewares', - // type: api.ApplyPluginsType.add, - // initialValue: [], - // args: {} - // }); - // const { startDevServer } = require('./devServer'); - // server = startDevServer({ - // webpackConfig: bundleConfig, - // host: hostname, - // port, - // proxy: api.config.proxy, - // https: isHTTPS, - // beforeMiddlewares: [...beforeMiddlewares, createRouteMiddleware(api)], - // afterMiddlewares: [...middlewares], - // customerDevServerConfig: api.config.devServer - // }); - - return { - destroy, - }; - }, - }); - - api.registerMethod({ - name: 'getPort', - fn() { - assert(env === 'development', 'api.getPort() is only valid in development.'); - return port; - }, - }); - - api.registerMethod({ - name: 'getHostname', - fn() { - assert(env === 'development', 'api.getHostname() is only valid in development.'); - return hostname; - }, - }); - - api.registerMethod({ - name: 'getServer', - fn() { - assert(env === 'development', 'api.getServer() is only valid in development.'); - return server; - }, - }); - - api.registerMethod({ - name: 'restartServer', - fn() { - console.log(chalk.gray('Try to restart dev server...')); - destroy(); - process.send({ - type: 'RESTART', - }); - }, - }); -}; diff --git a/packages/fes-preset-built-in/src/plugins/commands/help/index.js b/packages/fes-preset-built-in/src/plugins/commands/help/index.js index c4350c25..010a853b 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/help/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/help/index.js @@ -1,11 +1,9 @@ - - export default function (api) { api.registerCommand({ command: 'help', description: 'show command helps', async fn({ program }) { program.outputHelp(); - } + }, }); } diff --git a/packages/fes-preset-built-in/src/plugins/commands/info/index.js b/packages/fes-preset-built-in/src/plugins/commands/info/index.js index 72268c9d..b3108057 100644 --- a/packages/fes-preset-built-in/src/plugins/commands/info/index.js +++ b/packages/fes-preset-built-in/src/plugins/commands/info/index.js @@ -1,24 +1,24 @@ - export default function (api) { api.registerCommand({ command: 'info', description: 'print debugging information about your environment', async fn() { - return require('envinfo').run( - { - System: ['OS', 'CPU'], - Binaries: ['Node', 'Yarn', 'npm'], - Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'], - npmPackages: ['@fesjs/fes', 'vue', 'vue-router'], - npmGlobalPackages: ['@fesjs/fes'] - }, - { - showNotFound: true, - duplicates: true, - fullTree: true - } - ) + return require('envinfo') + .run( + { + System: ['OS', 'CPU'], + Binaries: ['Node', 'Yarn', 'npm'], + Browsers: ['Chrome', 'Edge', 'Firefox', 'Safari'], + npmPackages: ['@fesjs/fes', 'vue', 'vue-router'], + npmGlobalPackages: ['@fesjs/fes'], + }, + { + showNotFound: true, + duplicates: true, + fullTree: true, + }, + ) .then(console.log); - } + }, }); } diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js b/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js deleted file mode 100644 index 013f1e8f..00000000 --- a/packages/fes-preset-built-in/src/plugins/commands/webpack/index.js +++ /dev/null @@ -1,50 +0,0 @@ -export default function (api) { - api.registerCommand({ - command: 'webpack', - description: 'inspect webpack configurations', - options: [{ - name: '--rule ', - description: 'inspect a specific module rule' - }, { - name: '--plugin ', - description: 'inspect a specific plugin' - }, { - name: '--rules', - description: 'list all module rule names' - }, { - name: '--plugins', - description: 'list all plugin names' - }, { - name: '--verbose', - description: 'show full function definitions in output' - }], - async fn({ options }) { - const assert = require('assert'); - const { getBundleAndConfigs } = require('../buildDevUtils'); - const { toString } = require('webpack-chain'); - const { highlight } = require('cli-highlight'); - const { bundleConfig } = await getBundleAndConfigs({ api }); - - let config = bundleConfig; - assert(config, 'No valid config found with fes entry.'); - - if (options.rule) { - config = config.module.rules.find( - r => r.__ruleNames[0] === options.rule - ); - } else if (options.plugin) { - config = config.plugins.find( - p => p.__pluginName === options.plugin - ); - } else if (options.rules) { - config = config.module.rules.map(r => r.__ruleNames[0]); - } else if (options.plugins) { - config = config.plugins.map( - p => p.__pluginName || p.constructor.name - ); - } - - console.log(highlight(toString(config, { verbose: options.verbose }), { language: 'js' })); - } - }); -} diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/css.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/css.js deleted file mode 100644 index 24fd6f67..00000000 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/css.js +++ /dev/null @@ -1,133 +0,0 @@ -// css less post-css mini-css css 压缩 -// extraPostCSSPlugins -// postcssLoader -// lessLoader -// css-loader -// 支持 热加载 -// 性能优化 -// css 压缩 https://github.com/webpack-contrib/css-minimizer-webpack-plugin -// 根据 entry 进行代码块拆分 -// 根据 entry 将文件输出到不同的文件夹 - -import { deepmerge } from '@fesjs/utils'; - -function createRules({ - isDev, - webpackConfig, - config, - lang, - test, - loader, - options, - browserslist, - styleLoaderOption -}) { - function applyLoaders(rule, isCSSModules) { - if (isDev) { - rule.use('extra-css-loader') - .loader(require.resolve('style-loader')) - .options(Object.assign({}, styleLoaderOption)); - } else { - rule.use('extra-css-loader') - .loader(require('mini-css-extract-plugin').loader) - .options({ - }); - } - - rule.use('css-loader') - .loader(require.resolve('css-loader')) - .options( - deepmerge( - { - importLoaders: 1, - // https://webpack.js.org/loaders/css-loader/#onlylocals - ...(isCSSModules - ? { - modules: { - localIdentName: '[local]___[hash:base64:5]' - } - } - : {}) - }, - config.cssLoader || {} - ) - ); - - rule.use('postcss-loader') - .loader(require.resolve('postcss-loader')) - .options(deepmerge({ - postcssOptions: () => ({ - plugins: [ - // https://github.com/luisrudge/postcss-flexbugs-fixes - require('postcss-flexbugs-fixes'), - require('postcss-safe-parser'), - [require('autoprefixer'), { ...config.autoprefixer, overrideBrowserslist: browserslist }], - ...(config.extraPostCSSPlugins ? config.extraPostCSSPlugins : []) - ] - }) - }, config.postcssLoader || {})); - - if (loader) { - rule.use(loader) - .loader(require.resolve(loader)) - .options(options); - } - } - - const rule = webpackConfig.module.rule(lang).test(test); - applyLoaders(rule.oneOf('css-modules').resourceQuery(/module/), true); - applyLoaders(rule.oneOf('css'), false); -} - -export default function createCssWebpackConfig({ - isDev, - config, - webpackConfig, - browserslist -}) { - createRules({ - isDev, - webpackConfig, - config, - lang: 'css', - test: /\.css$/, - browserslist - }); - - createRules({ - isDev, - webpackConfig, - config, - lang: 'less', - test: /\.less$/, - loader: 'less-loader', - options: { - lessOptions: { - javascriptEnabled: true, - ...config.lessLoader - } - }, - browserslist - }); - - if (!isDev) { - webpackConfig.plugin('extra-css') - .use(require.resolve('mini-css-extract-plugin'), [{ - filename: '[name].[contenthash:8].css', - chunkFilename: '[id].[contenthash:8].css' - }]); - webpackConfig.optimization - .minimizer('css') - .use(require.resolve('css-minimizer-webpack-plugin'), [{}]); - } - - return (options) => { - createRules({ - isDev, - config, - webpackConfig, - browserslist, - ...options - }); - }; -} diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/define.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/define.js deleted file mode 100644 index 1f07fc8e..00000000 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/define.js +++ /dev/null @@ -1,12 +0,0 @@ -import webpack from 'webpack'; -import resolveDefine from './resolveDefine'; - -export default function createDefineWebpackConfig({ - config, - webpackConfig -}) { - webpackConfig.plugin('define') - .use(webpack.DefinePlugin, [ - resolveDefine(config) - ]); -} diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index-default.html b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index-default.html deleted file mode 100644 index cf7300b6..00000000 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/index-default.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - <%= htmlWebpackPlugin.options.title %> - - -
- - diff --git a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/pitcher.js b/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/pitcher.js deleted file mode 100644 index 1f944b43..00000000 --- a/packages/fes-preset-built-in/src/plugins/commands/webpackConfig/pitcher.js +++ /dev/null @@ -1,13 +0,0 @@ -import qs from 'qs'; - -const pitcher = code => code; - -export const pitch = function () { - const context = this; - const query = qs.parse(context.resourceQuery.slice(1)); - if (query.type === 'custom' && query.blockType === 'config') { - return ''; - } -}; - -export default pitcher; diff --git a/packages/fes-preset-built-in/src/plugins/features/autoprefixer.js b/packages/fes-preset-built-in/src/plugins/features/autoprefixer.js deleted file mode 100644 index 84f48abb..00000000 --- a/packages/fes-preset-built-in/src/plugins/features/autoprefixer.js +++ /dev/null @@ -1,16 +0,0 @@ - -export default (api) => { - api.describe({ - key: 'autoprefixer', - config: { - default: { - flexbox: 'no-2009' - }, - schema(joi) { - return joi - .object() - .description('postcss autoprefixer, default flexbox: no-2009'); - } - } - }); -}; diff --git a/packages/fes-preset-built-in/src/plugins/features/base.js b/packages/fes-preset-built-in/src/plugins/features/base.js index 42e4f239..28f3a117 100644 --- a/packages/fes-preset-built-in/src/plugins/features/base.js +++ b/packages/fes-preset-built-in/src/plugins/features/base.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'base', @@ -6,7 +5,7 @@ export default (api) => { default: '', schema(joi) { return joi.string().allow(''); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js b/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js index ea94d33a..bb0d1da3 100644 --- a/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js +++ b/packages/fes-preset-built-in/src/plugins/features/checkVuePackage.js @@ -7,22 +7,19 @@ export default (api) => { schema(joi) { return joi.object(); }, - default: { - } - } + default: {}, + }, }); api.onStart(() => { // eslint-disable-next-line import/no-extraneous-dependencies const vuePkg = require('vue/package.json'); const vueCompilerPkg = require('@vue/compiler-sfc/package.json'); - if ( - !semver.satisfies(vuePkg.version, `~${vueCompilerPkg.version.replace(/\d+$/, '0')}`, { includePrerelease: true }) - ) { + if (!semver.satisfies(vuePkg.version, `~${vueCompilerPkg.version.replace(/\d+$/, '0')}`, { includePrerelease: true })) { console.log( chalk.red( - `You are using vue@${vuePkg.version}, requires @vue/compiler-sfc@${vuePkg.version}.\nPlease upgrade your @vue/compiler-sfc@${vueCompilerPkg.version} version.` - ) + `You are using vue@${vuePkg.version}, requires @vue/compiler-sfc@${vuePkg.version}.\nPlease upgrade your @vue/compiler-sfc@${vueCompilerPkg.version} version.`, + ), ); process.exit(1); } diff --git a/packages/fes-preset-built-in/src/plugins/features/cssLoader.js b/packages/fes-preset-built-in/src/plugins/features/cssLoader.js deleted file mode 100644 index d2019f49..00000000 --- a/packages/fes-preset-built-in/src/plugins/features/cssLoader.js +++ /dev/null @@ -1,37 +0,0 @@ - -export default (api) => { - api.describe({ - key: 'cssLoader', - config: { - default: {}, - schema(joi) { - return joi - .object({ - url: joi.alternatives(joi.boolean(), joi.function()), - import: joi.alternatives(joi.boolean(), joi.function()), - modules: joi.alternatives( - joi.boolean(), - joi.string(), - joi.object() - ), - sourceMap: joi.boolean(), - importLoaders: joi.number(), - onlyLocals: joi.boolean(), - esModule: joi.boolean(), - localsConvention: joi - .string() - .valid( - 'asIs', - 'camelCase', - 'camelCaseOnly', - 'dashes', - 'dashesOnly' - ) - }) - .description( - 'more css-loader options see https://webpack.js.org/loaders/css-loader/#options' - ); - } - } - }); -}; diff --git a/packages/fes-preset-built-in/src/plugins/features/dynamicImport.js b/packages/fes-preset-built-in/src/plugins/features/dynamicImport.js index d24cbaa3..90be6b76 100644 --- a/packages/fes-preset-built-in/src/plugins/features/dynamicImport.js +++ b/packages/fes-preset-built-in/src/plugins/features/dynamicImport.js @@ -1,12 +1,11 @@ - export default (api) => { api.describe({ key: 'dynamicImport', config: { schema(joi) { return joi.boolean(); - } + }, }, - default: false + default: false, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/globalCSS.js b/packages/fes-preset-built-in/src/plugins/features/globalCSS.js index 2fd7fb8a..195d2f2d 100644 --- a/packages/fes-preset-built-in/src/plugins/features/globalCSS.js +++ b/packages/fes-preset-built-in/src/plugins/features/globalCSS.js @@ -4,25 +4,14 @@ import { existsSync } from 'fs'; export default (api) => { const { paths, - utils: { winPath } + utils: { winPath }, } = api; const { absSrcPath = '', absTmpPath = '' } = paths; - const files = [ - 'global.css', - 'global.less', - 'global.scss', - 'global.sass', - 'global.styl', - 'global.stylus' - ]; + const files = ['global.css', 'global.less', 'global.scss', 'global.sass', 'global.styl', 'global.stylus']; const globalCSSFile = files - .map(file => join(absSrcPath || '', file)) - .filter(file => existsSync(file)) + .map((file) => join(absSrcPath || '', file)) + .filter((file) => existsSync(file)) .slice(0, 1); - api.addEntryCodeAhead( - () => `${globalCSSFile - .map(file => `require('${winPath(relative(absTmpPath, file))}');`) - .join('')}` - ); + api.addEntryCodeAhead(() => `${globalCSSFile.map((file) => `require('${winPath(relative(absTmpPath, file))}');`).join('')}`); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/html.js b/packages/fes-preset-built-in/src/plugins/features/html.js deleted file mode 100644 index 5a1f1734..00000000 --- a/packages/fes-preset-built-in/src/plugins/features/html.js +++ /dev/null @@ -1,16 +0,0 @@ -export default (api) => { - api.describe({ - key: 'html', - config: { - schema(joi) { - return joi - .object() - .description( - 'more html-webpack-plugin options see https://github.com/jantimon/html-webpack-plugin#configuration' - ); - }, - default: { - } - } - }); -}; diff --git a/packages/fes-preset-built-in/src/plugins/features/mock.js b/packages/fes-preset-built-in/src/plugins/features/mock.js index 4baba212..097c2e4a 100644 --- a/packages/fes-preset-built-in/src/plugins/features/mock.js +++ b/packages/fes-preset-built-in/src/plugins/features/mock.js @@ -25,7 +25,7 @@ export default (api) => { }); api.babelRegister.setOnlyMap({ key: 'mock', - value: [...paths, ...requireDeps] + value: [...paths, ...requireDeps], }); }; @@ -34,9 +34,9 @@ export default (api) => { config: { schema(joi) { return joi.alternatives(joi.boolean(), joi.object()); - } + }, }, - enableBy: () => process.env.NODE_ENV === 'development' + enableBy: () => process.env.NODE_ENV === 'development', }); // 对 array、object 遍历处理 @@ -57,11 +57,11 @@ export default (api) => { // 默认配置 const option = { headers: { - 'Cache-Control': 'no-cache' + 'Cache-Control': 'no-cache', }, statusCode: 200, cookies: [], - timeout: 0 + timeout: 0, }; if (len === 0) return option; if (len === 1) { @@ -69,12 +69,9 @@ export default (api) => { if (lodash.isPlainObject(newOption)) { traversalHandler(newOption, (value, key) => { if (key === 'headers') { - traversalHandler( - newOption.headers, - (headervalue, headerkey) => { - option.headers[headerkey] = newOption.headers[headerkey]; - } - ); + traversalHandler(newOption.headers, (headervalue, headerkey) => { + option.headers[headerkey] = newOption.headers[headerkey]; + }); } else { option[key] = newOption[key]; } @@ -107,9 +104,7 @@ export default (api) => { // mock打开情况下，配置的过滤前缀 const mockPrefixTemp = api.config.mock.prefix || mockPrefix; - mockPrefix = mockPrefixTemp === mockPrefix - ? mockPrefixTemp - : `${mockPrefixTemp}/`; + mockPrefix = mockPrefixTemp === mockPrefix ? mockPrefixTemp : `${mockPrefixTemp}/`; // mock文件处理 mockFile = parsePath('./mock.js'); if (!existsSync(mockFile)) { @@ -141,9 +136,7 @@ export default (api) => { return next(); } // 请求以 cgiMock.prefix 开头，匹配处理 - const matchRequet = requestList.find( - item => req.path.search(item.url) !== -1 - ); + const matchRequet = requestList.find((item) => req.path.search(item.url) !== -1); if (!matchRequet) { return next(); } @@ -167,10 +160,7 @@ export default (api) => { // do result if (lodash.isFunction(matchRequet.result)) { matchRequet.result(req, res); - } else if ( - lodash.isArray(matchRequet.result) - || lodash.isPlainObject(matchRequet.result) - ) { + } else if (lodash.isArray(matchRequet.result) || lodash.isPlainObject(matchRequet.result)) { !matchRequet.type && res.type('json'); res.json(matchRequet.result); } else { @@ -191,15 +181,13 @@ export default (api) => { api.onStart(() => { // 获取mock配置: 是否打开 - mockFlag = lodash.isPlainObject(api.config.mock) - ? true - : api.config.mock; + mockFlag = lodash.isPlainObject(api.config.mock) ? true : api.config.mock; if (!mockFlag) return; loadMock = createMock(); return chokidar .watch(mockFile, { - ignoreInitial: true + ignoreInitial: true, }) .on('change', () => { api.logger.info('mock.js changed，reload'); diff --git a/packages/fes-preset-built-in/src/plugins/features/mountElementId.js b/packages/fes-preset-built-in/src/plugins/features/mountElementId.js index 11a7a105..87f000fd 100644 --- a/packages/fes-preset-built-in/src/plugins/features/mountElementId.js +++ b/packages/fes-preset-built-in/src/plugins/features/mountElementId.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'mountElementId', @@ -6,7 +5,7 @@ export default (api) => { default: 'app', schema(joi) { return joi.string().allow(''); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/outputPath.js b/packages/fes-preset-built-in/src/plugins/features/outputPath.js deleted file mode 100644 index 93e259a4..00000000 --- a/packages/fes-preset-built-in/src/plugins/features/outputPath.js +++ /dev/null @@ -1,14 +0,0 @@ -export default (api) => { - api.describe({ - key: 'outputPath', - config: { - default: 'dist', - schema(joi) { - return joi - .string() - .not('src', 'public', 'pages', 'mock', 'config') - .allow(''); - } - } - }); -}; diff --git a/packages/fes-preset-built-in/src/plugins/features/plugins.js b/packages/fes-preset-built-in/src/plugins/features/plugins.js index 9967bb95..4efcb6a3 100644 --- a/packages/fes-preset-built-in/src/plugins/features/plugins.js +++ b/packages/fes-preset-built-in/src/plugins/features/plugins.js @@ -1,11 +1,10 @@ - export default (api) => { api.describe({ key: 'plugins', config: { schema(joi) { return joi.array().items(joi.string()); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/proxy.js b/packages/fes-preset-built-in/src/plugins/features/proxy.js index 9c13de1b..54680879 100644 --- a/packages/fes-preset-built-in/src/plugins/features/proxy.js +++ b/packages/fes-preset-built-in/src/plugins/features/proxy.js @@ -1,4 +1,3 @@ - export default (api) => { api.describe({ key: 'proxy', @@ -8,7 +7,7 @@ export default (api) => { }, schema(joi) { return joi.object(); - } - } + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/publicPath.js b/packages/fes-preset-built-in/src/plugins/features/publicPath.js deleted file mode 100644 index 57548e70..00000000 --- a/packages/fes-preset-built-in/src/plugins/features/publicPath.js +++ /dev/null @@ -1,14 +0,0 @@ -export default (api) => { - api.describe({ - key: 'publicPath', - config: { - default: '/', - schema(joi) { - return joi - .string() - .regex(/\/$/) - .error(new Error('config.publicPath must end with /.')); - } - } - }); -}; diff --git a/packages/fes-preset-built-in/src/plugins/features/singular.js b/packages/fes-preset-built-in/src/plugins/features/singular.js index 5a6915e6..6b307e38 100644 --- a/packages/fes-preset-built-in/src/plugins/features/singular.js +++ b/packages/fes-preset-built-in/src/plugins/features/singular.js @@ -4,9 +4,8 @@ export default (api) => { config: { default: false, schema(joi) { - return joi - .boolean(); - } - } + return joi.boolean(); + }, + }, }); }; diff --git a/packages/fes-preset-built-in/src/plugins/features/vueLoader.js b/packages/fes-preset-built-in/src/plugins/features/vueLoader.js deleted file mode 100644 index c2c2f02a..00000000 --- a/packages/fes-preset-built-in/src/plugins/features/vueLoader.js +++ /dev/null @@ -1,16 +0,0 @@ - - -export default (api) => { - api.describe({ - key: 'vueLoader', - config: { - schema(joi) { - return joi - .object({}) - .description( - 'more vue-loader options see https://vue-loader.vuejs.org/' - ); - } - } - }); -}; diff --git a/packages/fes-preset-built-in/src/plugins/generateFiles/core/exports/coreExports.js b/packages/fes-preset-built-in/src/plugins/generateFiles/core/exports/coreExports.js index 66eb0e06..60ea2516 100644 --- a/packages/fes-preset-built-in/src/plugins/generateFiles/core/exports/coreExports.js +++ b/packages/fes-preset-built-in/src/plugins/generateFiles/core/exports/coreExports.js @@ -8,21 +8,23 @@ export default function (api) { const coreExports = await api.applyPlugins({ key: 'addCoreExports', type: api.ApplyPluginsType.add, - initialValue: [] + initialValue: [], }); const fesExportsHook = {}; // repeated definition const absoluteFilePath = 'core/coreExports.js'; const content = `${coreExports - .map(item => generateExports(absoluteFilePath, { - item, - fesExportsHook - })) + .map((item) => + generateExports(absoluteFilePath, { + item, + fesExportsHook, + }), + ) .join('\n')}\n`; const tpl = readFileSync(join(__dirname, './coreExports.tpl'), 'utf-8'); api.writeTmpFile({ path: absoluteFilePath, - content: tpl.replace('CORE_EXPORTS', content).replace('RUNTIME_PATH', runtimePath) + content: tpl.replace('CORE_EXPORTS', content).replace('RUNTIME_PATH', runtimePath), }); }); } diff --git a/packages/fes-preset-built-in/src/plugins/generateFiles/core/exports/coreExports.tpl b/packages/fes-preset-built-in/src/plugins/generateFiles/core/exports/coreExports.tpl index b4076973..1232ab5f 100644 --- a/packages/fes-preset-built-in/src/plugins/generateFiles/core/exports/coreExports.tpl +++ b/packages/fes-preset-built-in/src/plugins/generateFiles/core/exports/coreExports.tpl @@ -15,8 +15,3 @@ export { } from 'RUNTIME_PATH'; CORE_EXPORTS - -// TODO 优化，放到合适的位置，不能放在 routes，会造成循环依赖 -export const defineRouteMeta = (param)=>{ - return param -} 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 b6fd9933..bbe64a36 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 @@ -2,13 +2,11 @@ import { readFileSync } from 'fs'; import { join } from 'path'; import { winPath } from '@fesjs/utils'; import { runtimePath } from '../../../../utils/constants'; -import { getAppPath } from '../../../../utils/getAppEntryPath'; - export default function (api) { const { paths, - utils: { Mustache } + utils: { Mustache, getAppEntryPath }, } = api; const absoluteFilePath = 'core/plugin.js'; @@ -32,42 +30,34 @@ export default function (api) { // 修改histror 'modifyCreateHistroy', // 生成router时触发 - 'onRouterCreated' - ] + 'onRouterCreated', + ], }); const plugins = await api.applyPlugins({ key: 'addRuntimePlugin', type: api.ApplyPluginsType.add, - initialValue: [ - getAppPath(paths.absSrcPath) - ].filter(Boolean) + initialValue: [getAppEntryPath(paths.absSrcPath)].filter(Boolean), }); api.writeTmpFile({ path: absoluteFilePath, - content: Mustache.render( - readFileSync(join(__dirname, 'plugin.tpl'), 'utf-8'), - { - validKeys, - runtimePath - } - ) + content: Mustache.render(readFileSync(join(__dirname, 'plugin.tpl'), 'utf-8'), { + validKeys, + runtimePath, + }), }); api.writeTmpFile({ path: 'core/pluginRegister.js', - content: Mustache.render( - readFileSync(join(__dirname, 'pluginRegister.tpl'), 'utf-8'), - { - plugins: plugins.map((plugin, index) => ({ - index, - path: winPath(plugin) - })) - } - ) + content: Mustache.render(readFileSync(join(__dirname, 'pluginRegister.tpl'), 'utf-8'), { + plugins: plugins.map((plugin, index) => ({ + index, + path: winPath(plugin), + })), + }), }); }); api.addCoreExports(() => ({ specifiers: ['plugin'], - source: absoluteFilePath + source: absoluteFilePath, })); } diff --git a/packages/fes-preset-built-in/src/plugins/registerMethods.js b/packages/fes-preset-built-in/src/plugins/registerMethods.js index 5cda563a..a5477baf 100644 --- a/packages/fes-preset-built-in/src/plugins/registerMethods.js +++ b/packages/fes-preset-built-in/src/plugins/registerMethods.js @@ -1,8 +1,6 @@ import assert from 'assert'; import { dirname, join } from 'path'; -import { - existsSync, statSync, readFileSync, writeFileSync, copyFileSync -} from 'fs'; +import { existsSync, statSync, readFileSync, writeFileSync, copyFileSync } from 'fs'; export default function (api) { [ @@ -26,48 +24,31 @@ export default function (api) { 'modifyBabelPresetOpts', 'chainWebpack', 'addTmpGenerateWatcherPaths', - 'modifyPublicPathStr' + 'modifyPublicPathStr', ].forEach((name) => { api.registerMethod({ name }); }); api.registerMethod({ name: 'writeTmpFile', - fn({ - path, - content - }) { - assert( - api.stage >= api.ServiceStage.pluginReady, - 'api.writeTmpFile() should not execute in register stage.' - ); + fn({ path, content }) { + assert(api.stage >= api.ServiceStage.pluginReady, 'api.writeTmpFile() should not execute in register stage.'); const absPath = join(api.paths.absTmpPath, path); api.utils.mkdirp.sync(dirname(absPath)); if (!existsSync(absPath) || readFileSync(absPath, 'utf-8') !== content) { writeFileSync(absPath, content, 'utf-8'); } - } + }, }); api.registerMethod({ name: 'copyTmpFiles', - fn({ - namespace, path, ignore - }) { - assert( - api.stage >= api.ServiceStage.pluginReady, - 'api.copyTmpFiles() should not execute in register stage.' - ); - assert( - path, - 'api.copyTmpFiles() should has param path' - ); - assert( - namespace, - 'api.copyTmpFiles() should has param namespace' - ); + fn({ namespace, path, ignore }) { + assert(api.stage >= api.ServiceStage.pluginReady, 'api.copyTmpFiles() should not execute in register stage.'); + assert(path, 'api.copyTmpFiles() should has param path'); + assert(namespace, 'api.copyTmpFiles() should has param namespace'); const files = api.utils.glob.sync('**/*', { - cwd: path + cwd: path, }); const base = join(api.paths.absTmpPath, namespace); files.forEach((file) => { @@ -79,13 +60,13 @@ export default function (api) { if (statSync(source).isDirectory()) { api.utils.mkdirp.sync(target); } else if (Array.isArray(ignore)) { - if (!ignore.some(pattern => new RegExp(pattern).test(file))) { + if (!ignore.some((pattern) => new RegExp(pattern).test(file))) { copyFileSync(source, target); } } else { copyFileSync(source, target); } }); - } + }, }); } diff --git a/packages/fes-preset-built-in/src/plugins/misc/route/index.js b/packages/fes-preset-built-in/src/plugins/route/index.js similarity index 95% rename from packages/fes-preset-built-in/src/plugins/misc/route/index.js rename to packages/fes-preset-built-in/src/plugins/route/index.js index 2a662c34..556d79a1 100644 --- a/packages/fes-preset-built-in/src/plugins/misc/route/index.js +++ b/packages/fes-preset-built-in/src/plugins/route/index.js @@ -3,7 +3,7 @@ import { join, extname, posix, basename } from 'path'; import { lodash, parser, generator } from '@fesjs/utils'; import { parse } from '@vue/compiler-sfc'; import { Logger } from '@fesjs/compiler'; -import { runtimePath } from '../../../utils/constants'; +import { runtimePath } from '../../utils/constants'; const logger = new Logger('fes:router'); @@ -314,6 +314,7 @@ export default function (api) { const namespace = 'core/routes'; const absCoreFilePath = join(namespace, 'routes.js'); + const absExportsFilePath = join(namespace, 'routeExports.js'); const absRuntimeFilePath = join(namespace, 'runtime.js'); @@ -326,13 +327,19 @@ export default function (api) { api.onGenerateFiles(async () => { const routesTpl = readFileSync(join(__dirname, 'template/routes.tpl'), 'utf-8'); const routes = await api.getRoutes(); - api.writeTmpFile({ path: absCoreFilePath, content: Mustache.render(routesTpl, { - runtimePath, COMPONENTS_IMPORT: genComponentImportExpression(routes, api.config).join('\n'), routes: await api.getRoutesJSON(), + }), + }); + + const routeExportsTpl = readFileSync(join(__dirname, 'template/routeExports.tpl'), 'utf-8'); + api.writeTmpFile({ + path: absExportsFilePath, + content: Mustache.render(routeExportsTpl, { + runtimePath, config: api.config, routerBase: api.config.base, CREATE_HISTORY: historyType[api.config.router.mode] || 'createWebHashHistory', @@ -347,8 +354,8 @@ export default function (api) { api.addCoreExports(() => [ { - specifiers: ['getRoutes', 'getRouter', 'getHistory', 'destroyRouter'], - source: absCoreFilePath, + specifiers: ['getRouter', 'getHistory', 'destroyRouter', 'defineRouteMeta'], + source: absExportsFilePath, }, ]); diff --git a/packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl b/packages/fes-preset-built-in/src/plugins/route/template/routeExports.tpl similarity index 91% rename from packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl rename to packages/fes-preset-built-in/src/plugins/route/template/routeExports.tpl index 28b6d24a..e995a033 100644 --- a/packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl +++ b/packages/fes-preset-built-in/src/plugins/route/template/routeExports.tpl @@ -1,13 +1,6 @@ import { createRouter as createVueRouter, {{{ CREATE_HISTORY }}}, ApplyPluginsType } from '{{{ runtimePath }}}'; import { plugin } from '../plugin'; -{{{ COMPONENTS_IMPORT }}} - -export function getRoutes() { - const routes = {{{ routes }}}; - return routes; -} - const ROUTER_BASE = '{{{ routerBase }}}'; let router = null; let history = null; @@ -62,3 +55,7 @@ export const destroyRouter = ()=>{ router = null; history = null; } + +export const defineRouteMeta = (param)=>{ + return param +} diff --git a/packages/fes-preset-built-in/src/plugins/route/template/routes.tpl b/packages/fes-preset-built-in/src/plugins/route/template/routes.tpl new file mode 100644 index 00000000..640369e9 --- /dev/null +++ b/packages/fes-preset-built-in/src/plugins/route/template/routes.tpl @@ -0,0 +1,9 @@ + + +{{{ COMPONENTS_IMPORT }}} + +export function getRoutes() { + const routes = {{{ routes }}}; + return routes; +} + diff --git a/packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl b/packages/fes-preset-built-in/src/plugins/route/template/runtime.tpl similarity index 70% rename from packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl rename to packages/fes-preset-built-in/src/plugins/route/template/runtime.tpl index 7d05be90..5b3deaf9 100644 --- a/packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl +++ b/packages/fes-preset-built-in/src/plugins/route/template/runtime.tpl @@ -1,4 +1,4 @@ -import { createRouter } from "./routes"; +import { createRouter } from "./routeExports"; export function onAppCreated({ app, routes }) { const router = createRouter(routes); diff --git a/packages/fes-preset-built-in/src/utils/constants.js b/packages/fes-preset-built-in/src/utils/constants.js index f9766e28..64cace3c 100644 --- a/packages/fes-preset-built-in/src/utils/constants.js +++ b/packages/fes-preset-built-in/src/utils/constants.js @@ -1,6 +1,4 @@ import { winPath } from '@fesjs/utils'; import { dirname } from 'path'; -export const runtimePath = winPath( - dirname(require.resolve('@fesjs/runtime/package.json')) -); +export const runtimePath = winPath(dirname(require.resolve('@fesjs/runtime/package.json'))); diff --git a/packages/fes-preset-built-in/src/utils/generateExports.js b/packages/fes-preset-built-in/src/utils/generateExports.js index 23fa254f..bb5d0a94 100644 --- a/packages/fes-preset-built-in/src/utils/generateExports.js +++ b/packages/fes-preset-built-in/src/utils/generateExports.js @@ -3,58 +3,28 @@ import assert from 'assert'; import path from 'path'; const reserveLibrarys = ['fes']; // reserve library -// todo 插件导出内容冲突问题待解决 -const reserveExportsNames = [ - 'Link', - 'NavLink', - 'Redirect', - 'dynamic', - 'withRouter', - 'Route' -]; +// todo 插件导出内容冲突问题待解决 +const reserveExportsNames = ['Link', 'NavLink', 'Redirect', 'dynamic', 'withRouter', 'Route']; export default function generateExports(basePath, { item, fesExportsHook }) { assert(item.source, 'source should be supplied.'); const source = path.relative(path.basename(basePath), item.source); - assert( - item.exportAll || item.specifiers, - 'exportAll or specifiers should be supplied.' - ); - assert( - !reserveLibrarys.includes(source), - `${source} is reserve library, Please don't use it.` - ); + assert(item.exportAll || item.specifiers, 'exportAll or specifiers should be supplied.'); + assert(!reserveLibrarys.includes(source), `${source} is reserve library, Please don't use it.`); if (item.exportAll) { return `export * from '${winPath(source)}';`; } - assert( - Array.isArray(item.specifiers), - `specifiers should be Array, but got ${item.specifiers.toString()}.` - ); + assert(Array.isArray(item.specifiers), `specifiers should be Array, but got ${item.specifiers.toString()}.`); const specifiersStrArr = item.specifiers.map((specifier) => { if (typeof specifier === 'string') { - assert( - !reserveExportsNames.includes(specifier), - `${specifier} is reserve name, you can use 'exported' to set alias.` - ); - assert( - !fesExportsHook[specifier], - `${specifier} is Defined, you can use 'exported' to set alias.` - ); + assert(!reserveExportsNames.includes(specifier), `${specifier} is reserve name, you can use 'exported' to set alias.`); + assert(!fesExportsHook[specifier], `${specifier} is Defined, you can use 'exported' to set alias.`); fesExportsHook[specifier] = true; return specifier; } - assert( - lodash.isPlainObject(specifier), - `Configure item context should be Plain Object, but got ${specifier}.` - ); - assert( - specifier.local && specifier.exported, - 'local and exported should be supplied.' - ); + assert(lodash.isPlainObject(specifier), `Configure item context should be Plain Object, but got ${specifier}.`); + assert(specifier.local && specifier.exported, 'local and exported should be supplied.'); return `${specifier.local} as ${specifier.exported}`; }); - return `export { ${specifiersStrArr.join(', ')} } from '${winPath( - source - )}';`; + return `export { ${specifiersStrArr.join(', ')} } from '${winPath(source)}';`; } diff --git a/packages/fes-template-h5/.fes.js b/packages/fes-template-h5/.fes.js index e74daa41..32029746 100644 --- a/packages/fes-template-h5/.fes.js +++ b/packages/fes-template-h5/.fes.js @@ -34,15 +34,15 @@ export default { devServer: { port: 8000 }, - // windicss: { - // config: { - // theme: { - // extend: { - // colors: { - // green: '#7cb305' - // } - // } - // } - // } - // } + windicss: { + config: { + theme: { + extend: { + colors: { + green: '#7cb305' + } + } + } + } + } }; diff --git a/packages/fes-template-h5/package.json b/packages/fes-template-h5/package.json index f441a31a..75b2e444 100644 --- a/packages/fes-template-h5/package.json +++ b/packages/fes-template-h5/package.json @@ -47,6 +47,8 @@ "@fesjs/fes": "^2.0.0", "@fesjs/plugin-icon": "^2.0.0", "@fesjs/plugin-request": "^2.0.0", + "@fesjs/plugin-windicss": "^2.0.8", + "@fesjs/build-webpack": "^1.0.0", "vue": "^3.2.2" }, "private": true diff --git a/packages/fes-template-h5/src/pages/test.jsx b/packages/fes-template-h5/src/pages/test.jsx index 024a3f61..ac70ed23 100644 --- a/packages/fes-template-h5/src/pages/test.jsx +++ b/packages/fes-template-h5/src/pages/test.jsx @@ -1,12 +1,10 @@ import { defineRouteMeta, useRoute } from '@fesjs/fes'; import { defineComponent } from 'vue'; -// console.log(defineRouteMeta); - -// defineRouteMeta({ -// title: 'test', -// name: 'test', -// }); +defineRouteMeta({ + title: 'test', + name: 'test', +}); export default defineComponent({ setup() { diff --git a/packages/fes-utils/src/generateFiles.js b/packages/fes-utils/src/generateFiles.js new file mode 100644 index 00000000..6348779a --- /dev/null +++ b/packages/fes-utils/src/generateFiles.js @@ -0,0 +1,55 @@ +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/getAppEntryPath.js new file mode 100644 index 00000000..1aca16be --- /dev/null +++ b/packages/fes-utils/src/getAppEntryPath.js @@ -0,0 +1,13 @@ +import { join } from 'path'; +import { existsSync } from 'fs'; +import winPath from './winPath'; + +export default 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-utils/src/index.js b/packages/fes-utils/src/index.js index c7967646..ba739559 100644 --- a/packages/fes-utils/src/index.js +++ b/packages/fes-utils/src/index.js @@ -24,6 +24,8 @@ import compatESModuleRequire from './compatESModuleRequire'; import cleanRequireCache from './cleanRequireCache'; import parseRequireDeps from './parseRequireDeps'; import mergeConfig from './mergeConfig'; +import getAppEntryPath from './getAppEntryPath'; +import generateFiles from './generateFiles'; export { chalk, @@ -42,16 +44,7 @@ export { pkgUp, portfinder, resolve, - generator + generator, }; -export { - Generator, - winPath, - delay, - compatESModuleRequire, - cleanRequireCache, - parseRequireDeps, - mergeConfig, - resolvePkg -}; +export { Generator, winPath, delay, compatESModuleRequire, cleanRequireCache, parseRequireDeps, mergeConfig, resolvePkg, generateFiles, getAppEntryPath }; diff --git a/packages/fes-utils/src/mergeConfig.js b/packages/fes-utils/src/mergeConfig.js index 1de5bc32..e9c40755 100644 --- a/packages/fes-utils/src/mergeConfig.js +++ b/packages/fes-utils/src/mergeConfig.js @@ -1,4 +1,3 @@ - export default function mergeConfig(defaultConfig, ...configs) { const ret = { ...defaultConfig }; configs.forEach((config) => { diff --git a/packages/fes-utils/src/resolvePkg.js b/packages/fes-utils/src/resolvePkg.js index 6fa0517d..db6aea3b 100644 --- a/packages/fes-utils/src/resolvePkg.js +++ b/packages/fes-utils/src/resolvePkg.js @@ -1,6 +1,6 @@ import { dirname } from 'path'; import winPath from './winPath'; -const resolvePkg = (pkgName) => winPath(dirname(require.resolve(`${pkgName}/package.json`))).replace('/', '@fesInner/'); +const resolvePkg = (pkgName) => winPath(dirname(require.resolve(`${pkgName}/package.json`))); export default resolvePkg; diff --git a/yarn.lock b/yarn.lock index 963438ba..92a201e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2850,9 +2850,9 @@ "@types/istanbul-lib-report" "*" "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.10" - resolved "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.10.tgz#9b05b7896166cd00e9cbd59864853abf65d9ac23" - integrity sha512-BLO9bBq59vW3fxCpD4o0N4U+DXsvwvIcl+jofw0frQo/GrBFC+/jRZj1E7kgp6dvTyNmA4y6JCV5Id/r3mNP5A== + version "7.0.11" + resolved "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/json5@^0.0.29": version "0.0.29" @@ -5718,9 +5718,9 @@ ejs@^3.1.6: jake "^10.6.1" electron-to-chromium@^1.4.84: - version "1.4.93" - resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.93.tgz#2e87ac28721cb31d472ec2bd04f7daf9f2e13de2" - integrity sha512-ywq9Pc5Gwwpv7NG767CtoU8xF3aAUQJjH9//Wy3MBCg4w5JSLbJUq2L8IsCdzPMjvSgxuue9WcVaTOyyxCL0aQ== + version "1.4.94" + resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.94.tgz#f19206c977361264a51d53a7ea7ef861a94baa10" + integrity sha512-CoOKsuACoa0PAG3hQXxbh/XDiFcjGuSyGKUi09cjMHOt6RCi7/EXgXhaFF3I+aC89Omudqmkzd0YOQKxwtf/Bg== emittery@^0.8.1: version "0.8.1" @@ -5867,190 +5867,190 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.27.tgz#b868bbd9955a92309c69df628d8dd1945478b45c" - integrity sha512-LuEd4uPuj/16Y8j6kqy3Z2E9vNY9logfq8Tq+oTE2PZVuNs3M1kj5Qd4O95ee66yDGb3isaOCV7sOLDwtMfGaQ== +esbuild-android-64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-android-64/-/esbuild-android-64-0.14.28.tgz#69c7a8a4f4a888eb5584afb035524b0fda7affff" + integrity sha512-A52C3zq+9tNwCqZ+4kVLBxnk/WnrYM8P2+QNvNE9B6d2OVPs214lp3g6UyO+dKDhUdefhfPCuwkP8j2A/+szNA== esbuild-android-arm64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.15.tgz#3fc3ff0bab76fe35dd237476b5d2b32bb20a3d44" integrity sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg== -esbuild-android-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.27.tgz#e7d6430555e8e9c505fd87266bbc709f25f1825c" - integrity sha512-E8Ktwwa6vX8q7QeJmg8yepBYXaee50OdQS3BFtEHKrzbV45H4foMOeEE7uqdjGQZFBap5VAqo7pvjlyA92wznQ== +esbuild-android-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.28.tgz#110ff82019e75b866b53844c32f19f7933b4ce36" + integrity sha512-sm0fDEGElZhMC3HLZeECI2juE4aG7uPfMBMqNUhy9CeX399Pz8rC6e78OXMXInGjSdEAwQmCOHmfsP7uv3Q8rA== esbuild-darwin-64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.15.tgz#8e9169c16baf444eacec60d09b24d11b255a8e72" integrity sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ== -esbuild-darwin-64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.27.tgz#4dc7484127564e89b4445c0a560a3cb50b3d68e1" - integrity sha512-czw/kXl/1ZdenPWfw9jDc5iuIYxqUxgQ/Q+hRd4/3udyGGVI31r29LCViN2bAJgGvQkqyLGVcG03PJPEXQ5i2g== +esbuild-darwin-64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.28.tgz#d929ce16035da6047504fe8a71587d2ac9b756ed" + integrity sha512-nzDd7mQ44FvsFHtOafZdBgn3Li5SMsnMnoz1J2MM37xJmR3wGNTFph88KypjHgWqwbxCI7MXS1U+sN4qDeeW6Q== esbuild-darwin-arm64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.15.tgz#1b07f893b632114f805e188ddfca41b2b778229a" integrity sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ== -esbuild-darwin-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.27.tgz#469e59c665f84a8ed323166624c5e7b9b2d22ac1" - integrity sha512-BEsv2U2U4o672oV8+xpXNxN9bgqRCtddQC6WBh4YhXKDcSZcdNh7+6nS+DM2vu7qWIWNA4JbRG24LUUYXysimQ== +esbuild-darwin-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.28.tgz#75e1cb75c2230c541be1707c6751395fee9f6bbd" + integrity sha512-XEq/bLR/glsUl+uGrBimQzOVs/CmwI833fXUhP9xrLI3IJ+rKyrZ5IA8u+1crOEf1LoTn8tV+hInmX6rGjbScw== esbuild-freebsd-64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.15.tgz#0b8b7eca1690c8ec94c75680c38c07269c1f4a85" integrity sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA== -esbuild-freebsd-64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.27.tgz#895df03bf5f87094a56c9a5815bf92e591903d70" - integrity sha512-7FeiFPGBo+ga+kOkDxtPmdPZdayrSzsV9pmfHxcyLKxu+3oTcajeZlOO1y9HW+t5aFZPiv7czOHM4KNd0tNwCA== +esbuild-freebsd-64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.28.tgz#3579fd41f4c090d52e1a9134743e591c6aea49d7" + integrity sha512-rTKLgUj/HEcPeE5XZ7IZwWpFx7IWMfprN7QRk/TUJE1s1Ipb58esboIesUpjirJz/BwrgHq+FDG9ChAI8dZAtQ== esbuild-freebsd-arm64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.15.tgz#2e1a6c696bfdcd20a99578b76350b41db1934e52" integrity sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ== -esbuild-freebsd-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.27.tgz#0b72a41a6b8655e9a8c5608f2ec1afdcf6958441" - integrity sha512-8CK3++foRZJluOWXpllG5zwAVlxtv36NpHfsbWS7TYlD8S+QruXltKlXToc/5ZNzBK++l6rvRKELu/puCLc7jA== +esbuild-freebsd-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.28.tgz#de1c102a40005fa9da5160c0242b2de89ffd2d7b" + integrity sha512-sBffxD1UMOsB7aWMoExmipycjcy3HJGwmqE4GQZUTZvdiH4GhjgUiVdtPyt7kSCdL40JqnWQJ4b1l8Y51oCF4Q== esbuild-linux-32@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.13.15.tgz#6fd39f36fc66dd45b6b5f515728c7bbebc342a69" integrity sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g== -esbuild-linux-32@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.27.tgz#43b8ba3803b0bbe7f051869c6a8bf6de1e95de28" - integrity sha512-qhNYIcT+EsYSBClZ5QhLzFzV5iVsP1YsITqblSaztr3+ZJUI+GoK8aXHyzKd7/CKKuK93cxEMJPpfi1dfsOfdw== +esbuild-linux-32@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-linux-32/-/esbuild-linux-32-0.14.28.tgz#cdb8ac2000df06044450bf33a93b9d63d61bb669" + integrity sha512-+Wxidh3fBEQ9kHcCsD4etlBTMb1n6QY2uXv3rFhVn88CY/JP782MhA57/ipLMY4kOLeSKEuFGN4rtjHuhmRMig== esbuild-linux-64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.13.15.tgz#9cb8e4bcd7574e67946e4ee5f1f1e12386bb6dd3" integrity sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA== -esbuild-linux-64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.27.tgz#dc8072097327ecfadba1735562824ce8c05dd0bd" - integrity sha512-ESjck9+EsHoTaKWlFKJpPZRN26uiav5gkI16RuI8WBxUdLrrAlYuYSndxxKgEn1csd968BX/8yQZATYf/9+/qg== +esbuild-linux-64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-linux-64/-/esbuild-linux-64-0.14.28.tgz#b1e961d42af89dab8c3c0ce86420a7657765f0ae" + integrity sha512-7+xgsC4LvR6cnzaBdiljNnPDjbkwzahogN+S9uy9AoYw7ZjPnnXc6sjQAVCbqGb7MEgrWdpa6u/Tao79i4lWxg== esbuild-linux-arm64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.15.tgz#3891aa3704ec579a1b92d2a586122e5b6a2bfba1" integrity sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA== -esbuild-linux-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.27.tgz#c52b58cbe948426b1559910f521b0a3f396f10b8" - integrity sha512-no6Mi17eV2tHlJnqBHRLekpZ2/VYx+NfGxKcBE/2xOMYwctsanCaXxw4zapvNrGE9X38vefVXLz6YCF8b1EHiQ== +esbuild-linux-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.28.tgz#f69e6ace792a4985b9760b443dbf627e5e3d2126" + integrity sha512-EjRHgwg+kgXABzyoPGPOPg4d5wZqRnZ/ZAxBDzLY+i6DS8OUfTSlZHWIOZzU4XF7125WxRBg9ULbrFJBl+57Eg== esbuild-linux-arm@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.15.tgz#8a00e99e6a0c6c9a6b7f334841364d8a2b4aecfe" integrity sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA== -esbuild-linux-arm@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.27.tgz#df869dbd67d4ee3a04b3c7273b6bd2b233e78a18" - integrity sha512-JnnmgUBdqLQO9hoNZQqNHFWlNpSX82vzB3rYuCJMhtkuaWQEmQz6Lec1UIxJdC38ifEghNTBsF9bbe8dFilnCw== +esbuild-linux-arm@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.28.tgz#9c2fa45578686370a5d782314f321a2c6b641270" + integrity sha512-L5isjmlLbh9E0WVllXiVETbScgMbth/+XkXQii1WwgO1RvLIfaGrVFz8d2n6EH/ImtgYxPYGx+OcvIKQBc91Rg== esbuild-linux-mips64le@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.15.tgz#36b07cc47c3d21e48db3bb1f4d9ef8f46aead4f7" integrity sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg== -esbuild-linux-mips64le@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.27.tgz#a2b646d9df368b01aa970a7b8968be6dd6b01d19" - integrity sha512-NolWP2uOvIJpbwpsDbwfeExZOY1bZNlWE/kVfkzLMsSgqeVcl5YMen/cedRe9mKnpfLli+i0uSp7N+fkKNU27A== +esbuild-linux-mips64le@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.28.tgz#99d78f0380640aa7faa2c4c49ac21229bdf33c7c" + integrity sha512-krx9SSg7yfiUKk64EmjefOyiEF6nv2bRE4um/LiTaQ6Y/6FP4UF3/Ou/AxZVyR154uSRq63xejcAsmswXAYRsw== esbuild-linux-ppc64le@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.15.tgz#f7e6bba40b9a11eb9dcae5b01550ea04670edad2" integrity sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ== -esbuild-linux-ppc64le@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.27.tgz#9a21af766a0292578a3009c7408b8509cac7cefd" - integrity sha512-/7dTjDvXMdRKmsSxKXeWyonuGgblnYDn0MI1xDC7J1VQXny8k1qgNp6VmrlsawwnsymSUUiThhkJsI+rx0taNA== +esbuild-linux-ppc64le@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.28.tgz#7388fa0c76033b4ca85b74071cb793d41ae77642" + integrity sha512-LD0Xxu9g+DNuhsEBV5QuVZ4uKVBMup0xPIruLweuAf9/mHXFnaCuNXUBF5t0DxKl7GQ5MSioKtnb92oMo+QXEw== -esbuild-linux-riscv64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.27.tgz#344a27f91568056a5903ad5841b447e00e78d740" - integrity sha512-D+aFiUzOJG13RhrSmZgrcFaF4UUHpqj7XSKrIiCXIj1dkIkFqdrmqMSOtSs78dOtObWiOrFCDDzB24UyeEiNGg== +esbuild-linux-riscv64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.28.tgz#99e4a8afe4762e927ebe02009e1927e38f3256ab" + integrity sha512-L/DWfRh2P0vxq4Y+qieSNXKGdMg+e9Qe8jkbN2/8XSGYDTPzO2OcAxSujob4qIh7iSl+cknbXV+BvH0YFR0jbg== -esbuild-linux-s390x@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.27.tgz#73a7309bd648a07ef58f069658f989a5096130db" - integrity sha512-CD/D4tj0U4UQjELkdNlZhQ8nDHU5rBn6NGp47Hiz0Y7/akAY5i0oGadhEIg0WCY/HYVXFb3CsSPPwaKcTOW3bg== +esbuild-linux-s390x@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.28.tgz#38a625399ffc78f3b8b555ebe2013347256a9a8a" + integrity sha512-rrgxmsbmL8QQknWGnAL9bGJRQYLOi2AzXy5OTwfhxnj9eqjo5mSVbJXjgiq5LPUAMQZGdPH5yaNK0obAXS81Zw== esbuild-netbsd-64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.15.tgz#a2fedc549c2b629d580a732d840712b08d440038" integrity sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w== -esbuild-netbsd-64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.27.tgz#482a587cdbd18a6c264a05136596927deb46c30a" - integrity sha512-h3mAld69SrO1VoaMpYl3a5FNdGRE/Nqc+E8VtHOag4tyBwhCQXxtvDDOAKOUQexBGca0IuR6UayQ4ntSX5ij1Q== +esbuild-netbsd-64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.28.tgz#fdc09dd69313f42be034276cc780bf60c09266b6" + integrity sha512-h8wntIyOR8/xMVVM6TvJxxWKh4AjmLK87IPKpuVi8Pq0kyk0RMA+eo4PFGk5j2XK0D7dj8PcSF5NSlP9kN/j0A== esbuild-openbsd-64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.15.tgz#b22c0e5806d3a1fbf0325872037f885306b05cd7" integrity sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g== -esbuild-openbsd-64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.27.tgz#e99f8cdc63f1628747b63edd124d53cf7796468d" - integrity sha512-xwSje6qIZaDHXWoPpIgvL+7fC6WeubHHv18tusLYMwL+Z6bEa4Pbfs5IWDtQdHkArtfxEkIZz77944z8MgDxGw== +esbuild-openbsd-64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.28.tgz#9d7b0ca421ae580ab945c69c33eabd793262a84c" + integrity sha512-HBv18rVapbuDx52/fhZ/c/w6TXyaQAvRxiDDn5Hz/pBcwOs3cdd2WxeIKlWmDoqm2JMx5EVlq4IWgoaRX9mVkw== esbuild-sunos-64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.15.tgz#d0b6454a88375ee8d3964daeff55c85c91c7cef4" integrity sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw== -esbuild-sunos-64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.27.tgz#8611d825bcb8239c78d57452e83253a71942f45c" - integrity sha512-/nBVpWIDjYiyMhuqIqbXXsxBc58cBVH9uztAOIfWShStxq9BNBik92oPQPJ57nzWXRNKQUEFWr4Q98utDWz7jg== +esbuild-sunos-64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.28.tgz#5b82807ebe435519a2689e1a4d50b8a3cc5c64c0" + integrity sha512-zlIxePhZxKYheR2vBCgPVvTixgo/ozOfOMoP6RZj8dxzquU1NgeyhjkcRXucbLCtmoNJ+i4PtWwPZTLuDd3bGg== esbuild-windows-32@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.13.15.tgz#c96d0b9bbb52f3303322582ef8e4847c5ad375a7" integrity sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw== -esbuild-windows-32@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.27.tgz#c06374206d4d92dd31d4fda299b09f51a35e82f6" - integrity sha512-Q9/zEjhZJ4trtWhFWIZvS/7RUzzi8rvkoaS9oiizkHTTKd8UxFwn/Mm2OywsAfYymgUYm8+y2b+BKTNEFxUekw== +esbuild-windows-32@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-windows-32/-/esbuild-windows-32-0.14.28.tgz#5cf740782fadc865c00aa0d8388e42012bcf496e" + integrity sha512-am9DIJxXlld1BOAY/VlvBQHMUCPL7S3gB/lnXIY3M4ys0gfuRqPf4EvMwZMzYUbFKBY+/Qb8SRgPRRGhwnJ8Kg== esbuild-windows-64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz#1f79cb9b1e1bb02fb25cd414cb90d4ea2892c294" integrity sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ== -esbuild-windows-64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.27.tgz#756631c1d301dfc0d1a887deed2459ce4079582f" - integrity sha512-b3y3vTSl5aEhWHK66ngtiS/c6byLf6y/ZBvODH1YkBM+MGtVL6jN38FdHUsZasCz9gFwYs/lJMVY9u7GL6wfYg== +esbuild-windows-64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.28.tgz#6e3ec1b0225d668a2da21e2ffeff2353b5c9a567" + integrity sha512-78PhySDnmRZlsPNp/W/5Fim8iivlBQQxfhBFIqR7xwvfDmCFUSByyMKP7LCHgNtb04yNdop8nJJkJaQ8Xnwgiw== esbuild-windows-arm64@0.13.15: version "0.13.15" resolved "https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.15.tgz#482173070810df22a752c686509c370c3be3b3c3" integrity sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA== -esbuild-windows-arm64@0.14.27: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.27.tgz#ad7e187193dcd18768b16065a950f4441d7173f4" - integrity sha512-I/reTxr6TFMcR5qbIkwRGvldMIaiBu2+MP0LlD7sOlNXrfqIl9uNjsuxFPGEG4IRomjfQ5q8WT+xlF/ySVkqKg== +esbuild-windows-arm64@0.14.28: + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.28.tgz#c527d52ec7d1f868259d0f74ecc4003e8475125d" + integrity sha512-VhXGBTo6HELD8zyHXynV6+L2jWx0zkKnGx4TmEdSBK7UVFACtOyfUqpToG0EtnYyRZ0HESBhzPSVpP781ovmvA== esbuild@^0.13.12: version "0.13.15" @@ -6076,30 +6076,30 @@ esbuild@^0.13.12: esbuild-windows-arm64 "0.13.15" esbuild@^0.14.14: - version "0.14.27" - resolved "https://registry.npmmirror.com/esbuild/-/esbuild-0.14.27.tgz#41fe0f1b6b68b9f77cac025009bc54bb96e616f1" - integrity sha512-MZQt5SywZS3hA9fXnMhR22dv0oPGh6QtjJRIYbgL1AeqAoQZE+Qn5ppGYQAoHv/vq827flj4tIJ79Mrdiwk46Q== + version "0.14.28" + resolved "https://registry.npmmirror.com/esbuild/-/esbuild-0.14.28.tgz#7738635d2ea19e446bd319d83a1802545e6aebb8" + integrity sha512-YLNprkCcMVKQ5sekmCKEQ3Obu/L7s6+iij38xNKyBeSmSsTWur4Ky/9zB3XIGT8SCJITG/bZwAR2l7YOAXch4Q== optionalDependencies: - esbuild-android-64 "0.14.27" - esbuild-android-arm64 "0.14.27" - esbuild-darwin-64 "0.14.27" - esbuild-darwin-arm64 "0.14.27" - esbuild-freebsd-64 "0.14.27" - esbuild-freebsd-arm64 "0.14.27" - esbuild-linux-32 "0.14.27" - esbuild-linux-64 "0.14.27" - esbuild-linux-arm "0.14.27" - esbuild-linux-arm64 "0.14.27" - esbuild-linux-mips64le "0.14.27" - esbuild-linux-ppc64le "0.14.27" - esbuild-linux-riscv64 "0.14.27" - esbuild-linux-s390x "0.14.27" - esbuild-netbsd-64 "0.14.27" - esbuild-openbsd-64 "0.14.27" - esbuild-sunos-64 "0.14.27" - esbuild-windows-32 "0.14.27" - esbuild-windows-64 "0.14.27" - esbuild-windows-arm64 "0.14.27" + esbuild-android-64 "0.14.28" + esbuild-android-arm64 "0.14.28" + esbuild-darwin-64 "0.14.28" + esbuild-darwin-arm64 "0.14.28" + esbuild-freebsd-64 "0.14.28" + esbuild-freebsd-arm64 "0.14.28" + esbuild-linux-32 "0.14.28" + esbuild-linux-64 "0.14.28" + esbuild-linux-arm "0.14.28" + esbuild-linux-arm64 "0.14.28" + esbuild-linux-mips64le "0.14.28" + esbuild-linux-ppc64le "0.14.28" + esbuild-linux-riscv64 "0.14.28" + esbuild-linux-s390x "0.14.28" + esbuild-netbsd-64 "0.14.28" + esbuild-openbsd-64 "0.14.28" + esbuild-sunos-64 "0.14.28" + esbuild-windows-32 "0.14.28" + esbuild-windows-64 "0.14.28" + esbuild-windows-arm64 "0.14.28" escalade@^3.1.1: version "3.1.1" @@ -6281,9 +6281,9 @@ eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3.0: integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint@^8.3.0: - version "8.11.0" - resolved "https://registry.npmmirror.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37" - integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA== + version "8.12.0" + resolved "https://registry.npmmirror.com/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e" + integrity sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q== dependencies: "@eslint/eslintrc" "^1.2.1" "@humanwhocodes/config-array" "^0.9.2" @@ -11044,7 +11044,7 @@ qs@6.9.7: resolved "https://registry.npmmirror.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe" integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== -qs@^6.10.2, qs@^6.9.4: +qs@^6.9.4: version "6.10.3" resolved "https://registry.npmmirror.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==