Skip to content

Commit 83990dc

Browse files
committed
Fix: SELECT_ALL_ITEMS type overlap
1 parent ce5d7c0 commit 83990dc

File tree

4 files changed

+42
-11
lines changed

4 files changed

+42
-11
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@shopify/polaris-tokens": "^9.1.0",
5454
"@shopify/postcss-plugin": "^5.0.2",
5555
"@types/node": "^20.10.4",
56-
"@vitejs/plugin-vue": "^5.0.2",
56+
"@vitejs/plugin-vue": "^5.0.5",
5757
"@vue/language-plugin-pug": "^2.0.21",
5858
"change-case": "^5.3.0",
5959
"eslint": "^8.54.0",
@@ -76,14 +76,14 @@
7676
"url": "^0.11.3",
7777
"vite": "^5.3.1",
7878
"vite-plugin-chunk-split": "^0.5.0",
79-
"vite-plugin-dts": "^3.7.3",
79+
"vite-plugin-dts": "^3.9.1",
8080
"vite-plugin-eslint": "^1.8.1",
8181
"vite-plugin-replace": "^0.1.1",
8282
"vitepress": "^1.0.2",
8383
"vue": "^3.4.19",
8484
"vue-component-meta": "^1.8.27",
8585
"vue-router": "^4.2.5",
86-
"vue-tsc": "^1.8.27"
86+
"vue-tsc": "^2.0.21"
8787
},
8888
"peerDependencies": {
8989
"vue": "^3.3"

src/components/IndexProvider/context.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type ComputedRef, inject, type Ref } from 'vue';
2-
import { SelectionType, SELECT_ALL_ITEMS, type Range } from './types';
2+
import { SelectionType, type Range } from './types';
33

