diff --git a/jest.config.js b/jest.config.js index 7fe180724..f5bfba14f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -96,7 +96,6 @@ module.exports = { // A map from regular expressions to module names that allow to stub out resources with a single module moduleNameMapper: { - '^@intlify/core/src/runtime$': '/packages/core/src/index.ts', '^@intlify/(.*?)$': '/packages/$1/src', 'vue-i18n': '/packages/vue-i18n/src' }, diff --git a/packages/core-base/LICENSE b/packages/core-base/LICENSE new file mode 100644 index 000000000..c02ff3ea6 --- /dev/null +++ b/packages/core-base/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2020 kazuya kawaguchi + +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. diff --git a/packages/core-base/README.md b/packages/core-base/README.md new file mode 100644 index 000000000..1b7c34803 --- /dev/null +++ b/packages/core-base/README.md @@ -0,0 +1,7 @@ +# @intlify/core-base + +The intlify core base module + +## :copyright: License + +[MIT](http://opensource.org/licenses/MIT) diff --git a/packages/core-base/api-extractor.json b/packages/core-base/api-extractor.json new file mode 100644 index 000000000..5602b3a6f --- /dev/null +++ b/packages/core-base/api-extractor.json @@ -0,0 +1,7 @@ +{ + "extends": "../../api-extractor.json", + "mainEntryPointFilePath": "./dist/packages//src/index.d.ts", + "dtsRollup": { + "publicTrimmedFilePath": "./dist/.d.ts" + } +} diff --git a/packages/core-base/index.js b/packages/core-base/index.js new file mode 100644 index 000000000..657e0e621 --- /dev/null +++ b/packages/core-base/index.js @@ -0,0 +1,7 @@ +'use strict' + +if (process.env.NODE_ENV === 'production') { + module.exports = require('./dist/core-base.cjs.prod.js') +} else { + module.exports = require('./dist/core-base.cjs.js') +} diff --git a/packages/core-base/package.json b/packages/core-base/package.json new file mode 100644 index 000000000..d77655aae --- /dev/null +++ b/packages/core-base/package.json @@ -0,0 +1,54 @@ +{ + "name": "@intlify/core-base", + "version": "9.0.0-beta.12", + "description": "@intlify/core-base", + "keywords": [ + "core", + "fundamental", + "i18n", + "internationalization", + "intlify" + ], + "license": "MIT", + "author": { + "name": "kazuya kawaguchi", + "email": "kawakazu80@gmail.com" + }, + "homepage": "https://github.com/intlify/vue-i18n-next/tree/master/packages/core-base#readme", + "repository": { + "type": "git", + "url": "git+https://github.com/intlify/vue-i18n-next.git", + "directory": "packages/core" + }, + "bugs": { + "url": "https://github.com/intlify/vue-i18n-next/issues" + }, + "files": [ + "index.js", + "dist" + ], + "main": "index.js", + "module": "dist/core-base.esm-bundler.js", + "unpkg": "dist/core-base.global.js", + "jsdelivr": "dist/core-base.global.js", + "types": "dist/core-base.d.ts", + "dependencies": { + "@intlify/message-compiler": "9.0.0-beta.12", + "@intlify/message-resolver": "9.0.0-beta.12", + "@intlify/runtime": "9.0.0-beta.12", + "@intlify/shared": "9.0.0-beta.12" + }, + "engines": { + "node": ">= 10" + }, + "buildOptions": { + "name": "IntlifyCoreBase", + "formats": [ + "esm-bundler", + "esm-browser", + "cjs", + "global" + ] + }, + "sideEffects": false +} diff --git a/packages/core/src/compile.ts b/packages/core-base/src/compile.ts similarity index 100% rename from packages/core/src/compile.ts rename to packages/core-base/src/compile.ts diff --git a/packages/core/src/context.ts b/packages/core-base/src/context.ts similarity index 100% rename from packages/core/src/context.ts rename to packages/core-base/src/context.ts diff --git a/packages/core/src/datetime.ts b/packages/core-base/src/datetime.ts similarity index 100% rename from packages/core/src/datetime.ts rename to packages/core-base/src/datetime.ts diff --git a/packages/core/src/debugger/constants.ts b/packages/core-base/src/debugger/constants.ts similarity index 100% rename from packages/core/src/debugger/constants.ts rename to packages/core-base/src/debugger/constants.ts diff --git a/packages/core/src/debugger/emittable.ts b/packages/core-base/src/debugger/emittable.ts similarity index 100% rename from packages/core/src/debugger/emittable.ts rename to packages/core-base/src/debugger/emittable.ts diff --git a/packages/core/src/debugger/emitter.ts b/packages/core-base/src/debugger/emitter.ts similarity index 100% rename from packages/core/src/debugger/emitter.ts rename to packages/core-base/src/debugger/emitter.ts diff --git a/packages/core/src/debugger/index.ts b/packages/core-base/src/debugger/index.ts similarity index 100% rename from packages/core/src/debugger/index.ts rename to packages/core-base/src/debugger/index.ts diff --git a/packages/core/src/errors.ts b/packages/core-base/src/errors.ts similarity index 100% rename from packages/core/src/errors.ts rename to packages/core-base/src/errors.ts diff --git a/packages/core-base/src/index.ts b/packages/core-base/src/index.ts new file mode 100644 index 000000000..308767947 --- /dev/null +++ b/packages/core-base/src/index.ts @@ -0,0 +1,16 @@ +export * from '@intlify/message-resolver' +export * from '@intlify/runtime' +export { + CompileError, + CompileErrorCodes, + createCompileError +} from '@intlify/message-compiler' +export * from './context' +export * from './compile' +export * from './translate' +export * from './datetime' +export * from './number' +export * from './debugger' +export { getWarnMessage, CoreWarnCodes } from './warnings' +export { CoreError, CoreErrorCodes, createCoreError } from './errors' +export * from './types' diff --git a/packages/core/src/intl.ts b/packages/core-base/src/intl.ts similarity index 100% rename from packages/core/src/intl.ts rename to packages/core-base/src/intl.ts diff --git a/packages/core/src/number.ts b/packages/core-base/src/number.ts similarity index 100% rename from packages/core/src/number.ts rename to packages/core-base/src/number.ts diff --git a/packages/core/src/translate.ts b/packages/core-base/src/translate.ts similarity index 100% rename from packages/core/src/translate.ts rename to packages/core-base/src/translate.ts diff --git a/packages/core/src/types.ts b/packages/core-base/src/types.ts similarity index 100% rename from packages/core/src/types.ts rename to packages/core-base/src/types.ts diff --git a/packages/core/src/warnings.ts b/packages/core-base/src/warnings.ts similarity index 100% rename from packages/core/src/warnings.ts rename to packages/core-base/src/warnings.ts diff --git a/packages/core/test/context.test.ts b/packages/core-base/test/context.test.ts similarity index 100% rename from packages/core/test/context.test.ts rename to packages/core-base/test/context.test.ts diff --git a/packages/core/test/datetime.test.ts b/packages/core-base/test/datetime.test.ts similarity index 100% rename from packages/core/test/datetime.test.ts rename to packages/core-base/test/datetime.test.ts diff --git a/packages/core/test/emitter.test.ts b/packages/core-base/test/emitter.test.ts similarity index 100% rename from packages/core/test/emitter.test.ts rename to packages/core-base/test/emitter.test.ts diff --git a/packages/core/test/number.test.ts b/packages/core-base/test/number.test.ts similarity index 100% rename from packages/core/test/number.test.ts rename to packages/core-base/test/number.test.ts diff --git a/packages/core/test/translate.test.ts b/packages/core-base/test/translate.test.ts similarity index 100% rename from packages/core/test/translate.test.ts rename to packages/core-base/test/translate.test.ts diff --git a/packages/core/package.json b/packages/core/package.json index e5ec0a752..f85b71cd0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -23,17 +23,17 @@ "bugs": { "url": "https://github.com/intlify/vue-i18n-next/issues" }, - "files": ["index.js", "dist"], + "files": [ + "index.js", + "dist" + ], "main": "index.js", "module": "dist/core.esm-bundler.js", "unpkg": "dist/core.global.js", "jsdelivr": "dist/core.global.js", "types": "dist/core.d.ts", "dependencies": { - "@intlify/message-compiler": "9.0.0-beta.12", - "@intlify/message-resolver": "9.0.0-beta.12", - "@intlify/runtime": "9.0.0-beta.12", - "@intlify/shared": "9.0.0-beta.12" + "@intlify/core-base": "9.0.0-beta.12" }, "engines": { "node": ">= 10" diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index dfeafe910..af0cc3a99 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,15 +1,6 @@ -import { registerMessageCompiler } from './context' -import { compileToFunction } from './compile' +import { registerMessageCompiler, compileToFunction } from '@intlify/core-base' // register message compiler at @intlify/core registerMessageCompiler(compileToFunction) -export * from './context' -export * from './compile' -export * from './translate' -export * from './datetime' -export * from './number' -export * from './debugger' -export * from './warnings' -export * from './errors' -export * from './types' +export * from '@intlify/core-base' diff --git a/packages/core/src/runtime.ts b/packages/core/src/runtime.ts index 114783a77..3900d95e3 100644 --- a/packages/core/src/runtime.ts +++ b/packages/core/src/runtime.ts @@ -1,10 +1 @@ -// NOTE: for runtime only buidling & vue-i18n direct inmporting -export * from './context' -export * from './compile' -export * from './translate' -export * from './datetime' -export * from './number' -export * from './debugger' -export * from './warnings' -export * from './errors' -export * from './types' +export * from '@intlify/core-base' diff --git a/packages/core/test/.gitkeep b/packages/core/test/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/packages/message-compiler/package.json b/packages/message-compiler/package.json index db533dcfa..ab1f3b76a 100644 --- a/packages/message-compiler/package.json +++ b/packages/message-compiler/package.json @@ -23,7 +23,10 @@ "bugs": { "url": "https://github.com/intlify/vue-i18n-next/issues" }, - "files": ["index.js", "dist"], + "files": [ + "index.js", + "dist" + ], "main": "index.js", "module": "dist/message-compiler.esm-bundler.js", "unpkg": "dist/message-compiler.global.js", @@ -39,7 +42,12 @@ }, "buildOptions": { "name": "IntlifyMessageCompiler", - "formats": ["esm-bundler", "esm-browser", "cjs", "global"] + "formats": [ + "esm-bundler", + "esm-browser", + "cjs", + "global" + ] }, "sideEffects": false } diff --git a/packages/runtime/package.json b/packages/runtime/package.json index da994dc06..764f37d79 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -2,7 +2,12 @@ "name": "@intlify/runtime", "version": "9.0.0-beta.12", "description": "@intlify/runtime", - "keywords": ["i18n", "internationalization", "intlify", "runtime"], + "keywords": [ + "i18n", + "internationalization", + "intlify", + "runtime" + ], "license": "MIT", "author": { "name": "kazuya kawaguchi", @@ -17,7 +22,10 @@ "bugs": { "url": "https://github.com/intlify/vue-i18n-next/issues" }, - "files": ["index.js", "dist"], + "files": [ + "index.js", + "dist" + ], "main": "index.js", "module": "dist/runtime.esm-bundler.js", "types": "dist/runtime.d.ts", @@ -31,7 +39,10 @@ }, "buildOptions": { "name": "IntlifyRuntime", - "formats": ["esm-bundler", "cjs"] + "formats": [ + "esm-bundler", + "cjs" + ] }, "sideEffects": false } diff --git a/packages/size-check-core/package.json b/packages/size-check-core/package.json index bd3b60794..01ef88ec9 100644 --- a/packages/size-check-core/package.json +++ b/packages/size-check-core/package.json @@ -1,4 +1,7 @@ { "name": "@intlify/size-check-core", - "private": true + "private": true, + "dependencies": { + "@intlify/core": "9.0.0-beta.12" + } } diff --git a/packages/size-check-core/rollup.config.js b/packages/size-check-core/rollup.config.js index 660067fbc..7f7f785f6 100644 --- a/packages/size-check-core/rollup.config.js +++ b/packages/size-check-core/rollup.config.js @@ -5,7 +5,6 @@ import commonjs from '@rollup/plugin-commonjs' import { terser } from 'rollup-plugin-terser' const config = { - external: [], output: { file: path.resolve(__dirname, './dist/index.js'), format: 'es' diff --git a/packages/size-check-core/src/index.js b/packages/size-check-core/src/index.js index 1f71938fd..3800e39ea 100644 --- a/packages/size-check-core/src/index.js +++ b/packages/size-check-core/src/index.js @@ -1,7 +1,4 @@ -import { - createCoreContext, - translate -} from '../../core/dist/core.runtime.esm-bundler.js' +import { createCoreContext, translate } from '@intlify/core' const ctx = createCoreContext({ locale: 'en', diff --git a/packages/size-check-vue-i18n/package.json b/packages/size-check-vue-i18n/package.json index 6a5167ff3..481c1edfb 100644 --- a/packages/size-check-vue-i18n/package.json +++ b/packages/size-check-vue-i18n/package.json @@ -1,4 +1,7 @@ { "name": "@intlify/size-check-vue-i18n", - "private": true + "private": true, + "dependencies": { + "@intlify/vue-i18n": "9.0.0-beta.12" + } } diff --git a/packages/vue-i18n/package.json b/packages/vue-i18n/package.json index 261733730..5b187973b 100644 --- a/packages/vue-i18n/package.json +++ b/packages/vue-i18n/package.json @@ -24,17 +24,17 @@ "bugs": { "url": "https://github.com/intlify/vue-i18n-next/issues" }, - "files": ["index.js", "dist"], + "files": [ + "index.js", + "dist" + ], "main": "index.js", "module": "dist/vue-i18n.esm-bundler.js", "unpkg": "dist/vue-i18n.global.js", "jsdelivr": "dist/vue-i18n.global.js", "types": "dist/vue-i18n.d.ts", "dependencies": { - "@intlify/core": "9.0.0-beta.12", - "@intlify/message-compiler": "9.0.0-beta.12", - "@intlify/message-resolver": "9.0.0-beta.12", - "@intlify/runtime": "9.0.0-beta.12", + "@intlify/core-base": "9.0.0-beta.12", "@intlify/shared": "9.0.0-beta.12", "@vue/devtools-api": "^6.0.0-beta.2" }, diff --git a/packages/vue-i18n/src/components/DatetimeFormat.ts b/packages/vue-i18n/src/components/DatetimeFormat.ts index 28164184e..89c38c0a6 100644 --- a/packages/vue-i18n/src/components/DatetimeFormat.ts +++ b/packages/vue-i18n/src/components/DatetimeFormat.ts @@ -4,7 +4,7 @@ import { renderFormatter } from './formatRenderer' import { baseFormatProps } from './base' import type { RenderFunction, SetupContext } from 'vue' -import type { DateTimeOptions } from '@intlify/core/src/runtime' +import type { DateTimeOptions } from '@intlify/core-base' import type { Composer, ComposerInternal } from '../composer' import type { FormattableProps } from './formatRenderer' diff --git a/packages/vue-i18n/src/components/NumberFormat.ts b/packages/vue-i18n/src/components/NumberFormat.ts index 194bf8fca..52673eaaa 100644 --- a/packages/vue-i18n/src/components/NumberFormat.ts +++ b/packages/vue-i18n/src/components/NumberFormat.ts @@ -4,7 +4,7 @@ import { renderFormatter } from './formatRenderer' import { baseFormatProps } from './base' import type { SetupContext, RenderFunction } from 'vue' -import type { NumberOptions } from '@intlify/core/src/runtime' +import type { NumberOptions } from '@intlify/core-base' import type { Composer, ComposerInternal } from '../composer' import type { FormattableProps } from './formatRenderer' diff --git a/packages/vue-i18n/src/components/Translation.ts b/packages/vue-i18n/src/components/Translation.ts index 47a4e9c70..b0e303deb 100644 --- a/packages/vue-i18n/src/components/Translation.ts +++ b/packages/vue-i18n/src/components/Translation.ts @@ -6,7 +6,7 @@ import { baseFormatProps } from './base' import type { SetupContext, VNodeChild, RenderFunction } from 'vue' import type { Composer, ComposerInternal } from '../composer' -import type { TranslateOptions } from '@intlify/core/src/runtime' +import type { TranslateOptions } from '@intlify/core-base' import type { NamedValue } from '@intlify/runtime' import type { BaseFormatProps } from './base' diff --git a/packages/vue-i18n/src/components/base.ts b/packages/vue-i18n/src/components/base.ts index 842538ea5..9e492ddb4 100644 --- a/packages/vue-i18n/src/components/base.ts +++ b/packages/vue-i18n/src/components/base.ts @@ -1,4 +1,4 @@ -import type { Locale } from '@intlify/core/src/runtime' +import type { Locale } from '@intlify/core' import type { I18nScope } from '../i18n' export type ComponetI18nScope = Exclude diff --git a/packages/vue-i18n/src/components/formatRenderer.ts b/packages/vue-i18n/src/components/formatRenderer.ts index 227532f86..2da3612d5 100644 --- a/packages/vue-i18n/src/components/formatRenderer.ts +++ b/packages/vue-i18n/src/components/formatRenderer.ts @@ -7,7 +7,7 @@ import type { VNodeChild, VNodeArrayChildren } from 'vue' -import type { NumberOptions, DateTimeOptions } from '@intlify/core/src/runtime' +import type { NumberOptions, DateTimeOptions } from '@intlify/core-base' import type { BaseFormatProps } from './base' /** diff --git a/packages/vue-i18n/src/composer.ts b/packages/vue-i18n/src/composer.ts index cf5e3e35f..3c67b3416 100644 --- a/packages/vue-i18n/src/composer.ts +++ b/packages/vue-i18n/src/composer.ts @@ -25,8 +25,9 @@ import { makeSymbol, isObject } from '@intlify/shared' -import { parse as parsePath, resolveValue } from '@intlify/message-resolver' import { + parse as parsePath, + resolveValue, createCoreContext, MISSING_RESOLVE_VALUE, updateFallbackLocale, @@ -40,14 +41,20 @@ import { clearNumberFormat, NOT_REOSLVED, DevToolsTimelineEvents -} from '@intlify/core/src/runtime' +} from '@intlify/core-base' import { I18nWarnCodes, getWarnMessage } from './warnings' import { I18nErrorCodes, createI18nError } from './errors' import type { ComponentInternalInstance, VNode, VNodeArrayChildren } from 'vue' import type { WritableComputedRef, ComputedRef } from '@vue/reactivity' -import type { Path } from '@intlify/message-resolver' import type { + Path, + LinkedModifiers, + PluralizationRules, + NamedValue, + MessageFunctions, + MessageProcessor, + MessageType, Locale, LocaleMessageValue, LocaleMessages, @@ -70,15 +77,7 @@ import type { NumberFormats as NumberFormatsType, DateTimeFormat, NumberFormat -} from '@intlify/core/src/runtime' -import type { - LinkedModifiers, - PluralizationRules, - NamedValue, - MessageFunctions, - MessageProcessor, - MessageType -} from '@intlify/runtime' +} from '@intlify/core-base' // extend VNode interface declare module '@vue/runtime-core' { diff --git a/packages/vue-i18n/src/devtools.ts b/packages/vue-i18n/src/devtools.ts index 70c3dd8d3..3665b7953 100644 --- a/packages/vue-i18n/src/devtools.ts +++ b/packages/vue-i18n/src/devtools.ts @@ -6,7 +6,7 @@ import { DevToolsPlaceholders, DevToolsTimelineEvents, DevToolsTimelineLayerMaps -} from '@intlify/core/src/runtime' +} from '@intlify/core-base' import type { App } from 'vue' import type { @@ -17,7 +17,7 @@ import type { ComponentStateBase, HookPayloads } from '@vue/devtools-api' -import type { DevToolsTimelineEventPayloads } from '@intlify/core/src/runtime' +import type { DevToolsTimelineEventPayloads } from '@intlify/core-base' import type { I18n, I18nInternal } from './i18n' import type { Composer } from './composer' import type { VueI18nInternal } from './legacy' diff --git a/packages/vue-i18n/src/directive.ts b/packages/vue-i18n/src/directive.ts index bf1caa891..f921f7ef6 100644 --- a/packages/vue-i18n/src/directive.ts +++ b/packages/vue-i18n/src/directive.ts @@ -1,6 +1,6 @@ import { I18nWarnCodes, getWarnMessage } from './warnings' -import { isString, isPlainObject, isNumber, warn } from '@intlify/shared' import { createI18nError, I18nErrorCodes } from './errors' +import { isString, isPlainObject, isNumber, warn } from '@intlify/shared' import type { DirectiveBinding, @@ -10,8 +10,7 @@ import type { import type { I18n, I18nInternal } from './i18n' import type { VueI18n, VueI18nInternal } from './legacy' import type { Composer } from './composer' -import type { Locale, TranslateOptions } from '@intlify/core/src/runtime' -import type { NamedValue } from '@intlify/runtime' +import type { Locale, TranslateOptions, NamedValue } from '@intlify/core-base' type VTDirectiveValue = { path: string diff --git a/packages/vue-i18n/src/errors.ts b/packages/vue-i18n/src/errors.ts index e462cc1bc..f073dd146 100644 --- a/packages/vue-i18n/src/errors.ts +++ b/packages/vue-i18n/src/errors.ts @@ -2,7 +2,7 @@ import { CompileError, CompileErrorCodes, createCompileError -} from '@intlify/message-compiler' +} from '@intlify/core-base' export interface I18nError extends CompileError { code: I18nErrorCodes diff --git a/packages/vue-i18n/src/i18n.ts b/packages/vue-i18n/src/i18n.ts index 381a8ac40..35bf5ec87 100644 --- a/packages/vue-i18n/src/i18n.ts +++ b/packages/vue-i18n/src/i18n.ts @@ -29,7 +29,7 @@ import { enableDevTools, addTimelineEvent } from './devtools' -import { createEmitter } from '@intlify/core/src/runtime' +import { createEmitter } from '@intlify/core-base' import { VERSION } from './misc' import type { ComponentInternalInstance, ComponentOptions, App } from 'vue' @@ -41,7 +41,7 @@ import type { NumberFormat, DevToolsEmitter, DevToolsEmitterEvents -} from '@intlify/core/src/runtime' +} from '@intlify/core-base' import type { VueMessageType, Composer, diff --git a/packages/vue-i18n/src/index.ts b/packages/vue-i18n/src/index.ts index 141fbb08e..c6cec1035 100644 --- a/packages/vue-i18n/src/index.ts +++ b/packages/vue-i18n/src/index.ts @@ -1,25 +1,21 @@ import { initDev, initFeatureFlags } from './misc' -import { - registerMessageCompiler, - compileToFunction -} from '@intlify/core/src/runtime' +import { registerMessageCompiler, compileToFunction } from '@intlify/core' // register message compiler at vue-i18n registerMessageCompiler(compileToFunction) -export { Path, PathValue } from '@intlify/message-resolver' export { + Path, + PathValue, MessageFunction, MessageFunctions, PluralizationRule, - LinkedModifiers -} from '@intlify/runtime' -export { + LinkedModifiers, TranslateOptions, DateTimeOptions, NumberOptions, PostTranslationHandler -} from '@intlify/core/src/runtime' +} from '@intlify/core-base' export { VueMessageType, MissingHandler, diff --git a/packages/vue-i18n/src/legacy.ts b/packages/vue-i18n/src/legacy.ts index 0f1b7c079..d42ba56da 100644 --- a/packages/vue-i18n/src/legacy.ts +++ b/packages/vue-i18n/src/legacy.ts @@ -18,14 +18,12 @@ import { warn } from '@intlify/shared' -import type { Path } from '@intlify/message-resolver' import type { + Path, PluralizationRule, PluralizationRules, LinkedModifiers, - NamedValue -} from '@intlify/runtime' -import type { + NamedValue, Locale, LocaleMessages, LocaleMessageDictionary, @@ -38,7 +36,7 @@ import type { DateTimeFormat, NumberFormat, DevToolsEmitter -} from '@intlify/core/src/runtime' +} from '@intlify/core-base' import type { VueMessageType, MissingHandler, diff --git a/packages/vue-i18n/src/mixin.ts b/packages/vue-i18n/src/mixin.ts index 74a84b9bd..e6b8baf73 100644 --- a/packages/vue-i18n/src/mixin.ts +++ b/packages/vue-i18n/src/mixin.ts @@ -3,16 +3,16 @@ import { getLocaleMessages } from './composer' import { createVueI18n } from './legacy' import { createI18nError, I18nErrorCodes } from './errors' import { addTimelineEvent } from './devtools' -import { createEmitter } from '@intlify/core/src/runtime' +import { createEmitter } from '@intlify/core-base' import type { ComponentOptions } from 'vue' -import type { Path } from '@intlify/message-resolver' +import type { Path } from '@intlify/core-base' import type { Locale, LocaleMessageValue, DevToolsEmitter, DevToolsEmitterEvents -} from '@intlify/core/src/runtime' +} from '@intlify/core' import type { Composer, ComposerInternalOptions, diff --git a/packages/vue-i18n/src/runtime.ts b/packages/vue-i18n/src/runtime.ts index 64062cdc0..ef8d448b5 100644 --- a/packages/vue-i18n/src/runtime.ts +++ b/packages/vue-i18n/src/runtime.ts @@ -1,18 +1,17 @@ import { initDev, initFeatureFlags } from './misc' -export { Path, PathValue } from '@intlify/message-resolver' export { + Path, + PathValue, MessageFunction, MessageFunctions, PluralizationRule, - LinkedModifiers -} from '@intlify/runtime' -export { + LinkedModifiers, TranslateOptions, DateTimeOptions, NumberOptions, PostTranslationHandler -} from '@intlify/core/src/runtime' +} from '@intlify/core-base' export { VueMessageType, MissingHandler, diff --git a/packages/vue-i18n/src/warnings.ts b/packages/vue-i18n/src/warnings.ts index a582fcccf..00c8ecc7c 100644 --- a/packages/vue-i18n/src/warnings.ts +++ b/packages/vue-i18n/src/warnings.ts @@ -1,5 +1,5 @@ import { format } from '@intlify/shared' -import { CoreWarnCodes } from '@intlify/core/src/runtime' +import { CoreWarnCodes } from '@intlify/core-base' export const enum I18nWarnCodes { FALLBACK_TO_ROOT = CoreWarnCodes.__EXTEND_POINT__, diff --git a/packages/vue-i18n/test/__snapshots__/utils.test.ts.snap b/packages/vue-i18n/test/__snapshots__/utils.test.ts.snap deleted file mode 100644 index 15a349133..000000000 --- a/packages/vue-i18n/test/__snapshots__/utils.test.ts.snap +++ /dev/null @@ -1,6 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`generateCodeFrame 1`] = ` -"1 | hi, { 'kazupon' } - | ^^^^^^^^^^^^^" -`; diff --git a/packages/vue-i18n/test/components/DatetimeFormat.test.ts b/packages/vue-i18n/test/components/DatetimeFormat.test.ts index ae374e4d5..8d5c2ce4d 100644 --- a/packages/vue-i18n/test/components/DatetimeFormat.test.ts +++ b/packages/vue-i18n/test/components/DatetimeFormat.test.ts @@ -4,7 +4,7 @@ import { mount } from '../helper' import { defineComponent, SetupContext, VNodeChild, h } from 'vue' -import { createI18n } from '../../src/i18n' +import { createI18n } from '../../src/index' const datetimeFormats = { 'en-US': { diff --git a/packages/vue-i18n/test/components/NumberFormat.test.ts b/packages/vue-i18n/test/components/NumberFormat.test.ts index 46b5ea0a5..b609c8622 100644 --- a/packages/vue-i18n/test/components/NumberFormat.test.ts +++ b/packages/vue-i18n/test/components/NumberFormat.test.ts @@ -4,7 +4,7 @@ import { mount } from '../helper' import { defineComponent, SetupContext, VNodeChild, h } from 'vue' -import { createI18n } from '../../src/i18n' +import { createI18n } from '../../src/index' const numberFormats = { 'en-US': { diff --git a/packages/vue-i18n/test/components/Translation.test.ts b/packages/vue-i18n/test/components/Translation.test.ts index b6667091d..7fabf46a2 100644 --- a/packages/vue-i18n/test/components/Translation.test.ts +++ b/packages/vue-i18n/test/components/Translation.test.ts @@ -4,7 +4,7 @@ import { mount } from '../helper' import { h, defineComponent, SetupContext, VNodeChild, ref } from 'vue' -import { createI18n, useI18n } from '../../src/i18n' +import { createI18n, useI18n } from '../../src/index' const messages = { en: { diff --git a/packages/vue-i18n/test/composer.test.ts b/packages/vue-i18n/test/composer.test.ts index 4c9c2265b..043788e89 100644 --- a/packages/vue-i18n/test/composer.test.ts +++ b/packages/vue-i18n/test/composer.test.ts @@ -19,7 +19,15 @@ import { } from '../src/composer' import { generateFormatCacheKey } from '@intlify/shared' import { watch, watchEffect, nextTick, Text, createVNode } from 'vue' -import { Locale } from '@intlify/core' +import { + Locale, + compileToFunction, + registerMessageCompiler +} from '@intlify/core-base' + +beforeEach(() => { + registerMessageCompiler(compileToFunction) +}) describe('locale', () => { test('default value', () => { diff --git a/packages/vue-i18n/test/diretive.test.ts b/packages/vue-i18n/test/diretive.test.ts index bcf4f9473..a2b3620b7 100644 --- a/packages/vue-i18n/test/diretive.test.ts +++ b/packages/vue-i18n/test/diretive.test.ts @@ -13,7 +13,7 @@ import { warn } from '@intlify/shared' import { mount } from './helper' import { defineComponent, ref, h, withDirectives, resolveDirective } from 'vue' -import { createI18n } from '../src/i18n' +import { createI18n } from '../src/index' import { errorMessages, I18nErrorCodes } from '../src/errors' import { getWarnMessage, I18nWarnCodes } from '../src/warnings' import { format } from '@intlify/shared' diff --git a/packages/vue-i18n/test/i18n.test.ts b/packages/vue-i18n/test/i18n.test.ts index ed0cbfb50..a33646882 100644 --- a/packages/vue-i18n/test/i18n.test.ts +++ b/packages/vue-i18n/test/i18n.test.ts @@ -9,7 +9,7 @@ import { ComponentOptions } from 'vue' import { mount } from './helper' -import { createI18n, useI18n } from '../src/i18n' +import { createI18n, useI18n } from '../src/index' import { errorMessages, I18nErrorCodes } from '../src/errors' import { Composer } from '../src/composer' diff --git a/packages/vue-i18n/test/legacy.test.ts b/packages/vue-i18n/test/legacy.test.ts index ccda23bb0..3f4de66ac 100644 --- a/packages/vue-i18n/test/legacy.test.ts +++ b/packages/vue-i18n/test/legacy.test.ts @@ -12,6 +12,11 @@ import { createVueI18n } from '../src/legacy' import { errorMessages, I18nErrorCodes } from '../src/errors' import { getWarnMessage, I18nWarnCodes } from '../src/warnings' import { watchEffect, nextTick } from 'vue' +import { compileToFunction, registerMessageCompiler } from '@intlify/core-base' + +beforeEach(() => { + registerMessageCompiler(compileToFunction) +}) test('locale', () => { const i18n = createVueI18n() diff --git a/packages/vue-i18n/test/mixin.test.ts b/packages/vue-i18n/test/mixin.test.ts index b28b68d03..96880d145 100644 --- a/packages/vue-i18n/test/mixin.test.ts +++ b/packages/vue-i18n/test/mixin.test.ts @@ -4,7 +4,7 @@ import { mount } from './helper' import { defineComponent, nextTick } from 'vue' -import { createI18n } from '../src/i18n' +import { createI18n } from '../src/index' import { errorMessages, I18nErrorCodes } from '../src/errors' import { VueI18n } from '../src/legacy' diff --git a/packages/vue-i18n/test/utils.test.ts b/packages/vue-i18n/test/utils.test.ts deleted file mode 100644 index 831737ba2..000000000 --- a/packages/vue-i18n/test/utils.test.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { format, generateCodeFrame } from '@intlify/shared' - -test('format', () => { - expect(format(`foo: {0}`, 'x')).toEqual('foo: x') - expect(format(`foo: {0}, {1}`, 'x', 'y')).toEqual('foo: x, y') - expect(format(`foo: {x}, {y}`, { x: 1, y: 2 })).toEqual('foo: 1, 2') -}) - -test('generateCodeFrame', () => { - const source = `hi, { 'kazupon' }`.trim() - const keyStart = source.indexOf(`{ 'kazupon' }`) - const keyEnd = keyStart + `{ 'kazupon' }`.length - expect(generateCodeFrame(source, keyStart, keyEnd)).toMatchSnapshot() -}) diff --git a/ship.config.js b/ship.config.js index 9369a318a..f065fa31a 100644 --- a/ship.config.js +++ b/ship.config.js @@ -44,6 +44,7 @@ module.exports = { 'packages/message-resolver', 'packages/message-compiler', 'packages/runtime', + 'packages/core-base', 'packages/core', 'packages/vue-i18n' ], @@ -52,6 +53,7 @@ module.exports = { 'packages/message-resolver', 'packages/message-compiler', 'packages/runtime', + 'packages/core-base', 'packages/core', 'packages/vue-i18n' ] diff --git a/tsconfig.json b/tsconfig.json index 819d33991..323878961 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -70,7 +70,7 @@ "packages/global.d.ts", "packages/*/src", "packages/*/test" -, "packages/size-check-vue-i18n/rollup.config.js" ], + ], "exclude": ["node_modules"], "plugins": [ { diff --git a/yarn.lock b/yarn.lock index c0eca05d4..f41040f32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -126,33 +126,32 @@ "@babel/highlight" "^7.10.4" "@babel/core@^7.1.0", "@babel/core@^7.7.5": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" - integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" + integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" + "@babel/generator" "^7.12.10" "@babel/helper-module-transforms" "^7.12.1" "@babel/helpers" "^7.12.5" - "@babel/parser" "^7.12.7" + "@babel/parser" "^7.12.10" "@babel/template" "^7.12.7" - "@babel/traverse" "^7.12.9" - "@babel/types" "^7.12.7" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.10" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" json5 "^2.1.2" lodash "^4.17.19" - resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.12.5": - version "7.12.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de" - integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A== +"@babel/generator@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460" + integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww== dependencies: - "@babel/types" "^7.12.5" + "@babel/types" "^7.12.10" jsesc "^2.5.1" source-map "^0.5.0" @@ -166,11 +165,11 @@ "@babel/types" "^7.10.4" "@babel/helper-get-function-arity@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2" - integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" + integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== dependencies: - "@babel/types" "^7.10.4" + "@babel/types" "^7.12.10" "@babel/helper-member-expression-to-functions@^7.12.1": version "7.12.7" @@ -202,11 +201,11 @@ lodash "^4.17.19" "@babel/helper-optimise-call-expression@^7.10.4": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c" - integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw== + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" + integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== dependencies: - "@babel/types" "^7.12.7" + "@babel/types" "^7.12.10" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": version "7.10.4" @@ -260,10 +259,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.0", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056" - integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81" + integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -365,25 +364,25 @@ "@babel/parser" "^7.12.7" "@babel/types" "^7.12.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.7.0": - version "7.12.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f" - integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" + integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== dependencies: "@babel/code-frame" "^7.10.4" - "@babel/generator" "^7.12.5" + "@babel/generator" "^7.12.10" "@babel/helper-function-name" "^7.10.4" "@babel/helper-split-export-declaration" "^7.11.0" - "@babel/parser" "^7.12.7" - "@babel/types" "^7.12.7" + "@babel/parser" "^7.12.10" + "@babel/types" "^7.12.10" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0": - version "7.12.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13" - integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ== +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260" + integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw== dependencies: "@babel/helper-validator-identifier" "^7.10.4" lodash "^4.17.19" @@ -677,24 +676,24 @@ dependencies: vary "^1.1.2" -"@microsoft/api-extractor-model@7.12.0", "@microsoft/api-extractor-model@^7.12.0": - version "7.12.0" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.12.0.tgz#ad5589c166b31dad3c8669b46b050f8bc4056f1b" - integrity sha512-TxoAbL/lauS3k/brBWVsiQTnyHBwHrAGJhTuiD0tWS/eu4dLNULchcSQfcOaFS91OgDEz4lMMbClgChFuo+53Q== +"@microsoft/api-extractor-model@7.12.1", "@microsoft/api-extractor-model@^7.12.0": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.12.1.tgz#1f10915c434048da34e1c07845ba2623d5f23f66" + integrity sha512-Hw+kYfUb1gt6xPWGFW8APtLVWeNEWz4JE6PbLkSHw/j+G1hAaStzgxhBx3GOAWM/G0SCDGVJOpd5YheVOyu/KQ== dependencies: - "@microsoft/tsdoc" "0.12.19" - "@rushstack/node-core-library" "3.35.1" + "@microsoft/tsdoc" "0.12.24" + "@rushstack/node-core-library" "3.35.2" "@microsoft/api-extractor@^7.9.22": - version "7.12.0" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.12.0.tgz#3ab602cebaa18d357afc67471abba484d8dc20d4" - integrity sha512-YDd7AUkIayPLooMasDyV4vle1TLUQhFp2v/tGdRU+WAVbnyVUDXXa20WEfbPEZ4QVlgN+77EX6f2K6GyKd713A== - dependencies: - "@microsoft/api-extractor-model" "7.12.0" - "@microsoft/tsdoc" "0.12.19" - "@rushstack/node-core-library" "3.35.1" - "@rushstack/rig-package" "0.2.8" - "@rushstack/ts-command-line" "4.7.7" + version "7.12.1" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.12.1.tgz#4204be6c9f845d7d1796b6d51c58bcb25e7267e9" + integrity sha512-lleLrKkqiRvOQeoRMSHQY0wl/j9SxRVd9+Btyh/WWw0kHNy7nAKyzGmejvlz2XTn13H0elJWV6C3dxhaQy4mtA== + dependencies: + "@microsoft/api-extractor-model" "7.12.1" + "@microsoft/tsdoc" "0.12.24" + "@rushstack/node-core-library" "3.35.2" + "@rushstack/rig-package" "0.2.9" + "@rushstack/ts-command-line" "4.7.8" colors "~1.2.1" lodash "~4.17.15" resolve "~1.17.0" @@ -712,11 +711,6 @@ jju "~1.4.0" resolve "~1.19.0" -"@microsoft/tsdoc@0.12.19": - version "0.12.19" - resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.19.tgz#2173ccb92469aaf62031fa9499d21b16d07f9b57" - integrity sha512-IpgPxHrNxZiMNUSXqR1l/gePKPkfAmIKoDRP9hp7OwjU29ZR8WCJsOJ8iBKgw0Qk+pFwR+8Y1cy8ImLY6e9m4A== - "@microsoft/tsdoc@0.12.24", "@microsoft/tsdoc@^0.12.21": version "0.12.24" resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.24.tgz#30728e34ebc90351dd3aff4e18d038eed2c3e098" @@ -917,10 +911,10 @@ estree-walker "^2.0.1" picomatch "^2.2.2" -"@rushstack/node-core-library@3.35.1": - version "3.35.1" - resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.35.1.tgz#f228f010c6ec139c2f363a49dde8faed9a7167fe" - integrity sha512-ZwnXp2loZyVUgrZ+fEKKF/EHl0ikcy6SCsd34ewYXoEAs0XWIy2VS9bemrfaFtd2VzJ/G/ZbP3xHkqRnUPKJ4Q== +"@rushstack/node-core-library@3.35.2": + version "3.35.2" + resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.35.2.tgz#21ca879b5051a5ebafa952fafcd648a07a142bcb" + integrity sha512-SPd0uG7mwsf3E30np9afCUhtaM1SBpibrbxOXPz82KWV6SQiPUtXeQfhXq9mSnGxOb3WLWoSDe7AFxQNex3+kQ== dependencies: "@types/node" "10.17.13" colors "~1.2.1" @@ -932,19 +926,19 @@ timsort "~0.3.0" z-schema "~3.18.3" -"@rushstack/rig-package@0.2.8": - version "0.2.8" - resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.2.8.tgz#9ac26f56b3917bfa36f91bfe037e2c3a53977a6c" - integrity sha512-Ltjeg1a5Sx7XTW9oBxmcfhHseBLnH7I/8d6tAtjx5s0r7F6WmNVJdxVmt86qNfXcFRsiGNrzLqjMwlcX3GyldQ== +"@rushstack/rig-package@0.2.9": + version "0.2.9" + resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.2.9.tgz#57ef94e7f7703b18e275b603d3f59a1a16580716" + integrity sha512-4tqsZ/m+BjeNAGeAJYzPF53CT96TsAYeZ3Pq3T4tb1pGGM3d3TWfkmALZdKNhpRlAeShKUrb/o/f/0sAuK/1VQ== dependencies: "@types/node" "10.17.13" resolve "~1.17.0" strip-json-comments "~3.1.1" -"@rushstack/ts-command-line@4.7.7": - version "4.7.7" - resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.7.7.tgz#3a983de1895a931e879ecdc8037251af00c4e78b" - integrity sha512-COSDys0WTVCORKam2hsTL32As4fHAf1RqC6FKS98hgR0Z90nh1JX8fGNkvSdxaZ6dOuNTJj3txh+SpWoHJoZJA== +"@rushstack/ts-command-line@4.7.8": + version "4.7.8" + resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.7.8.tgz#3aa77cf544c571be3206fc2bcba20c7a096ed254" + integrity sha512-8ghIWhkph7NnLCMDJtthpsb7TMOsVGXVDvmxjE/CeklTqjbbUFBjGXizJfpbEkRQTELuZQ2+vGn7sGwIWKN2uA== dependencies: "@types/argparse" "1.0.38" argparse "~1.0.9" @@ -1159,9 +1153,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.0.16" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.16.tgz#0bbbf70c7bc4193210dd27e252c51260a37cd6a7" - integrity sha512-S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w== + version "7.11.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" + integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== dependencies: "@babel/types" "^7.3.0" @@ -1174,9 +1168,9 @@ "@types/node" "*" "@types/connect@*": - version "3.4.33" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546" - integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A== + version "3.4.34" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901" + integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ== dependencies: "@types/node" "*" @@ -1206,9 +1200,9 @@ integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== "@types/express-serve-static-core@*": - version "4.17.14" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz#cabf91debeeb3cb04b798e2cff908864e89b6106" - integrity sha512-uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA== + version "4.17.16" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.16.tgz#56626e2f60bdd9a5193bc84a1042a506eeb69da7" + integrity sha512-hGGiDMatRhcRF2F0EsxSX93iKQJom6No2RwwCm/dvVtNt6FMuq+A/Y4qUZZGqIjqe0LE/jN0wzW86yDFSJwn7A== dependencies: "@types/node" "*" "@types/qs" "*" @@ -1276,9 +1270,9 @@ "@types/istanbul-lib-report" "*" "@types/jest@26.x", "@types/jest@^26.0.14": - version "26.0.16" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.16.tgz#b47abd50f6ed0503f589db8e126fc8eb470cf87c" - integrity sha512-Gp12+7tmKCgv9JjtltxUXokohCAEZfpJaEW5tn871SGRp8I+bRWBonQO7vW5NHwnAHe5dd50+Q4zyKuN35i09g== + version "26.0.19" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790" + integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" @@ -1340,9 +1334,9 @@ integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== "@types/node@*", "@types/node@>= 8", "@types/node@>=8.9.0": - version "14.14.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785" - integrity sha512-J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ== + version "14.14.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.13.tgz#9e425079799322113ae8477297ae6ef51b8e0cdf" + integrity sha512-vbxr0VZ8exFMMAjCW8rJwaya0dMCDyYW2ZRdTyjtrCvJoENMpdUHOT/eTzvgyA5ZnqRZ/sI0NwqAxNHKYokLJQ== "@types/node@10.17.13": version "10.17.13" @@ -1407,60 +1401,60 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.9.0.tgz#8fde15743413661fdc086c9f1f5d74a80b856113" - integrity sha512-WrVzGMzzCrgrpnQMQm4Tnf+dk+wdl/YbgIgd5hKGa2P+lnJ2MON+nQnbwgbxtN9QDLi8HO+JAq0/krMnjQK6Cw== + version "4.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.10.0.tgz#19ed3baf4bc4232c5a7fcd32eaca75c3a5baf9f3" + integrity sha512-h6/V46o6aXpKRlarP1AiJEXuCJ7cMQdlpfMDrcllIgX3dFkLwEBTXAoNP98ZoOmqd1xvymMVRAI4e7yVvlzWEg== dependencies: - "@typescript-eslint/experimental-utils" "4.9.0" - "@typescript-eslint/scope-manager" "4.9.0" + "@typescript-eslint/experimental-utils" "4.10.0" + "@typescript-eslint/scope-manager" "4.10.0" debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.9.0.tgz#23a296b85d243afba24e75a43fd55aceda5141f0" - integrity sha512-0p8GnDWB3R2oGhmRXlEnCvYOtaBCijtA5uBfH5GxQKsukdSQyI4opC4NGTUb88CagsoNQ4rb/hId2JuMbzWKFQ== +"@typescript-eslint/experimental-utils@4.10.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.10.0.tgz#dbf5d0f89802d5feaf7d11e5b32df29bbc2f3a0e" + integrity sha512-opX+7ai1sdWBOIoBgpVJrH5e89ra1KoLrJTz0UtWAa4IekkKmqDosk5r6xqRaNJfCXEfteW4HXQAwMdx+jjEmw== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.9.0" - "@typescript-eslint/types" "4.9.0" - "@typescript-eslint/typescript-estree" "4.9.0" + "@typescript-eslint/scope-manager" "4.10.0" + "@typescript-eslint/types" "4.10.0" + "@typescript-eslint/typescript-estree" "4.10.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.9.0.tgz#bb65f1214b5e221604996db53ef77c9d62b09249" - integrity sha512-QRSDAV8tGZoQye/ogp28ypb8qpsZPV6FOLD+tbN4ohKUWHD2n/u0Q2tIBnCsGwQCiD94RdtLkcqpdK4vKcLCCw== + version "4.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.10.0.tgz#1a622b0847b765b2d8f0ede6f0cdd85f03d76031" + integrity sha512-amBvUUGBMadzCW6c/qaZmfr3t9PyevcSWw7hY2FuevdZVp5QPw/K76VSQ5Sw3BxlgYCHZcK6DjIhSZK0PQNsQg== dependencies: - "@typescript-eslint/scope-manager" "4.9.0" - "@typescript-eslint/types" "4.9.0" - "@typescript-eslint/typescript-estree" "4.9.0" + "@typescript-eslint/scope-manager" "4.10.0" + "@typescript-eslint/types" "4.10.0" + "@typescript-eslint/typescript-estree" "4.10.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.9.0.tgz#5eefe305d6b71d1c85af6587b048426bfd4d3708" - integrity sha512-q/81jtmcDtMRE+nfFt5pWqO0R41k46gpVLnuefqVOXl4QV1GdQoBWfk5REcipoJNQH9+F5l+dwa9Li5fbALjzg== +"@typescript-eslint/scope-manager@4.10.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.10.0.tgz#dbd7e1fc63d7363e3aaff742a6f2b8afdbac9d27" + integrity sha512-WAPVw35P+fcnOa8DEic0tQUhoJJsgt+g6DEcz257G7vHFMwmag58EfowdVbiNcdfcV27EFR0tUBVXkDoIvfisQ== dependencies: - "@typescript-eslint/types" "4.9.0" - "@typescript-eslint/visitor-keys" "4.9.0" + "@typescript-eslint/types" "4.10.0" + "@typescript-eslint/visitor-keys" "4.10.0" -"@typescript-eslint/types@4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.9.0.tgz#3fe8c3632abd07095c7458f7451bd14c85d0033c" - integrity sha512-luzLKmowfiM/IoJL/rus1K9iZpSJK6GlOS/1ezKplb7MkORt2dDcfi8g9B0bsF6JoRGhqn0D3Va55b+vredFHA== +"@typescript-eslint/types@4.10.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789" + integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g== -"@typescript-eslint/typescript-estree@4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.0.tgz#38a98df6ee281cfd6164d6f9d91795b37d9e508c" - integrity sha512-rmDR++PGrIyQzAtt3pPcmKWLr7MA+u/Cmq9b/rON3//t5WofNR4m/Ybft2vOLj0WtUzjn018ekHjTsnIyBsQug== +"@typescript-eslint/typescript-estree@4.10.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.10.0.tgz#1e62e45fd57866afd42daf5e9fb6bd4e8dbcfa75" + integrity sha512-mGK0YRp9TOk6ZqZ98F++bW6X5kMTzCRROJkGXH62d2azhghmq+1LNLylkGe6uGUOQzD452NOAEth5VAF6PDo5g== dependencies: - "@typescript-eslint/types" "4.9.0" - "@typescript-eslint/visitor-keys" "4.9.0" + "@typescript-eslint/types" "4.10.0" + "@typescript-eslint/visitor-keys" "4.10.0" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" @@ -1468,12 +1462,12 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.9.0": - version "4.9.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.0.tgz#f284e9fac43f2d6d35094ce137473ee321f266c8" - integrity sha512-sV45zfdRqQo1A97pOSx3fsjR+3blmwtdCt8LDrXgCX36v4Vmz4KHrhpV6Fo2cRdXmyumxx11AHw0pNJqCNpDyg== +"@typescript-eslint/visitor-keys@4.10.0": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.10.0.tgz#9478822329a9bc8ebcc80623d7f79a01da5ee451" + integrity sha512-hPyz5qmDMuZWFtHZkjcCpkAKHX8vdu1G3YsCLEd25ryZgnJfj6FQuJ5/O7R+dB1ueszilJmAFMtlU4CA6se3Jg== dependencies: - "@typescript-eslint/types" "4.9.0" + "@typescript-eslint/types" "4.10.0" eslint-visitor-keys "^2.0.0" "@vue/compiler-core@3.0.4": @@ -2282,9 +2276,9 @@ builtin-modules@^3.1.0: integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw== cac@^6.6.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/cac/-/cac-6.6.1.tgz#3dde3f6943f45d42a56729ea3573c08b3e7b6a6d" - integrity sha512-uhki4T3Ax68hw7Dufi0bATVAF8ayBSwOKUEJHjObPrUN4tlQ8Lf7oljpTje/mArLxYN0D743c2zJt4C1bVTCqg== + version "6.7.1" + resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.1.tgz#0609d28a31d887746de4b66a15e3914f106f880c" + integrity sha512-LfGt47+ugCY65W4yUEyxnZKd/tJSBJD/gUAxQGiQjH7yqdhbaX2XN0Rli4+0W0DJiDONmYeh0TlJxMtXGZspIg== cacache@^14.0.0: version "14.0.0" @@ -2763,9 +2757,9 @@ commander@^5.1.0: integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== commander@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75" - integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q== + version "6.2.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" + integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== commondir@^1.0.1: version "1.0.1" @@ -3600,9 +3594,9 @@ es6-promisify@^5.0.0: es6-promise "^4.0.3" esbuild@^0.8.12: - version "0.8.19" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.19.tgz#773a85175cc911a77d7edae5ebabb55f26a25c43" - integrity sha512-KeLnk6TA7yX+KEz9+eDUigJ6ZG5Z7P1pscYdBjlCMuiOFjtbm7/BCHLpLkxfaMT04KwXbS8Lovrzl9rA5xctQg== + version "0.8.23" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.23.tgz#8c4ccd3abb5f7b4ae9f31c571971517be4ae60d2" + integrity sha512-LkgCmotGnhVgRGxjDkTBBYrnJ5stcxK+40cEJGtXUS16hcAWy90cn1qjxKCogzLPJ75gW/L6ejly7VKrMstVGQ== escape-html@^1.0.3: version "1.0.3" @@ -3637,9 +3631,9 @@ eslint-config-prettier@^7.0.0: integrity sha512-8Y8lGLVPPZdaNA7JXqnvETVC7IiVRgAP6afQu9gOQRn90YY3otMNh+x7Vr2vMePQntF+5erdSUBqSzCmU/AxaQ== eslint-plugin-prettier@^3.1.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.2.0.tgz#af391b2226fa0e15c96f36c733f6e9035dbd952c" - integrity sha512-kOUSJnFjAUFKwVxuzy6sA5yyMx6+o9ino4gCdShzBNx4eyFRudWRYKCFolKjoM40PEiuU6Cn7wBLfq3WsGg7qg== + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.0.tgz#61e295349a65688ffac0b7808ef0a8244bdd8d40" + integrity sha512-tMTwO8iUWlSRZIwS9k7/E4vrTsfvsrcM5p1eftyuqWH25nKsz/o6/54I7jwQ/3zobISyC7wMy9ZsFwgTxOcOpQ== dependencies: prettier-linter-helpers "^1.0.0" @@ -3831,9 +3825,9 @@ estree-walker@^1.0.1: integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== estree-walker@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.1.tgz#f8e030fb21cefa183b44b7ad516b747434e7a3e0" - integrity sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== esutils@^2.0.2: version "2.0.3" @@ -4246,9 +4240,9 @@ follow-redirects@1.5.10: debug "=3.1.0" follow-redirects@^1.0.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" - integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== + version "1.13.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.1.tgz#5f69b813376cee4fd0474a3aba835df04ab763b7" + integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg== for-in@^0.1.3: version "0.1.8" @@ -4910,9 +4904,9 @@ humannames@^1.0.5: integrity sha1-pNYNQWjfhzf0smLv0j8u4yl08cU= husky@^4.3.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.4.tgz#676275a10ec5be2e893bd6ff71113bb829cc1f5b" - integrity sha512-wykHsss5kQtmbFrjQv0R7YyW1uFd7fv7gT1sA54potoDYmOTENJtBC/X1/AyoSAi1obp8CiGODOIdOGnPxSmFg== + version "4.3.6" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.6.tgz#ebd9dd8b9324aa851f1587318db4cccb7665a13c" + integrity sha512-o6UjVI8xtlWRL5395iWq9LKDyp/9TE7XMOTvIpEVzW638UcGxTmV5cfel6fsk/jbZSTlvfGVJf2svFtybcIZag== dependencies: chalk "^4.0.0" ci-info "^2.0.0" @@ -5067,9 +5061,9 @@ inherits@2.0.3: integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: - version "1.3.7" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" - integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== inquirer@7.1.0: version "7.1.0" @@ -5975,9 +5969,9 @@ js-tokens@^4.0.0: integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.2.4: - version "3.14.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" - integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -7054,11 +7048,16 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@2.1.2, ms@^2.0.0, ms@^2.1.1: +ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.0.0, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + mute-stream@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" @@ -8429,7 +8428,7 @@ resolve@1.17.0, resolve@~1.17.0: dependencies: path-parse "^1.0.6" -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@~1.19.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.17.0, resolve@^1.18.1, resolve@~1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== @@ -8564,9 +8563,9 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.8.2: estree-walker "^0.6.1" rollup@^2.32.1, rollup@^2.33.0, rollup@^2.33.3: - version "2.34.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.1.tgz#a387230df02c58b242794a213dfb68b42de2c8fb" - integrity sha512-tGveB6NU5x4MS/iXaIsjfUkEv4hxzJJ4o0FRy5LO62Ndx3R2cmE1qsLYlSfRkvHUUPqWiFoxEm8pRftzh1a5HA== + version "2.35.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.35.1.tgz#e6bc8d10893556a638066f89e8c97f422d03968c" + integrity sha512-q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA== optionalDependencies: fsevents "~2.1.2" @@ -10012,9 +10011,9 @@ typescript-eslint-language-service@^4.1.2: read-pkg-up "^7.0.0" typescript@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9" - integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ== + version "4.1.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7" + integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg== typescript@~4.0.5: version "4.0.5" @@ -10218,9 +10217,9 @@ uuid@^3.3.2: integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== uuid@^8.3.0: - version "8.3.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" - integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8-compile-cache@^2.0.3: version "2.2.0" @@ -10392,9 +10391,9 @@ vue-eslint-parser@^5.0.0: lodash "^4.17.11" vue-eslint-parser@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.2.0.tgz#1e17ae94ca71e617025e05143c8ac5593aacb6ef" - integrity sha512-uVcQqe8sUNzdHGcRHMd2Z/hl6qEaWrAmglTKP92Fnq9TYU9un8xsyFgEdFJaXh/1rd7h8Aic1GaiQow5nVneow== + version "7.3.0" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz#894085839d99d81296fa081d19643733f23d7559" + integrity sha512-n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw== dependencies: debug "^4.1.1" eslint-scope "^5.0.0"