diff --git a/package.json b/package.json index f0fdafe4ab7eee0409dedd7318303cf9bbb53008..604e47248337ab8d73d794c4a787314c84b96795 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "rollup-plugin-vue": "^6.0.0", "semver": "^7.3.5", "ts-jest": "^27.0.3", - "typescript": "^4.8.3", + "typescript": "^4.8.4", "vite": "3.1.3", "vue": "3.2.39", "vue-router": "^4.1.5", diff --git a/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-android/index.kt.map b/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-android/index.kt.map index 62029259a8dd5dc3ba6791b2402e1c2d79509f90..c35b3606b143463d8a10690c78301abb4afb072c 100644 --- a/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-android/index.kt.map +++ b/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-android/index.kt.map @@ -1 +1 @@ -{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/static/logo.png","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/interface.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts"],"sourcesContent":["import { getResourcePath } from 'io.dcloud.uts.android'\nexport default getResourcePath('uni_modules/test-uniplugin/static/logo.png')\n ","import Log from 'android.util.Log'\nimport FrameLayout from 'android.widget.FrameLayout'\nimport View from 'android.view.View'\nimport { IUser } from './interface.uts'\nimport { login } from './login.uts'\nimport logo from '../static/logo.png'\n\nconst test = arrayOf(1, 2, 3)\n\ntype GetBatteryInfoOptions = {\n success?: (res: UTSJSONObject) => void\n fail?: (res: UTSJSONObject) => void\n complete?: (res: UTSJSONObject) => void\n}\nexport class User implements IUser {\n async login(name: string, pwd: string) {\n setTimeout(() => {\n console.log('timeout')\n }, 1000)\n login(name, pwd)\n Log.info(logo)\n\n console.log('def android')\n\n\n\n\n\n\n\n\n console.log('ndef ios')\n\n\n console.log('def android || def ios')\n\n\n\n\n }\n register(name: string, callback: () => void) {\n Log.info(logo as FrameLayout)\n }\n test(view: View) {}\n}\nfunction login(name: string, callback: () => void) {}\nexport function register(name: string, callback: () => void) {}\n","export interface IUser {\n register(name: string): void\n}\n","export function login(name: string, pwd: string) {\n console.log('login')\n return { name, pwd }\n}\n"],"names":[],"mappings":";;;AAAA;ACAA,OAAgB,gBAAkB,CAAA;AAClC,OAAwB,0BAA4B,CAAA;AACpD,OAAiB,iBAAmB,CAAA;UCFnB,KAAK;QACpB,QAAQ,CAAC,IAAY,EAAN,MAAM,GAAG,IAAI;;ACDvB,IAAS,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,iBAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,OAAO,2DAAC;IACpB,OAAO;QAAE,IAAA,IAAI,GAAJ,IAAI;QAAE,IAAA,GAAG,GAAH,GAAG;KAAE,CAAA;AACtB;gBHFe,eAAe,CAAC,4CAA4C,CAAC;ACM5E,IAAM,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAEA,WAAxB,qBAAqB;IACxB,SAAA,OAAO,EAAC,WAA8B,SAAA;IACtC,SAAA,IAAI,EAAC,WAA8B,SAAA;IACnC,SAAA,QAAQ,EAAC,WAA8B,SAAA;CACxC;AACM,WAAM,IAAI,GAAY,KAAK;qBAC1B,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,8CAAE;QACrC,UAAU,CAAC,KAAM;YACf,OAAO,CAAC,GAAG,CAAC,SAAS,4DAAC;QACxB;QAAC,EAAE,IAAI,CAAC;QACR,MAAM,IAAI,EAAE,GAAG,CAAC;QAChB,GAAG,CAAC,IAAI,WAAM;QAEd,OAAO,CAAC,GAAG,CAAC,aAAa,4DAAC;QAS1B,OAAO,CAAC,GAAG,CAAC,UAAU,4DAAC;QAGvB,OAAO,CAAC,GAAG,CAAC,wBAAwB,4DAAC;IAKvC;iBACA,QAAQ,CAAC,IAAY,EAAN,MAAM,EAAE,QAAoB,aAAA,EAAE;QAC3C,GAAG,CAAC,IAAI,cAAS,WAAW,CAAC;IAC/B;aACA,IAAI,CAAC,IAAU,EAAJ,IAAI,EAAE,CAAC;CACnB;AACD,UAAe,IAAY,EAAN,MAAM,EAAE,QAAoB,QAAJ,IAAI,EAAE,CAAC,CAAC;AAC9C,IAAS,QAAQ,CAAC,IAAY,EAAN,MAAM,EAAE,QAAoB,aAAA,EAAE,CAAC,CAAC"} \ No newline at end of file +{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/static/logo.png","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/interface.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts"],"sourcesContent":["import { getResourcePath } from 'io.dcloud.uts.android'\nexport default getResourcePath('uni_modules/test-uniplugin/static/logo.png')\n ","import Log from 'android.util.Log'\nimport FrameLayout from 'android.widget.FrameLayout'\nimport View from 'android.view.View'\nimport { IUser } from './interface.uts'\nimport { login } from './login.uts'\nimport logo from '../static/logo.png'\n\nconst test = arrayOf(1, 2, 3)\n\ntype GetBatteryInfoOptions = {\n success?: (res: UTSJSONObject) => void\n fail?: (res: UTSJSONObject) => void\n complete?: (res: UTSJSONObject) => void\n}\nexport class User implements IUser {\n async login(name: string, pwd: string) {\n setTimeout(() => {\n console.log('timeout')\n }, 1000)\n login(name, pwd)\n Log.info(logo)\n\n console.log('def android')\n\n\n\n\n\n\n\n\n console.log('ndef ios')\n\n\n console.log('def android || def ios')\n\n\n\n\n }\n register(name: string, callback: () => void) {\n Log.info(logo as FrameLayout)\n }\n test(view: View) {}\n}\nfunction login(name: string, callback: () => void) {}\nexport function register(name: string, callback: () => void) {}\n","export interface IUser {\n register(name: string): void\n}\n","export function login(name: string, pwd: string) {\n console.log('login')\n return { name, pwd }\n}\n"],"names":[],"mappings":";;;AAAA;ACAA,OAAgB,gBAAkB,CAAA;AAClC,OAAwB,0BAA4B,CAAA;AACpD,OAAiB,iBAAmB,CAAA;UCFnB;QACf,SAAS,MAAM,MAAM,GAAG,IAAI;;ACDvB,IAAS,MAAM,MAAM,MAAM,EAAE,KAAK,MAAM,iBAAE;IAC/C,QAAQ,GAAG,CAAC;IACZ,OAAO;QAAE,IAAA,OAAA;QAAM,IAAA,MAAA;KAAK;AACtB;gBHFe,gBAAgB;ACM/B,IAAM,OAAO,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAEC,WAAxB;IACH,SAAA,SAAQ,oBAA8B;IACtC,SAAA,MAAK,oBAA8B;IACnC,SAAA,UAAS,oBAA8B;AACzC;AACO,WAAM,OAAgB;IAC3B,iBAAM,MAAM,MAAM,MAAM,EAAE,KAAK,MAAM,8CAAE;QACrC,WAAW,KAAM;YACf,QAAQ,GAAG,CAAC;QACd;UAAG,IAAI;QACP,MAAM,MAAM;QACZ,IAAI,IAAI;QAER,QAAQ,GAAG,CAAC;QASZ,QAAQ,GAAG,CAAC;QAGZ,QAAQ,GAAG,CAAC;IAKd;IACA,aAAA,SAAS,MAAM,MAAM,EAAE,qBAAoB,EAAE;QAC3C,IAAI,IAAI,cAAS;IACnB;IACA,SAAA,KAAK,MAAM,IAAI,EAAE,CAAC;AACpB;AACA,UAAe,MAAM,MAAM,EAAE,gBAAgB,IAAI,EAAE,CAAC;AAC7C,IAAS,SAAS,MAAM,MAAM,EAAE,qBAAoB,EAAE,CAAC"} \ No newline at end of file diff --git a/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift b/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift index 8b1726c3137b1694aa2beda52ae284fd88c23b01..362919f4cf3030dbdcf2d7bc0e4c48c8f979296c 100644 --- a/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift +++ b/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift @@ -58,6 +58,6 @@ class IndexSwift : NSObject { } @available(iOS 13.0.0, *) public static func s_testAsync() async -> UTSJSONObject { - return testAsync(); + return await testAsync(); } } diff --git a/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift.map b/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift.map index 22ce27da36cb7c29911a4244801c4d7096b31611..d84436a2d2fb100a49d5887726213d53a693f707 100644 --- a/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift.map +++ b/packages/playground/uts/unpackage/dist/app/uni_modules/test-uniplugin/app-ios/index.swift.map @@ -1 +1 @@ -{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-ios/index.uts"],"sourcesContent":["import { UIDevice } from 'UIKit'\n\ntype GetBatteryInfoOptions = {\n name: string\n pwd: number\n success?: (res: UTSJSONObject) => void\n fail?: (res: UTSJSONObject) => void\n complete?: (res: UTSJSONObject) => void\n}\n\nexport default function getBatteryInfo(options: GetBatteryInfoOptions) {\n const res = {\n errMsg: 'getBatteryInfo:ok',\n level: UIDevice.current.batteryLevel * 100,\n isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging,\n }\n if (options.success != null) {\n options.success!(res)\n }\n if (options.complete != null) {\n options.complete!(res)\n }\n}\n\nexport function test1(callback: () => void): string {\n console.log('test1')\n\n\n\n\n console.log('def ios')\n\n\n console.log('ndef android')\n\n\n\n\n\n console.log('def android || def ios')\n\n\n\n\n return 'test1'\n}\n\nclass Test1 {}\nexport class Test {\n constructor() {\n new Test1()\n }\n test(): string | null {\n return null\n }\n}\n\nexport async function testAsync() {\n return { a: 1 }\n}\n"],"names":[],"mappings":";AAAA;AAE6B;;MAAxB,qBAAqB;IACxB,WAAA,IAAI,EAAE,MAAM,EAAA;IACZ,WAAA,GAAG,EAAE,QAAM,EAAA;IACX,WAAA,OAAO,EAAC,WAA8B,EAAA;IACtC,WAAA,IAAI,EAAC,WAA8B,EAAA;IACnC,WAAA,QAAQ,EAAC,WAA8B,EAAA;CACxC;AAEc,KAAS,cAAc,CAAC,EAAA,OAA8B,EAArB,qBAAqB,EAAE;IACrE,IAAM,GAAG,GAAG;QACV,CAAA,MAAM,GAAE,mBAAmB;QAC3B,CAAA,KAAK,GAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,GAAG,GAAG;QAC1C,CAAA,UAAU,GAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC,QAAQ;MAC5E;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,GAAI;QACzB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;;IAEvB,IAAI,OAAO,CAAC,QAAQ,IAAI,GAAI;QAC1B,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;;AAE1B;AAEO,KAAS,KAAK,CAAC,EAAA,QAAoB,aAAA,KAAG,MAAM,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,OAAO,wDAAC;IAKpB,OAAO,CAAC,GAAG,CAAC,SAAS,wDAAC;IAGtB,OAAO,CAAC,GAAG,CAAC,cAAc,wDAAC;IAM3B,OAAO,CAAC,GAAG,CAAC,wBAAwB,wDAAC;IAKrC,OAAO,OAAO,CAAA;AAChB;AAEA,MAAM,KAAK;CAAG;AACP;;MAAM,IAAI;IACf,aAAc;QACZ,AAAI,KAAK,EAAE;IACb;gBACA,IAAI,MAAI,MAAM,EAAQ;QACpB,OAAO,GAAI,CAAA;IACb;CACD;AAEM;KAAe,SAAS,2BAAG;IAChC,OAAO;QAAE,CAAA,CAAC,GAAE,CAAC;MAAE,CAAA;AACjB;;;;wCAjDuC,EAAA,OAA8B,EAArB,qBAAqB;eAA7C,cAAc,CAAC,OAA8B;;+BAc/C,EAAA,QAAoB,aAAA,KAAG,MAAM;eAAnC,KAAK,CAAC,QAAoB;;;;eAiCpB,SAAS"} \ No newline at end of file +{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-ios/index.uts"],"sourcesContent":["import { UIDevice } from 'UIKit'\n\ntype GetBatteryInfoOptions = {\n name: string\n pwd: number\n success?: (res: UTSJSONObject) => void\n fail?: (res: UTSJSONObject) => void\n complete?: (res: UTSJSONObject) => void\n}\n\nexport default function getBatteryInfo(options: GetBatteryInfoOptions) {\n const res = {\n errMsg: 'getBatteryInfo:ok',\n level: UIDevice.current.batteryLevel * 100,\n isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging,\n }\n if (options.success != null) {\n options.success!(res)\n }\n if (options.complete != null) {\n options.complete!(res)\n }\n}\n\nexport function test1(callback: () => void): string {\n console.log('test1')\n\n\n\n\n console.log('def ios')\n\n\n console.log('ndef android')\n\n\n\n\n\n console.log('def android || def ios')\n\n\n\n\n return 'test1'\n}\n\nclass Test1 {}\nexport class Test {\n constructor() {\n new Test1()\n }\n test(): string | null {\n return null\n }\n}\n\nexport async function testAsync() {\n return { a: 1 }\n}\n"],"names":[],"mappings":";AAAA;AAE6B;;MAAxB;IACH,WAAA,MAAM,MAAM,EAAA;IACZ,WAAA,KAAK,QAAM,EAAA;IACX,WAAA,SAAQ,aAA8B;IACtC,WAAA,MAAK,aAA8B;IACnC,WAAA,UAAS,aAA8B;AACzC;AAEe,KAAS,eAAe,EAAA,SAAS,qBAAqB,EAAE;IACrE,IAAM,MAAM;QACV,CAAA,SAAQ;QACR,CAAA,QAAO,SAAS,OAAO,CAAC,YAAY,GAAG,GAAG;QAC1C,CAAA,aAAY,SAAS,OAAO,CAAC,YAAY,IAAI,SAAS,YAAY,CAAC,QAAQ;MAC5E;IACD,IAAI,QAAQ,OAAO,IAAI,GAAI;QACzB,QAAQ,OAAO,EAAE;;IAEnB,IAAI,QAAQ,QAAQ,IAAI,GAAI;QAC1B,QAAQ,QAAQ,EAAE;;AAEtB;AAEO,KAAS,MAAM,EAAA,qBAAoB,KAAG,MAAM,CAAC;IAClD,QAAQ,GAAG,CAAC;IAKZ,QAAQ,GAAG,CAAC;IAGZ,QAAQ,GAAG,CAAC;IAMZ,QAAQ,GAAG,CAAC;IAKZ,OAAO;AACT;AAEA,MAAM;AAAO;AACN;;MAAM;IACX,aAAc;QACR;IACN;IACA,YAAA,UAAQ,MAAM,EAAQ;QACpB,OAAO,GAAI;IACb;AACF;AAEO;KAAe,oCAAY;IAChC,OAAO;QAAE,CAAA,IAAG,CAAC;MAAE;AACjB;;;;wCAjDuC,EAAA,SAAS,qBAAqB;eAA7C,eAAe;;+BAcjB,EAAA,qBAAoB,KAAG,MAAM;eAAnC,MAAM;;;;qBAiCA"} \ No newline at end of file diff --git a/packages/uni-cli-shared/src/vite/plugins/uniModules.ts b/packages/uni-cli-shared/src/vite/plugins/uniModules.ts index 773476bc2900144dcb93627bfd60890223fb0bd5..234af8c2d682f91613c19b0c22252e5fd234369d 100644 --- a/packages/uni-cli-shared/src/vite/plugins/uniModules.ts +++ b/packages/uni-cli-shared/src/vite/plugins/uniModules.ts @@ -26,43 +26,7 @@ export function uniModulesExportsPlugin({ if (!enable) { return '' } - const uniModulesDir = path.resolve( - process.env.UNI_INPUT_DIR, - 'uni_modules' - ) - if (!fs.existsSync(uniModulesDir)) { - return '' - } - const importCodes: string[] = [] - const assignCodes: string[] = [] - fs.readdirSync(uniModulesDir).forEach((uniModuleDir) => { - const pkgPath = path.resolve( - uniModulesDir, - uniModuleDir, - 'package.json' - ) - if (!fs.existsSync(pkgPath)) { - return - } - const exports = parseJson(fs.readFileSync(pkgPath, 'utf8'))?.uni_modules - ?.exports as Exports | undefined - if (exports) { - const [exportsImportCodes, exportsAssignCodes] = parseExports( - process.env.UNI_PLATFORM === 'h5' - ? 'web' - : process.env.UNI_PLATFORM, - `@/uni_modules/${uniModuleDir}`, - exports - ) - importCodes.push(...exportsImportCodes) - assignCodes.push(...exportsAssignCodes) - } - }) - if (!importCodes.length) { - return '' - } - return `${importCodes.join('\n')} -${assignCodes.join('\n')}` + return genUniModulesExports() }, } } @@ -76,6 +40,37 @@ interface Exports { [name: string]: Define | Defines | false } +function genUniModulesExports() { + const uniModulesDir = path.resolve(process.env.UNI_INPUT_DIR, 'uni_modules') + if (!fs.existsSync(uniModulesDir)) { + return '' + } + const importCodes: string[] = [] + const assignCodes: string[] = [] + fs.readdirSync(uniModulesDir).forEach((uniModuleDir) => { + const pkgPath = path.resolve(uniModulesDir, uniModuleDir, 'package.json') + if (!fs.existsSync(pkgPath)) { + return + } + const exports = parseJson(fs.readFileSync(pkgPath, 'utf8'))?.uni_modules + ?.exports as Exports | undefined + if (exports) { + const [exportsImportCodes, exportsAssignCodes] = parseExports( + process.env.UNI_PLATFORM === 'h5' ? 'web' : process.env.UNI_PLATFORM, + `@/uni_modules/${uniModuleDir}`, + exports + ) + importCodes.push(...exportsImportCodes) + assignCodes.push(...exportsAssignCodes) + } + }) + if (!importCodes.length) { + return '' + } + return `${importCodes.join('\n')} +${assignCodes.join('\n')}` +} + export function parseExports( platform: UniApp.PLATFORM, source: string, diff --git a/packages/uts-darwin-arm64/uts.darwin-arm64.node b/packages/uts-darwin-arm64/uts.darwin-arm64.node index 7ff604b7090353d11bf7279e70b7529f4a34b845..11dfdd777dbe0968698e87fffdc13ebafd043223 100755 Binary files a/packages/uts-darwin-arm64/uts.darwin-arm64.node and b/packages/uts-darwin-arm64/uts.darwin-arm64.node differ diff --git a/packages/uts-darwin-x64/uts.darwin-x64.node b/packages/uts-darwin-x64/uts.darwin-x64.node index 0587fe034519207d03a9dfb8165108001a301c59..0fa7559448076dc983a941b289c8356d2683497f 100755 Binary files a/packages/uts-darwin-x64/uts.darwin-x64.node and b/packages/uts-darwin-x64/uts.darwin-x64.node differ diff --git a/packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node b/packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node index 928ef51e1bc7431a911de6c978f222c43b64a848..dbdfe723556b2455159eebf4530abbd5f23f6ef5 100644 Binary files a/packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node and b/packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node differ diff --git a/packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node b/packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node index 7c902151a7681e3e4bb028db302887ae0432e7dd..ff9babada130723d428c9a6331ce57c87de4d1f6 100644 Binary files a/packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node and b/packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node differ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 62c5f42911299c8983f4ace9b2d5a23a3bbe5eb8..05a61ffcbf964018e3e3dfee9ac8c12585193f30 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -49,7 +49,7 @@ importers: rollup-plugin-vue: ^6.0.0 semver: ^7.3.5 ts-jest: ^27.0.3 - typescript: ^4.8.3 + typescript: ^4.8.4 vite: 3.1.3 vue: 3.2.39 vue-router: ^4.1.5 @@ -71,7 +71,7 @@ importers: '@rollup/plugin-strip': 2.1.0_rollup@2.79.1 '@types/jest': 27.5.2 '@types/node': 17.0.45 - '@typescript-eslint/parser': 5.38.0_dyxdave6dwjbccc5dgiifcmuza + '@typescript-eslint/parser': 5.38.0_3rubbgt5ekhqrcgx4uwls3neim '@vitejs/plugin-vue': 3.1.0_vite@3.1.3+vue@3.2.39 '@vitejs/plugin-vue-jsx': 2.0.1_vite@3.1.3+vue@3.2.39 '@vue/compiler-sfc': 3.2.39 @@ -96,11 +96,11 @@ importers: rollup-plugin-node-builtins: 2.1.2 rollup-plugin-node-globals: 1.4.0 rollup-plugin-terser: 7.0.2_rollup@2.79.1 - rollup-plugin-typescript2: 0.29.0_5q64ijqsuisqe52alrh6v6njki + rollup-plugin-typescript2: 0.29.0_gypgyaqhine6mwjfvh7icfhviq rollup-plugin-vue: 6.0.0_@vue+compiler-sfc@3.2.39 semver: 7.3.7 - ts-jest: 27.1.5_i5bqpauvbfaw4wmbeng7kq5cci - typescript: 4.8.3 + ts-jest: 27.1.5_2lv2rcj537c6eix77wyoioddju + typescript: 4.8.4 vite: 3.1.3 vue: 3.2.39 vue-router: 4.1.5_vue@3.2.39 @@ -2995,7 +2995,7 @@ packages: dev: true optional: true - /@typescript-eslint/parser/5.38.0_dyxdave6dwjbccc5dgiifcmuza: + /@typescript-eslint/parser/5.38.0_3rubbgt5ekhqrcgx4uwls3neim: resolution: {integrity: sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3007,10 +3007,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.38.0 '@typescript-eslint/types': 5.38.0 - '@typescript-eslint/typescript-estree': 5.38.0_typescript@4.8.3 + '@typescript-eslint/typescript-estree': 5.38.0_typescript@4.8.4 debug: 4.3.4 eslint: 7.32.0 - typescript: 4.8.3 + typescript: 4.8.4 transitivePeerDependencies: - supports-color dev: true @@ -3028,7 +3028,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.38.0_typescript@4.8.3: + /@typescript-eslint/typescript-estree/5.38.0_typescript@4.8.4: resolution: {integrity: sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3043,8 +3043,8 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.7 - tsutils: 3.21.0_typescript@4.8.3 - typescript: 4.8.3 + tsutils: 3.21.0_typescript@4.8.4 + typescript: 4.8.4 transitivePeerDependencies: - supports-color dev: true @@ -5260,7 +5260,7 @@ packages: resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} /graceful-fs/4.2.9: - resolution: {integrity: sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==, registry: https://registry.yarnpkg.com/} + resolution: {integrity: sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==, registry: https://registry.yarnpkg.com/, tarball: https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz} dev: true /has-flag/3.0.0: @@ -7493,7 +7493,7 @@ packages: terser: 5.15.0 dev: true - /rollup-plugin-typescript2/0.29.0_5q64ijqsuisqe52alrh6v6njki: + /rollup-plugin-typescript2/0.29.0_gypgyaqhine6mwjfvh7icfhviq: resolution: {integrity: sha512-YytahBSZCIjn/elFugEGQR5qTsVhxhUwGZIsA9TmrSsC88qroGo65O5HZP/TTArH2dm0vUmYWhKchhwi2wL9bw==} peerDependencies: rollup: '>=1.26.3' @@ -7505,7 +7505,7 @@ packages: resolve: 1.17.0 rollup: 2.79.1 tslib: 2.0.1 - typescript: 4.8.3 + typescript: 4.8.4 dev: true /rollup-plugin-vue/6.0.0_@vue+compiler-sfc@3.2.39: @@ -7997,7 +7997,7 @@ packages: punycode: 2.1.1 dev: true - /ts-jest/27.1.5_i5bqpauvbfaw4wmbeng7kq5cci: + /ts-jest/27.1.5_2lv2rcj537c6eix77wyoioddju: resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true @@ -8028,7 +8028,7 @@ packages: lodash.memoize: 4.1.2 make-error: 1.3.6 semver: 7.3.7 - typescript: 4.8.3 + typescript: 4.8.4 yargs-parser: 20.2.9 dev: true @@ -8044,14 +8044,14 @@ packages: resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} dev: true - /tsutils/3.21.0_typescript@4.8.3: + /tsutils/3.21.0_typescript@4.8.4: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.8.3 + typescript: 4.8.4 dev: true /tunnel-agent/0.6.0: @@ -8121,8 +8121,8 @@ packages: hasBin: true dev: true - /typescript/4.8.3: - resolution: {integrity: sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==} + /typescript/4.8.4: + resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==} engines: {node: '>=4.2.0'} hasBin: true dev: true