Fix: SELECT_ALL_ITEMS type overlap

ownego · Jun 22, 2024 · 83990dc · 83990dc
1 parent ce5d7c0
commit 83990dc
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "@shopify/polaris-tokens": "^9.1.0",
     "@shopify/postcss-plugin": "^5.0.2",
     "@types/node": "^20.10.4",
-    "@vitejs/plugin-vue": "^5.0.2",
+    "@vitejs/plugin-vue": "^5.0.5",
     "@vue/language-plugin-pug": "^2.0.21",
     "change-case": "^5.3.0",
     "eslint": "^8.54.0",
@@ -76,14 +76,14 @@
     "url": "^0.11.3",
     "vite": "^5.3.1",
     "vite-plugin-chunk-split": "^0.5.0",
-    "vite-plugin-dts": "^3.7.3",
+    "vite-plugin-dts": "^3.9.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-replace": "^0.1.1",
     "vitepress": "^1.0.2",
     "vue": "^3.4.19",
     "vue-component-meta": "^1.8.27",
     "vue-router": "^4.2.5",
-    "vue-tsc": "^1.8.27"
+    "vue-tsc": "^2.0.21"
   },
   "peerDependencies": {
     "vue": "^3.3"

diff --git a/src/components/IndexProvider/context.ts b/src/components/IndexProvider/context.ts
@@ -1,5 +1,5 @@
 import { type ComputedRef, inject, type Ref } from 'vue';
-import { SelectionType, SELECT_ALL_ITEMS, type Range } from './types';
+import { SelectionType, type Range } from './types';
 
 export interface IndexContextType {
   loading?: Ref<boolean | undefined>;
@@ -8,7 +8,7 @@ export interface IndexContextType {
     singular: string;
     plural: string;
   };
-  selectedItemsCount: Ref<typeof SELECT_ALL_ITEMS | number>;
+  selectedItemsCount: Ref<'All' | number>;
   bulkActionsAccessibilityLabel?: ComputedRef<string>;
   selectMode: ComputedRef<boolean>;
   paginatedSelectAllText?: ComputedRef<string | undefined>;

diff --git a/src/components/IndexProvider/types.ts b/src/components/IndexProvider/types.ts
@@ -17,7 +17,7 @@ export type Range = [number, number];
 export type IndexProviderProps = {
   selectable?: boolean;
   itemCount: number;
-  selectedItemsCount?: typeof SELECT_ALL_ITEMS | number;
+  selectedItemsCount?: 'All' | number;
   resourceName?: {
     singular: string;
     plural: string;

diff --git a/yarn.lock b/yarn.lock
@@ -704,7 +704,7 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@vitejs/plugin-vue@^5.0.2", "@vitejs/plugin-vue@^5.0.5":
+"@vitejs/plugin-vue@^5.0.5":
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.0.5.tgz#e3dc11e427d4b818b7e3202766ad156e3d5e2eaa"
   integrity sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==
@@ -716,7 +716,7 @@
   dependencies:
     "@volar/source-map" "1.11.1"
 
-"@volar/language-core@2.3.1":
+"@volar/language-core@2.3.1", "@volar/language-core@~2.3.0-alpha.15":
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.3.1.tgz#0968218ca3210b9d1151b44ac0ad6944562ce3bc"
   integrity sha512-25CZ3ulM6jWgQsPQjKb7maKDlryvXWvsl7ytw4uj1Yyy17BgdiTWqMuNSxIODC3+/7IBOOGYoINC/1OOLACLLw==
@@ -753,6 +753,15 @@
     "@volar/language-core" "1.11.1"
     path-browserify "^1.0.1"
 
+"@volar/typescript@~2.3.0-alpha.15":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.3.1.tgz#ffdbd361844ad9b3b6f45a4a173b3d384385792e"
+  integrity sha512-OrUV6dYt/1h92+aWElexra6dp++gF/IEddvwyxeobyYfKAoKDUMsWU0iJCj0clZlfdyYaLmNEAkulJlVimxnOw==
+  dependencies:
+    "@volar/language-core" "2.3.1"
+    path-browserify "^1.0.1"
+    vscode-uri "^3.0.8"
+
 "@vscode/l10n@^0.0.18":
   version "0.0.18"
   resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.18.tgz#916d3a5e960dbab47c1c56f58a7cb5087b135c95"
@@ -769,7 +778,7 @@
     estree-walker "^2.0.2"
     source-map-js "^1.2.0"
 
-"@vue/compiler-dom@3.4.29", "@vue/compiler-dom@^3.3.0":
+"@vue/compiler-dom@3.4.29", "@vue/compiler-dom@^3.3.0", "@vue/compiler-dom@^3.4.0":
   version "3.4.29"
   resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz#c8f55528c8d8c8c36687d56a19e53b268c7d6c56"
   integrity sha512-A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==
@@ -847,6 +856,19 @@
     path-browserify "^1.0.1"
     vue-template-compiler "^2.7.14"
 
+"@vue/language-core@2.0.21":
+  version "2.0.21"
+  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.0.21.tgz#882667d0c9f07bc884f163e75eed666234df77fe"
+  integrity sha512-vjs6KwnCK++kIXT+eI63BGpJHfHNVJcUCr3RnvJsccT3vbJnZV5IhHR2puEkoOkIbDdp0Gqi1wEnv3hEd3WsxQ==
+  dependencies:
+    "@volar/language-core" "~2.3.0-alpha.15"
+    "@vue/compiler-dom" "^3.4.0"
+    "@vue/shared" "^3.4.0"
+    computeds "^0.0.1"
+    minimatch "^9.0.3"
+    path-browserify "^1.0.1"
+    vue-template-compiler "^2.7.14"
+
 "@vue/language-plugin-pug@^2.0.21":
   version "2.0.21"
   resolved "https://registry.yarnpkg.com/@vue/language-plugin-pug/-/language-plugin-pug-2.0.21.tgz#4ed7aa44affa486ef2c0f9fb5d1e133a752cbbca"
@@ -888,7 +910,7 @@
     "@vue/compiler-ssr" "3.4.29"
     "@vue/shared" "3.4.29"
 
-"@vue/shared@3.4.29", "@vue/shared@^3.3.0", "@vue/shared@^3.4.27":
+"@vue/shared@3.4.29", "@vue/shared@^3.3.0", "@vue/shared@^3.4.0", "@vue/shared@^3.4.27":
   version "3.4.29"
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.29.tgz#84908c284e88a269f8bceee59707b14eb4b2d284"
   integrity sha512-hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==
@@ -2825,7 +2847,7 @@ vite-plugin-chunk-split@^0.5.0:
     import-meta-resolve "^4.0.0"
     magic-string "^0.30.5"
 
-vite-plugin-dts@^3.7.3:
+vite-plugin-dts@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-3.9.1.tgz#625ad388ec3956708ccec7960550a7b0a8e8909e"
   integrity sha512-rVp2KM9Ue22NGWB8dNtWEr+KekN3rIgz1tWD050QnRGlriUCmaDwa7qA5zDEjbXg5lAXhYMSBJtx3q3hQIJZSg==
@@ -3020,6 +3042,15 @@ vue-tsc@^1.8.27:
     "@vue/language-core" "1.8.27"
     semver "^7.5.4"
 
+vue-tsc@^2.0.21:
+  version "2.0.21"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.0.21.tgz#c574a2c20e8a5e5643af546c6051319cdf983239"
+  integrity sha512-E6x1p1HaHES6Doy8pqtm7kQern79zRtIewkf9fiv7Y43Zo4AFDS5hKi+iHi2RwEhqRmuiwliB1LCEFEGwvxQnw==
+  dependencies:
+    "@volar/typescript" "~2.3.0-alpha.15"
+    "@vue/language-core" "2.0.21"
+    semver "^7.5.4"
+
 vue@^3.4.19, vue@^3.4.27:
   version "3.4.29"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.29.tgz#fad5a0fe6dfa5c4a2cfbbc48c489e7989616a15b"