chore: update proto types for extension

frontend/extension/package.json

@@ -40,8 +40,10 @@
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.33.2",
+    "long": "^5.2.3",
     "postcss": "^8.4.28",
     "prettier": "2.6.2",
+    "protobufjs": "^7.2.5",
     "tailwindcss": "^3.3.3",
     "typescript": "5.1.6"
   },

frontend/extension/pnpm-lock.yaml

@@ -88,12 +88,18 @@ devDependencies:
   eslint-plugin-react:
     specifier: ^7.33.2
     version: 7.33.2(eslint@8.48.0)
+  long:
+    specifier: ^5.2.3
+    version: 5.2.3
   postcss:
     specifier: ^8.4.28
     version: 8.4.28
   prettier:
     specifier: 2.6.2
     version: 2.6.2
+  protobufjs:
+    specifier: ^7.2.5
+    version: 7.2.5
   tailwindcss:
     specifier: ^3.3.3
     version: 3.3.3
@@ -2427,6 +2433,49 @@ packages:
     resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
     dev: false
 
+  /@protobufjs/aspromise@1.1.2:
+    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+    dev: true
+
+  /@protobufjs/base64@1.1.2:
+    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+    dev: true
+
+  /@protobufjs/codegen@2.0.4:
+    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+    dev: true
+
+  /@protobufjs/eventemitter@1.1.0:
+    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+    dev: true
+
+  /@protobufjs/fetch@1.1.0:
+    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/inquire': 1.1.0
+    dev: true
+
+  /@protobufjs/float@1.0.2:
+    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+    dev: true
+
+  /@protobufjs/inquire@1.1.0:
+    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+    dev: true
+
+  /@protobufjs/path@1.1.2:
+    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+    dev: true
+
+  /@protobufjs/pool@1.1.0:
+    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+    dev: true
+
+  /@protobufjs/utf8@1.1.0:
+    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+    dev: true
+
   /@sindresorhus/is@5.6.0:
     resolution: {integrity: sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==}
     engines: {node: '>=14.16'}
@@ -5434,6 +5483,10 @@ packages:
       is-unicode-supported: 0.1.0
     dev: false
 
+  /long@5.2.3:
+    resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
+    dev: true
+
   /loose-envify@1.4.0:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
@@ -6211,6 +6264,25 @@ packages:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
     dev: false
 
+  /protobufjs@7.2.5:
+    resolution: {integrity: sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==}
+    engines: {node: '>=12.0.0'}
+    requiresBuild: true
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/base64': 1.1.2
+      '@protobufjs/codegen': 2.0.4
+      '@protobufjs/eventemitter': 1.1.0
+      '@protobufjs/fetch': 1.1.0
+      '@protobufjs/float': 1.0.2
+      '@protobufjs/inquire': 1.1.0
+      '@protobufjs/path': 1.1.2
+      '@protobufjs/pool': 1.1.0
+      '@protobufjs/utf8': 1.1.0
+      '@types/node': 20.4.2
+      long: 5.2.3
+    dev: true
+
   /proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
     dev: false

frontend/extension/src/background.ts

@@ -1,4 +1,4 @@
-import type { Shortcut } from "@pbtypes/proto/api/v2/shortcut_service_pb";
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service_pb";
 import { Storage } from "@plasmohq/storage";
 
 const storage = new Storage();

frontend/extension/src/components/CreateShortcutsButton.tsx

@@ -1,9 +1,9 @@
 import { Button, IconButton, Input, Modal, ModalDialog } from "@mui/joy";
-import { CreateShortcutResponse, OpenGraphMetadata, Visibility } from "@pbtypes/proto/api/v2/shortcut_service_pb";
 import { useStorage } from "@plasmohq/storage/hook";
 import axios from "axios";
 import { useEffect, useState } from "react";
 import { toast } from "react-hot-toast";