44
export interface IndexContextType {
55
loading?: Ref<boolean | undefined>;
@@ -8,7 +8,7 @@ export interface IndexContextType {
88
singular: string;
99
plural: string;
1010
};
11-
selectedItemsCount: Ref<typeof SELECT_ALL_ITEMS | number>;
11+
selectedItemsCount: Ref<'All' | number>;
1212
bulkActionsAccessibilityLabel?: ComputedRef<string>;
1313
selectMode: ComputedRef<boolean>;
1414
paginatedSelectAllText?: ComputedRef<string | undefined>;

src/components/IndexProvider/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export type Range = [number, number];
1717
export type IndexProviderProps = {
1818
selectable?: boolean;
1919
itemCount: number;
20-
selectedItemsCount?: typeof SELECT_ALL_ITEMS | number;
20+
selectedItemsCount?: 'All' | number;
2121
resourceName?: {
2222
singular: string;
2323
plural: string;

yarn.lock

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@
704704
resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
705705
integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
706706

707-
"@vitejs/plugin-vue@^5.0.2", "@vitejs/plugin-vue@^5.0.5":
707+
"@vitejs/plugin-vue@^5.0.5":
708708
version "5.0.5"
709709
resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.0.5.tgz#e3dc11e427d4b818b7e3202766ad156e3d5e2eaa"
710710
integrity sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==
@@ -716,7 +716,7 @@
716716
dependencies:
717717
"@volar/source-map" "1.11.1"
718718

719-
"@volar/language-core@2.3.1":
719+
"@volar/language-core@2.3.1", "@volar/language-core@~2.3.0-alpha.15":
720720
version "2.3.1"
721721
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.3.1.tgz#0968218ca3210b9d1151b44ac0ad6944562ce3bc"
722722
integrity sha512-25CZ3ulM6jWgQsPQjKb7maKDlryvXWvsl7ytw4uj1Yyy17BgdiTWqMuNSxIODC3+/7IBOOGYoINC/1OOLACLLw==
@@ -753,6 +753,15 @@
753753
"@volar/language-core" "1.11.1"
754754
path-browserify "^1.0.1"
755755

756+
"@volar/typescript@~2.3.0-alpha.15":
757+
version "2.3.1"
758+
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.3.1.tgz#ffdbd361844ad9b3b6f45a4a173b3d384385792e"
759+
integrity sha512-OrUV6dYt/1h92+aWElexra6dp++gF/IEddvwyxeobyYfKAoKDUMsWU0iJCj0clZlfdyYaLmNEAkulJlVimxnOw==
760+
dependencies:
761+
"@volar/language-core" "2.3.1"
762+
path-browserify "^1.0.1"
763+
vscode-uri "^3.0.8"
764+
756765
"@vscode/l10n@^0.0.18":
757766
version "0.0.18"
758767
resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.18.tgz#916d3a5e960dbab47c1c56f58a7cb5087b135c95"
@@ -769,7 +778,7 @@
769778
estree-walker "^2.0.2"
770779
source-map-js "^1.2.0"
771780

772-
"@vue/compiler-dom@3.4.29", "@vue/compiler-dom@^3.3.0":
781+
"@vue/compiler-dom@3.4.29", "@vue/compiler-dom@^3.3.0", "@vue/compiler-dom@^3.4.0":
773782
version "3.4.29"
774783
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz#c8f55528c8d8c8c36687d56a19e53b268c7d6c56"
775784
integrity sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==
@@ -847,6 +856,19 @@
847856
path-browserify "^1.0.1"
848857
vue-template-compiler "^2.7.14"
849858

859+
"@vue/language-core@2.0.21":
860+
version "2.0.21"
861+
resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.0.21.tgz#882667d0c9f07bc884f163e75eed666234df77fe"
862+
integrity sha512-vjs6KwnCK++kIXT+eI63BGpJHfHNVJcUCr3RnvJsccT3vbJnZV5IhHR2puEkoOkIbDdp0Gqi1wEnv3hEd3WsxQ==
863+
dependencies:
864+
"@volar/language-core" "~2.3.0-alpha.15"
865+
"@vue/compiler-dom" "^3.4.0"
866+
"@vue/shared" "^3.4.0"
867+
computeds "^0.0.1"
868+
minimatch "^9.0.3"
869+
path-browserify "^1.0.1"
870+
vue-template-compiler "^2.7.14"
871+
850872
"@vue/language-plugin-pug@^2.0.21":
851873
version "2.0.21"
852874
resolved "https://registry.yarnpkg.com/@vue/language-plugin-pug/-/language-plugin-pug-2.0.21.tgz#4ed7aa44affa486ef2c0f9fb5d1e133a752cbbca"
@@ -888,7 +910,7 @@
888910
"@vue/compiler-ssr" "3.4.29"
889911
"@vue/shared" "3.4.29"
890912

891-
"@vue/shared@3.4.29", "@vue/shared@^3.3.0", "@vue/shared@^3.4.27":
913+
"@vue/shared@3.4.29", "@vue/shared@^3.3.0", "@vue/shared@^3.4.0", "@vue/shared@^3.4.27":
892914
version "3.4.29"
893915
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.29.tgz#84908c284e88a269f8bceee59707b14eb4b2d284"
894916
integrity sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==
@@ -2825,7 +2847,7 @@ vite-plugin-chunk-split@^0.5.0:
28252847
import-meta-resolve "^4.0.0"
28262848
magic-string "^0.30.5"
28272849

2828-
vite-plugin-dts@^3.7.3:
2850+
vite-plugin-dts@^3.9.1:
28292851
version "3.9.1"
28302852
resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-3.9.1.tgz#625ad388ec3956708ccec7960550a7b0a8e8909e"
28312853
integrity sha512-rVp2KM9Ue22NGWB8dNtWEr+KekN3rIgz1tWD050QnRGlriUCmaDwa7qA5zDEjbXg5lAXhYMSBJtx3q3hQIJZSg==
@@ -3020,6 +3042,15 @@ vue-tsc@^1.8.27:
30203042
"@vue/language-core" "1.8.27"
30213043
semver "^7.5.4"
30223044

3045+
vue-tsc@^2.0.21:
3046+
version "2.0.21"
3047+
resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.0.21.tgz#c574a2c20e8a5e5643af546c6051319cdf983239"
3048+
integrity sha512-E6x1p1HaHES6Doy8pqtm7kQern79zRtIewkf9fiv7Y43Zo4AFDS5hKi+iHi2RwEhqRmuiwliB1LCEFEGwvxQnw==
3049+
dependencies:
3050+
"@volar/typescript" "~2.3.0-alpha.15"
3051+
"@vue/language-core" "2.0.21"
3052+
semver "^7.5.4"
3053+
30233054
vue@^3.4.19, vue@^3.4.27:
30243055
version "3.4.29"
30253056
resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.29.tgz#fad5a0fe6dfa5c4a2cfbbc48c489e7989616a15b"

0 commit comments

Comments
 (0)