From ca281b051cd50505f5dda4ad0ceb6759c57b395b Mon Sep 17 00:00:00 2001 From: Kia King Ishii Date: Wed, 18 Sep 2024 18:23:29 +0900 Subject: [PATCH 1/2] fix(input-date): pin v-calendar to fix vue 3.5 compat issue --- package.json | 2 +- pnpm-lock.yaml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index b947e0c4..420fcf41 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "punycode": "^2.3.1", "release-it": "^17.6.0", "typescript": "~5.5.4", - "v-calendar": "^3.1.2", + "v-calendar": "3.0.0", "vite": "^5.4.3", "vitepress": "^1.3.4", "vitest": "^2.0.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aec65fbd..1ab38ffb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -133,8 +133,8 @@ importers: specifier: ~5.5.4 version: 5.5.4 v-calendar: - specifier: ^3.1.2 - version: 3.1.2(@popperjs/core@2.11.8)(vue@3.5.1(typescript@5.5.4)) + specifier: 3.0.0 + version: 3.0.0(@popperjs/core@2.11.8)(vue@3.5.1(typescript@5.5.4)) vite: specifier: ^5.4.3 version: 5.4.3(@types/node@22.5.3) @@ -1743,10 +1743,10 @@ packages: resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==} engines: {node: '>=12'} - date-fns-tz@2.0.1: - resolution: {integrity: sha512-fJCG3Pwx8HUoLhkepdsP7Z5RsucUi+ZBOxyM5d0ZZ6c4SdYustq0VMmOu6Wf7bli+yS/Jwp91TOCqn9jMcVrUA==} + date-fns-tz@1.3.8: + resolution: {integrity: sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==} peerDependencies: - date-fns: 2.x + date-fns: '>=2.0.0' date-fns@2.30.0: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} @@ -3943,8 +3943,8 @@ packages: resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} engines: {node: '>= 0.4.0'} - v-calendar@3.1.2: - resolution: {integrity: sha512-QDWrnp4PWCpzUblctgo4T558PrHgHzDtQnTeUNzKxfNf29FkCeFpwGd9bKjAqktaa2aJLcyRl45T5ln1ku34kg==} + v-calendar@3.0.0: + resolution: {integrity: sha512-9r+swG8v2iUvaa2P1BGWEEeutZ+XCttHOzl0uXmzA7JND86GGZbM4QDPm8ZpBXav+NgheRm9MYs/Uz8mgKVZXg==} peerDependencies: '@popperjs/core': ^2.0.0 vue: ^3.2.0 @@ -5974,7 +5974,7 @@ snapshots: whatwg-mimetype: 3.0.0 whatwg-url: 11.0.0 - date-fns-tz@2.0.1(date-fns@2.30.0): + date-fns-tz@1.3.8(date-fns@2.30.0): dependencies: date-fns: 2.30.0 @@ -7581,7 +7581,7 @@ snapshots: ky: 1.7.2 registry-auth-token: 5.0.2 registry-url: 6.0.1 - semver: 7.6.2 + semver: 7.6.3 package-manager-detector@0.2.0: {} @@ -7944,7 +7944,7 @@ snapshots: semver-diff@4.0.0: dependencies: - semver: 7.6.2 + semver: 7.6.3 semver@5.7.2: {} @@ -8318,13 +8318,13 @@ snapshots: utils-merge@1.0.1: {} - v-calendar@3.1.2(@popperjs/core@2.11.8)(vue@3.5.1(typescript@5.5.4)): + v-calendar@3.0.0(@popperjs/core@2.11.8)(vue@3.5.1(typescript@5.5.4)): dependencies: '@popperjs/core': 2.11.8 '@types/lodash': 4.17.7 '@types/resize-observer-browser': 0.1.11 date-fns: 2.30.0 - date-fns-tz: 2.0.1(date-fns@2.30.0) + date-fns-tz: 1.3.8(date-fns@2.30.0) lodash: 4.17.21 vue: 3.5.1(typescript@5.5.4) vue-screen-utils: 1.0.0-beta.13(vue@3.5.1(typescript@5.5.4)) From 9d59d0db4840f28999f2464a754f076309d7219e Mon Sep 17 00:00:00 2001 From: Kia King Ishii Date: Wed, 18 Sep 2024 18:34:42 +0900 Subject: [PATCH 2/2] add shim --- lib/shim.d.ts | 4 ++++ package.json | 4 ++-- pnpm-lock.yaml | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 lib/shim.d.ts diff --git a/lib/shim.d.ts b/lib/shim.d.ts new file mode 100644 index 00000000..d7286fc0 --- /dev/null +++ b/lib/shim.d.ts @@ -0,0 +1,4 @@ +declare module 'v-calendar' { + import { DefineComponent } from 'vue' + export const DatePicker: DefineComponent<{}, {}, any> +} diff --git a/package.json b/package.json index 420fcf41..c9d0f0ad 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "pinia": "^2.2.2", "postcss": "^8.4.45", "postcss-nested": "^6.2.0", - "v-calendar": "^3.1.2", + "v-calendar": "3.0.1", "vue": "^3.5.1", "vue-router": "^4.4.3" }, @@ -109,7 +109,7 @@ "punycode": "^2.3.1", "release-it": "^17.6.0", "typescript": "~5.5.4", - "v-calendar": "3.0.0", + "v-calendar": "3.0.1", "vite": "^5.4.3", "vitepress": "^1.3.4", "vitest": "^2.0.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1ab38ffb..24ef3023 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -133,8 +133,8 @@ importers: specifier: ~5.5.4 version: 5.5.4 v-calendar: - specifier: 3.0.0 - version: 3.0.0(@popperjs/core@2.11.8)(vue@3.5.1(typescript@5.5.4)) + specifier: 3.0.1 + version: 3.0.1(@popperjs/core@2.11.8)(vue@3.5.1(typescript@5.5.4)) vite: specifier: ^5.4.3 version: 5.4.3(@types/node@22.5.3) @@ -3943,8 +3943,8 @@ packages: resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} engines: {node: '>= 0.4.0'} - v-calendar@3.0.0: - resolution: {integrity: sha512-9r+swG8v2iUvaa2P1BGWEEeutZ+XCttHOzl0uXmzA7JND86GGZbM4QDPm8ZpBXav+NgheRm9MYs/Uz8mgKVZXg==} + v-calendar@3.0.1: + resolution: {integrity: sha512-basXEXcmBsxHyxqjj/82vjgz5vbIMREiiUC2VOVh0pHCDXEF1birPUZD12lk8u3+5R+909WUnxu7bt0DFxCOLw==} peerDependencies: '@popperjs/core': ^2.0.0 vue: ^3.2.0 @@ -8318,7 +8318,7 @@ snapshots: utils-merge@1.0.1: {} - v-calendar@3.0.0(@popperjs/core@2.11.8)(vue@3.5.1(typescript@5.5.4)): + v-calendar@3.0.1(@popperjs/core@2.11.8)(vue@3.5.1(typescript@5.5.4)): dependencies: '@popperjs/core': 2.11.8 '@types/lodash': 4.17.7