+import { CreateShortcutResponse, OpenGraphMetadata, Visibility } from "@/types/proto/api/v2/shortcut_service_pb";
 import Icon from "./Icon";
 
 const generateTempName = (length = 6) => {

frontend/extension/src/components/PullShortcutsButton.tsx

@@ -1,9 +1,9 @@
 import { IconButton } from "@mui/joy";
-import { ListShortcutsResponse } from "@pbtypes/proto/api/v2/shortcut_service_pb";
 import { useStorage } from "@plasmohq/storage/hook";
 import axios from "axios";
 import { useEffect } from "react";
 import { toast } from "react-hot-toast";
+import { ListShortcutsResponse } from "@/types/proto/api/v2/shortcut_service_pb";
 import Icon from "./Icon";
 
 const PullShortcutsButton = () => {

frontend/extension/src/components/ShortcutView.tsx

@@ -1,4 +1,4 @@
-import type { Shortcut } from "@pbtypes/proto/api/v2/shortcut_service_pb";
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service_pb";
 import { useStorage } from "@plasmohq/storage/hook";
 import classNames from "classnames";
 import { useEffect, useState } from "react";

frontend/extension/src/components/ShortcutsContainer.tsx

@@ -1,4 +1,4 @@
-import type { Shortcut } from "@pbtypes/proto/api/v2/shortcut_service_pb";
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service_pb";
 import { useStorage } from "@plasmohq/storage/hook";
 import classNames from "classnames";
 import ShortcutView from "./ShortcutView";

frontend/extension/src/options.tsx

@@ -1,5 +1,5 @@
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service_pb";
 import { Button, Divider, Input } from "@mui/joy";
-import type { Shortcut } from "@pbtypes/proto/api/v2/shortcut_service_pb";
 import { useStorage } from "@plasmohq/storage/hook";
 import { useEffect, useState } from "react";
 import { Toaster, toast } from "react-hot-toast";

frontend/extension/src/popup.tsx

@@ -1,5 +1,5 @@
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service_pb";
 import { Button, Divider, IconButton } from "@mui/joy";
-import type { Shortcut } from "@pbtypes/proto/api/v2/shortcut_service_pb";
 import { useStorage } from "@plasmohq/storage/hook";
 import { Toaster } from "react-hot-toast";
 import CreateShortcutsButton from "@/components/CreateShortcutsButton";

frontend/extension/tsconfig.json

@@ -14,9 +14,6 @@
       "@/*": [
         "./src/*"
       ],
-      "@pbtypes/*": [
-        "../types/*"
-      ]
     },
     "baseUrl": "."
   }

frontend/types/package.json

@@ -1,5 +0,0 @@
-{
-	"dependencies": {
-		"@bufbuild/protobuf": "^1.3.0"
-	}
-}

frontend/types/pnpm-lock.yaml

@@ -1,16 +0,0 @@
-lockfileVersion: '6.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-dependencies:
-  '@bufbuild/protobuf':
-    specifier: ^1.3.0
-    version: 1.3.0
-
-packages:
-
-  /@bufbuild/protobuf@1.3.0:
-    resolution: {integrity: sha512-G372ods0pLt46yxVRsnP/e2btVPuuzArcMPFpIDeIwiGPuuglEs9y75iG0HMvZgncsj5TvbYRWqbVyOe3PLCWQ==}
-    dev: false

proto/buf.gen.yaml

@@ -18,10 +18,12 @@ plugins:
     out: gen
     opt:
       - paths=source_relative
-  - plugin: buf.build/bufbuild/es:v1.3.0
+  # Generate types for the web client.
-    out: ../frontend/types/proto
   - plugin: buf.build/bufbuild/es:v1.3.0
     out: ../frontend/web/src/types/proto
+  # Generate types for the extension client.
+  - plugin: buf.build/bufbuild/es:v1.3.0
+    out: ../frontend/extension/src/types/proto
   - plugin: buf.build/community/pseudomuto-doc:v1.5.1
     out: gen
     opt: