diff --git a/package.json b/package.json index 39979ece4d9ec602fc36991eec6998e84adadd1c..0e707c0b6d04ba57dd170c127ffcd6e8b9e0ce05 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "size-limit": "^4.10.1", "ts-jest": "^26.4.4", "typescript": "~4.1.3", - "vite": "^2.2.1", + "vite": "^2.2.3", "vue": "3.0.11", "yorkie": "^2.0.0" } diff --git a/packages/shims-node.d.ts b/packages/shims-node.d.ts new file mode 100644 index 0000000000000000000000000000000000000000..e8734be66c55538c668ce6b664a2d64e1e3bd93c --- /dev/null +++ b/packages/shims-node.d.ts @@ -0,0 +1,7 @@ +declare namespace NodeJS { + interface ProcessEnv { + UNI_PLATFORM: UniApp.PLATFORM + UNI_INPUT_DIR: string + UNI_OUTPUT_DIR: string + } +} diff --git a/packages/size-check/vite.config.ts b/packages/size-check/vite.config.ts index e343140553e26aa555eb1fbb4bdf9c1287c6fcb5..a008a6d60126be51feafbca2a1ce259bdef2efd5 100644 --- a/packages/size-check/vite.config.ts +++ b/packages/size-check/vite.config.ts @@ -12,9 +12,9 @@ export default { entry: path.resolve(__dirname, 'src/main.ts'), formats: ['es'], }, - // minify: false, + minify: false, rollupOptions: { - // external: ['vue', '@vue/shared'], + external: ['vue', '@vue/shared'], // output: { // entryFileNames: `assets/[name].js`, // chunkFileNames: `assets/[name].js`, diff --git a/packages/uni-app/package.json b/packages/uni-app/package.json index f7986ccc9195327469223623e44d70901141463c..bf3c04dce17d802b9056e0a1eacaad030e65c0ca 100644 --- a/packages/uni-app/package.json +++ b/packages/uni-app/package.json @@ -2,7 +2,7 @@ "name": "@dcloudio/uni-app", "version": "3.0.0", "description": "@dcloudio/uni-app", - "main": "dist/uni-app.cjs.js", + "main": "dist/uni-app.esm.js", "module": "dist/uni-app.esm.js", "types": "dist/uni-app.d.ts", "files": [ diff --git a/packages/uni-cli-shared/package.json b/packages/uni-cli-shared/package.json index 1da50c6c5f96f2e2deddc9868f8498a5edc7b153..f327f3ec24a28e45c30bf43895cd7caeef6ae8ec 100644 --- a/packages/uni-cli-shared/package.json +++ b/packages/uni-cli-shared/package.json @@ -24,6 +24,7 @@ "dependencies": { "debug": "^4.3.1", "jsonc-parser": "^3.0.0", + "slash": "^3.0.0", "xregexp": "3.1.0" }, "peerDependencies": { diff --git a/packages/uni-cli-shared/src/index.ts b/packages/uni-cli-shared/src/index.ts index d9df3cf6be34f349fc5d214f94062910306afda0..b0a12c6826dfb6ebacfc1c0cf0ff431bf473d0bd 100644 --- a/packages/uni-cli-shared/src/index.ts +++ b/packages/uni-cli-shared/src/index.ts @@ -1,4 +1,5 @@ export * from './url' export * from './json' +export * from './utils' export * from './constants' export * from './preprocess/index' diff --git a/packages/uni-cli-shared/src/utils.ts b/packages/uni-cli-shared/src/utils.ts new file mode 100644 index 0000000000000000000000000000000000000000..9b480f0179e9d8500338e0852cf059de3cb1b9c1 --- /dev/null +++ b/packages/uni-cli-shared/src/utils.ts @@ -0,0 +1,7 @@ +import os from 'os' +import path from 'path' +import slash from 'slash' +const isWindows = os.platform() === 'win32' +export function normalizePath(id: string): string { + return path.posix.normalize(isWindows ? slash(id) : id) +} diff --git a/packages/uni-h5/dist/uni-h5.esm.js b/packages/uni-h5/dist/uni-h5.esm.js index c49ac894122e7daa9e2668928c28e9fac2e339b9..2113be9956ab948f2072af3e81aefc55ae56995b 100644 --- a/packages/uni-h5/dist/uni-h5.esm.js +++ b/packages/uni-h5/dist/uni-h5.esm.js @@ -678,7 +678,7 @@ var safeAreaInsets = { onChange, offChange }; -var D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out = safeAreaInsets; +var out = safeAreaInsets; const onEventPrevent = /* @__PURE__ */ withModifiers(() => { }, ["prevent"]); const onEventStop = /* @__PURE__ */ withModifiers(() => { @@ -690,10 +690,10 @@ function getWindowOffset() { const left = parseInt(style2.getPropertyValue("--window-left")); const right = parseInt(style2.getPropertyValue("--window-right")); return { - top: top ? top + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top : 0, - bottom: bottom ? bottom + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom : 0, - left: left ? left + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left : 0, - right: right ? right + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right : 0 + top: top ? top + out.top : 0, + bottom: bottom ? bottom + out.bottom : 0, + left: left ? left + out.left : 0, + right: right ? right + out.right : 0 }; } const style = document.documentElement.style; @@ -1333,7 +1333,7 @@ function normalizePageMeta(pageMeta) { let offset = rpx2px(refreshOptions.offset); const {type} = navigationBar; if (type !== "transparent" && type !== "none") { - offset += NAVBAR_HEIGHT + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top; + offset += NAVBAR_HEIGHT + out.top; } refreshOptions.offset = offset; refreshOptions.height = rpx2px(refreshOptions.height); @@ -11465,7 +11465,7 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => { const windowWidth = getWindowWidth(screenWidth); let windowHeight = window.innerHeight; const language = navigator.language; - const statusBarHeight = D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top; + const statusBarHeight = out.top; let osname; let osversion; let model; @@ -11578,12 +11578,12 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => { const system = `${osname} ${osversion}`; const platform = osname.toLocaleLowerCase(); const safeArea = { - left: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left, - right: windowWidth - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right, - top: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top, - bottom: windowHeight - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom, - width: windowWidth - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right, - height: windowHeight - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom + left: out.left, + right: windowWidth - out.right, + top: out.top, + bottom: windowHeight - out.bottom, + width: windowWidth - out.left - out.right, + height: windowHeight - out.top - out.bottom }; const {top: windowTop, bottom: windowBottom} = getWindowOffset(); windowHeight -= windowTop; @@ -11603,10 +11603,10 @@ const getSystemInfoSync = defineSyncApi("getSystemInfoSync", () => { model, safeArea, safeAreaInsets: { - top: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top, - right: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right, - bottom: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom, - left: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left + top: out.top, + right: out.right, + bottom: out.bottom, + left: out.left } }; }); @@ -13123,7 +13123,7 @@ const props = { type: Boolean } }; -const toastIconClassName = "uni-toast__icon"; +const ToastIconClassName = "uni-toast__icon"; var Toast = /* @__PURE__ */ defineComponent({ name: "Toast", props, @@ -13158,7 +13158,7 @@ var Toast = /* @__PURE__ */ defineComponent({ class: "uni-toast" }, [image2 ? createVNode("img", { src: image2, - class: toastIconClassName + class: ToastIconClassName }, null, 10, ["src"]) : Icon.value, createVNode("p", { class: "uni-toast__content" }, [title])])], 8, ["data-duration"]), [[vShow, visible.value]])] @@ -13168,9 +13168,9 @@ var Toast = /* @__PURE__ */ defineComponent({ }); function useToastIcon(props2) { const Icon = computed(() => props2.icon === "success" ? createVNode(createSvgIconVNode(ICON_PATH_SUCCESS_NO_CIRCLE, "#fff", 38), { - class: toastIconClassName + class: ToastIconClassName }) : props2.icon === "loading" ? createVNode("i", { - class: [toastIconClassName, "uni-loading"] + class: [ToastIconClassName, "uni-loading"] }, null, 2) : null); return { Icon diff --git a/packages/vite-plugin-uni/package.json b/packages/vite-plugin-uni/package.json index 2db9abb5b5c9231c15b33ea1cb9426491f1c9455..df412339ae7e6137d0e7073199e93f225c7a64fe 100644 --- a/packages/vite-plugin-uni/package.json +++ b/packages/vite-plugin-uni/package.json @@ -37,7 +37,7 @@ "@dcloudio/uni-cli-shared": "^3.0.0", "@dcloudio/uni-shared": "^3.0.0", "@vue/shared": "^3.0.11", - "vite": "^2.2.1" + "vite": "^2.2.3" }, "devDependencies": { "@types/mime": "^2.0.3", diff --git a/packages/vite-plugin-uni/src/config/index.ts b/packages/vite-plugin-uni/src/config/index.ts index 8f0d7a0be0f6489afbe5d376c483f07e24592894..16ca8c6896beac0c693b4ccd5d256818f1d3ed20 100644 --- a/packages/vite-plugin-uni/src/config/index.ts +++ b/packages/vite-plugin-uni/src/config/index.ts @@ -1,38 +1,33 @@ -import fs from 'fs' import path from 'path' -import { parse } from 'jsonc-parser' +import { Plugin, UserConfig } from 'vite' -import { Plugin } from 'vite' +import { normalizePath } from '@dcloudio/uni-cli-shared' import { VitePluginUniResolvedOptions } from '..' import { createCss } from './css' import { createResolve } from './resolve' -import { createDefine } from './define' import { createServer } from './server' import { createBuild } from './build' import { createOptimizeDeps } from './optimizeDeps' +import { createDefine } from './define' import { FEATURE_DEFINES } from '../utils' -function resolveBase(inputDir: string) { - const manifest = parse( - fs.readFileSync(path.join(inputDir, 'manifest.json'), 'utf8') - ) - return (manifest.h5 && manifest.h5.router && manifest.h5.router.base) || '/' + +function normalizeRoot(config: UserConfig) { + return normalizePath(config.root ? path.resolve(config.root) : process.cwd()) +} + +function normalizeInputDir(config: UserConfig) { + return process.env.UNI_INPUT_DIR || path.resolve(normalizeRoot(config), 'src') } export function createConfig( options: VitePluginUniResolvedOptions ): Plugin['config'] { return (config, env) => { - const root = config.root || process.cwd() - const inputDir = process.env.UNI_INPUT_DIR || path.resolve(root, 'src') - const outputDir = process.env.UNI_OUTPUT_DIR || path.resolve(root, 'dist') - options.root = root - options.base = resolveBase(inputDir) - options.inputDir = inputDir - options.outputDir = outputDir options.command = env.command + options.platform = (process.env.UNI_PLATFORM as UniApp.PLATFORM) || 'h5' + options.inputDir = normalizeInputDir(config) const define = createDefine(options, env) return { - base: options.base, define, resolve: createResolve(options), optimizeDeps: createOptimizeDeps(options), diff --git a/packages/vite-plugin-uni/src/configResolved/env.ts b/packages/vite-plugin-uni/src/configResolved/env.ts new file mode 100644 index 0000000000000000000000000000000000000000..37e850fbbec070f152996f6890fb68bff39d14cc --- /dev/null +++ b/packages/vite-plugin-uni/src/configResolved/env.ts @@ -0,0 +1,17 @@ +import path from 'path' +import { ResolvedConfig } from 'vite' + +export function initEnv(config: ResolvedConfig) { + if (!process.env.UNI_PLATFORM) { + process.env.UNI_PLATFORM = 'h5' + } + if (!process.env.UNI_CLI_CONTEXT) { + process.env.UNI_CLI_CONTEXT = process.cwd() + } + if (!process.env.UNI_INPUT_DIR) { + process.env.UNI_INPUT_DIR = path.resolve(config.root, 'src') + } + if (!process.env.UNI_OUTPUT_DIR) { + process.env.UNI_OUTPUT_DIR = path.resolve(config.root, config.build.outDir) + } +} diff --git a/packages/vite-plugin-uni/src/configResolved/index.ts b/packages/vite-plugin-uni/src/configResolved/index.ts index 36b24a37869feca4b1aa798f3b4876bbbe2492e9..a2b0e551b3a32150d22829d199d82dafe218f94c 100644 --- a/packages/vite-plugin-uni/src/configResolved/index.ts +++ b/packages/vite-plugin-uni/src/configResolved/index.ts @@ -1,15 +1,15 @@ -import path from 'path' import { Plugin } from 'vite' import { VitePluginUniResolvedOptions } from '..' -import { resolvePlugins } from './plugins' + +import { initEnv } from './env' +import { initOptions } from './options' +import { initPlugins } from './plugins' export function createConfigResolved(options: VitePluginUniResolvedOptions) { return ((config) => { - options.root = config.root - options.inputDir = path.resolve(config.root, 'src') - options.assetsDir = config.build.assetsDir - - resolvePlugins(config, options) + initEnv(config) + initOptions(options, config) + initPlugins(config, options) }) as Plugin['configResolved'] } diff --git a/packages/vite-plugin-uni/src/configResolved/options.ts b/packages/vite-plugin-uni/src/configResolved/options.ts new file mode 100644 index 0000000000000000000000000000000000000000..4338ea77a169a54f303e56836dd5374fc47e30c4 --- /dev/null +++ b/packages/vite-plugin-uni/src/configResolved/options.ts @@ -0,0 +1,24 @@ +import fs from 'fs' +import path from 'path' +import { parse } from 'jsonc-parser' +import { VitePluginUniResolvedOptions } from '..' +import { ResolvedConfig } from 'vite' + +function resolveBase() { + const manifest = parse( + fs.readFileSync( + path.join(process.env.UNI_INPUT_DIR!, 'manifest.json'), + 'utf8' + ) + ) + return (manifest.h5 && manifest.h5.router && manifest.h5.router.base) || '/' +} + +export function initOptions( + options: VitePluginUniResolvedOptions, + config: ResolvedConfig +) { + options.base = resolveBase() + options.outputDir = process.env.UNI_OUTPUT_DIR + options.assetsDir = config.build.assetsDir +} diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/index.ts b/packages/vite-plugin-uni/src/configResolved/plugins/index.ts index a6321a26cc21532e652e85fda3a67bfe2c5866b6..0662f4a384fed79c76644d6312b2a75ab13736b8 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/index.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/index.ts @@ -82,7 +82,7 @@ const uniInjectPluginOptions: Partial = { }, } -export function resolvePlugins( +export function initPlugins( config: ResolvedConfig, options: VitePluginUniResolvedOptions ) { diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts b/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts index 2ed6394731f93c6f806eb72ab1cf65121cdcc446..f2293d24e4e1c8e0b86329dad800d0df23febe26 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts @@ -69,7 +69,7 @@ function parsePagesJson( const cssCode = generateCssCode(config, options) return ` -import { extend } from '@vue/shared' +import { extend } from '@vue/shared/dist/shared.esm-bundler.js' import { ${ config.define!.__UNI_FEATURE_PAGES__ ? 'defineAsyncComponent, ' : '' }resolveComponent, createVNode, withCtx, openBlock, createBlock } from 'vue' diff --git a/packages/vite-plugin-uni/src/env.ts b/packages/vite-plugin-uni/src/env.ts deleted file mode 100644 index d0de7a7babab81fa3a51d1ba4e7c40c860038498..0000000000000000000000000000000000000000 --- a/packages/vite-plugin-uni/src/env.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { VitePluginUniResolvedOptions } from '.' - -const defaultPlatform = 'h5' - -export function initEnv(_options: VitePluginUniResolvedOptions) { - process.env.UNI_PLATFORM = process.env.UNI_PLATFORM || defaultPlatform -} diff --git a/packages/vite-plugin-uni/src/index.ts b/packages/vite-plugin-uni/src/index.ts index 868f9b379b247d4a9452ec53607b4984053907d4..7ab45b097f312a213e33ddb328243afc065218b7 100644 --- a/packages/vite-plugin-uni/src/index.ts +++ b/packages/vite-plugin-uni/src/index.ts @@ -1,6 +1,5 @@ import { Plugin, ResolvedConfig, ViteDevServer } from 'vite' -import { initEnv } from './env' import { createConfig } from './config' import { createResolveId } from './resolveId' import { createConfigResolved } from './configResolved' @@ -11,7 +10,6 @@ export interface VitePluginUniOptions { outputDir?: string } export interface VitePluginUniResolvedOptions extends VitePluginUniOptions { - root: string base: string command: ResolvedConfig['command'] platform: UniApp.PLATFORM @@ -28,7 +26,6 @@ export default function uniPlugin( ): Plugin { const options: VitePluginUniResolvedOptions = { ...rawOptions, - root: process.cwd(), base: '/', assetsDir: 'assets', inputDir: '', @@ -36,7 +33,6 @@ export default function uniPlugin( command: 'serve', platform: 'h5', } - initEnv(options) return { name: 'vite:uni', config: createConfig(options), diff --git a/packages/vite-plugin-uni/src/resolveId/index.ts b/packages/vite-plugin-uni/src/resolveId/index.ts index c2ca037cd1c42d39271fe3bfd930f6a834fc56bb..d4be5790662f8046c990acd8451e85099b5df07c 100644 --- a/packages/vite-plugin-uni/src/resolveId/index.ts +++ b/packages/vite-plugin-uni/src/resolveId/index.ts @@ -10,6 +10,11 @@ export function createResolveId( _options: VitePluginUniResolvedOptions ): Plugin['resolveId'] { return function (id) { + if (id.startsWith('@dcloudio/') || id.startsWith('@vue/')) { + return require.resolve(id, { + paths: [process.env.UNI_CLI_CONTEXT!], + }) + } if (VUES.includes(id)) { debugResolve(id) return '@dcloudio/uni-h5-vue' diff --git a/packages/vite-plugin-uni/tsconfig.json b/packages/vite-plugin-uni/tsconfig.json index 3ff56f2d8d08a5ac3ee446dcd18953264cea24e0..d59e92c29f1306d5aa940b41fbe82e01ebe6f7e0 100644 --- a/packages/vite-plugin-uni/tsconfig.json +++ b/packages/vite-plugin-uni/tsconfig.json @@ -5,6 +5,7 @@ }, "include": [ "src", + "../shims-node.d.ts", "../shims-uni-app.d.ts", "../../node_modules/postcss/lib/postcss.d.ts" ] diff --git a/yarn.lock b/yarn.lock index 162a88920d3b266bdb9476cc11f281c5155c219a..f54973bc6ff389a1b4aef36cc7f173249c42a733 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1002,9 +1002,9 @@ hash-sum "^2.0.0" "@vitejs/plugin-vue@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.2.1.tgz#6de49436fc346f829a56676066428e3f011522ac" - integrity sha512-TG+LbEUNwfFrx1VyN+iq+PsiGd9MT16hUdJY+BnMXj3MrLAF8m3VYUspTDM3aXoh48YDmAkMjG4gWFRg3lbG5A== + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.2.2.tgz#b0038fc11b9099f4cd01fcbf0ee419adda417b52" + integrity sha512-5BI2WFfs/Z0pAV4S/IQf1oH3bmFYlL5ATMBHgTt1Lf7hAnfpNd5oUAAs6hZPfk3QhvyUQgtk0rJBlabwNFcBJQ== "@vue/babel-helper-vue-transform-on@^1.0.2": version "1.0.2" @@ -1145,9 +1145,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.1.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.1.tgz#fb0026885b9ac9f48bac1e185e4af472971149ff" - integrity sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g== + version "8.2.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb" + integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg== agent-base@6: version "6.0.2" @@ -2325,9 +2325,9 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.17.0: - version "7.24.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a" - integrity sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ== + version "7.25.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" + integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.0" @@ -3184,9 +3184,9 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-core-module@^2.1.0, is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" + integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== dependencies: has "^1.0.3" @@ -4112,9 +4112,9 @@ lint-staged@^10.5.3: stringify-object "^3.3.0" listr2@^3.2.2: - version "3.7.1" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.7.1.tgz#ff0c410b10eb1c5c76735e4814128ec8f7d2b983" - integrity sha512-cNd368GTrk8351/ov/IV+BSwyf9sJRgI0UIvfORonCZA1u9UHAtAlqSEv9dgafoQIA1CgB3nu4No79pJtK2LHw== + version "3.8.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.8.0.tgz#40dcbcae83cca1005570ff0cc76cc35b51576d09" + integrity sha512-TWxRzND4v6UI+Fs3FrNohYcz48jyZUyzvSLgrGTe9TXKLf84T0EfjmP5e27p6e031q3VGl6vBbHdueGFUxgczQ== dependencies: chalk "^4.1.0" cli-truncate "^2.1.0" @@ -5802,9 +5802,9 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== table@^6.0.4: - version "6.3.4" - resolved "https://registry.yarnpkg.com/table/-/table-6.3.4.tgz#5d8a7fa1c887bd1ef08741751ec36246255a80b6" - integrity sha512-fhKcZ3+oAYG/ld3seJEZ9+fGSsy+yeoPzLQUrwbOzNYdhrU+6TzObhJ2Sp76ZfUGIrDTrxsXz5NSCZJIUOJb4Q== + version "6.5.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.5.1.tgz#930885a7430f15f8766b35cd1e36de40793db523" + integrity sha512-xGDXWTBJxahkzPQCsn1S9ESHEenU7TbMD5Iv4FeopXv/XwJyWatFjfbor+6ipI10/MNPXBYUamYukOrbPZ9L/w== dependencies: ajv "^8.0.1" lodash.clonedeep "^4.5.0" @@ -5812,6 +5812,7 @@ table@^6.0.4: lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" tar-fs@^2.0.0: version "2.1.1" @@ -6163,10 +6164,10 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vite@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.2.1.tgz#90c481f69371f32867d86a6a623bb064b876ad3d" - integrity sha512-KIqK90EoJJpuqE86Y9DSkZjFNGgsyZX/4I1xENIitLRd3hgRtOlIGCJYrNnBD9/eqipz0OroAiIj9/R1JcOdFA== +vite@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.2.3.tgz#1acbdfa56ac00e00e7ccb6988f63f130c2f99dbb" + integrity sha512-PtjyBL4GtACM+uT5q5hi2+AlMBbb6YI2b2bam6QI8ZdZt4FezseF0yZHQx0G+b3po9jIJ/GS5N9gc5Yq9Rue7g== dependencies: esbuild "^0.9.3" postcss "^8.2.1"