From 0ce934413a1c3e61658c8e30b5de9e8eeec5b418 Mon Sep 17 00:00:00 2001 From: steven Date: Sun, 3 Sep 2023 14:48:19 +0800 Subject: [PATCH] chore: update proto types for extension --- frontend/extension/package.json | 2 + frontend/extension/pnpm-lock.yaml | 72 +++++++++++++++++++ frontend/extension/src/background.ts | 2 +- .../src/components/CreateShortcutsButton.tsx | 2 +- .../src/components/PullShortcutsButton.tsx | 2 +- .../extension/src/components/ShortcutView.tsx | 2 +- .../src/components/ShortcutsContainer.tsx | 2 +- frontend/extension/src/options.tsx | 2 +- frontend/extension/src/popup.tsx | 2 +- .../src}/types/proto/api/v2/common_pb.d.ts | 0 .../src}/types/proto/api/v2/common_pb.js | 0 .../proto/api/v2/shortcut_service_pb.d.ts | 0 .../types/proto/api/v2/shortcut_service_pb.js | 0 .../types/proto/api/v2/user_service_pb.d.ts | 0 .../types/proto/api/v2/user_service_pb.js | 0 .../proto/api/v2/user_setting_service_pb.d.ts | 0 .../proto/api/v2/user_setting_service_pb.js | 0 .../src}/types/proto/store/activity_pb.d.ts | 0 .../src}/types/proto/store/activity_pb.js | 0 .../src}/types/proto/store/common_pb.d.ts | 0 .../src}/types/proto/store/common_pb.js | 0 .../src}/types/proto/store/shortcut_pb.d.ts | 0 .../src}/types/proto/store/shortcut_pb.js | 0 .../types/proto/store/user_setting_pb.d.ts | 0 .../src}/types/proto/store/user_setting_pb.js | 0 .../proto/store/workspace_setting_pb.d.ts | 0 .../types/proto/store/workspace_setting_pb.js | 0 frontend/extension/tsconfig.json | 3 - frontend/types/package.json | 5 -- frontend/types/pnpm-lock.yaml | 16 ----- proto/buf.gen.yaml | 6 +- 31 files changed, 85 insertions(+), 33 deletions(-) rename frontend/{ => extension/src}/types/proto/api/v2/common_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/api/v2/common_pb.js (100%) rename frontend/{ => extension/src}/types/proto/api/v2/shortcut_service_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/api/v2/shortcut_service_pb.js (100%) rename frontend/{ => extension/src}/types/proto/api/v2/user_service_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/api/v2/user_service_pb.js (100%) rename frontend/{ => extension/src}/types/proto/api/v2/user_setting_service_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/api/v2/user_setting_service_pb.js (100%) rename frontend/{ => extension/src}/types/proto/store/activity_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/store/activity_pb.js (100%) rename frontend/{ => extension/src}/types/proto/store/common_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/store/common_pb.js (100%) rename frontend/{ => extension/src}/types/proto/store/shortcut_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/store/shortcut_pb.js (100%) rename frontend/{ => extension/src}/types/proto/store/user_setting_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/store/user_setting_pb.js (100%) rename frontend/{ => extension/src}/types/proto/store/workspace_setting_pb.d.ts (100%) rename frontend/{ => extension/src}/types/proto/store/workspace_setting_pb.js (100%) delete mode 100644 frontend/types/package.json delete mode 100644 frontend/types/pnpm-lock.yaml diff --git a/frontend/extension/package.json b/frontend/extension/package.json index 81506f0..edd18cb 100644 --- a/frontend/extension/package.json +++ b/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" }, diff --git a/frontend/extension/pnpm-lock.yaml b/frontend/extension/pnpm-lock.yaml index 2973d57..120b1d6 100644 --- a/frontend/extension/pnpm-lock.yaml +++ b/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 diff --git a/frontend/extension/src/background.ts b/frontend/extension/src/background.ts index 94600a4..c4d032b 100644 --- a/frontend/extension/src/background.ts +++ b/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(); diff --git a/frontend/extension/src/components/CreateShortcutsButton.tsx b/frontend/extension/src/components/CreateShortcutsButton.tsx index 9415489..153eb4c 100644 --- a/frontend/extension/src/components/CreateShortcutsButton.tsx +++ b/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) => { diff --git a/frontend/extension/src/components/PullShortcutsButton.tsx b/frontend/extension/src/components/PullShortcutsButton.tsx index 8d5df7f..064c4e3 100644 --- a/frontend/extension/src/components/PullShortcutsButton.tsx +++ b/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 = () => { diff --git a/frontend/extension/src/components/ShortcutView.tsx b/frontend/extension/src/components/ShortcutView.tsx index dfdd383..93a0f14 100644 --- a/frontend/extension/src/components/ShortcutView.tsx +++ b/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"; diff --git a/frontend/extension/src/components/ShortcutsContainer.tsx b/frontend/extension/src/components/ShortcutsContainer.tsx index 25ad0b2..76ead45 100644 --- a/frontend/extension/src/components/ShortcutsContainer.tsx +++ b/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"; diff --git a/frontend/extension/src/options.tsx b/frontend/extension/src/options.tsx index 432b37d..d8b38f9 100644 --- a/frontend/extension/src/options.tsx +++ b/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"; diff --git a/frontend/extension/src/popup.tsx b/frontend/extension/src/popup.tsx index 2649c43..fdb7ce6 100644 --- a/frontend/extension/src/popup.tsx +++ b/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"; diff --git a/frontend/types/proto/api/v2/common_pb.d.ts b/frontend/extension/src/types/proto/api/v2/common_pb.d.ts similarity index 100% rename from frontend/types/proto/api/v2/common_pb.d.ts rename to frontend/extension/src/types/proto/api/v2/common_pb.d.ts diff --git a/frontend/types/proto/api/v2/common_pb.js b/frontend/extension/src/types/proto/api/v2/common_pb.js similarity index 100% rename from frontend/types/proto/api/v2/common_pb.js rename to frontend/extension/src/types/proto/api/v2/common_pb.js diff --git a/frontend/types/proto/api/v2/shortcut_service_pb.d.ts b/frontend/extension/src/types/proto/api/v2/shortcut_service_pb.d.ts similarity index 100% rename from frontend/types/proto/api/v2/shortcut_service_pb.d.ts rename to frontend/extension/src/types/proto/api/v2/shortcut_service_pb.d.ts diff --git a/frontend/types/proto/api/v2/shortcut_service_pb.js b/frontend/extension/src/types/proto/api/v2/shortcut_service_pb.js similarity index 100% rename from frontend/types/proto/api/v2/shortcut_service_pb.js rename to frontend/extension/src/types/proto/api/v2/shortcut_service_pb.js diff --git a/frontend/types/proto/api/v2/user_service_pb.d.ts b/frontend/extension/src/types/proto/api/v2/user_service_pb.d.ts similarity index 100% rename from frontend/types/proto/api/v2/user_service_pb.d.ts rename to frontend/extension/src/types/proto/api/v2/user_service_pb.d.ts diff --git a/frontend/types/proto/api/v2/user_service_pb.js b/frontend/extension/src/types/proto/api/v2/user_service_pb.js similarity index 100% rename from frontend/types/proto/api/v2/user_service_pb.js rename to frontend/extension/src/types/proto/api/v2/user_service_pb.js diff --git a/frontend/types/proto/api/v2/user_setting_service_pb.d.ts b/frontend/extension/src/types/proto/api/v2/user_setting_service_pb.d.ts similarity index 100% rename from frontend/types/proto/api/v2/user_setting_service_pb.d.ts rename to frontend/extension/src/types/proto/api/v2/user_setting_service_pb.d.ts diff --git a/frontend/types/proto/api/v2/user_setting_service_pb.js b/frontend/extension/src/types/proto/api/v2/user_setting_service_pb.js similarity index 100% rename from frontend/types/proto/api/v2/user_setting_service_pb.js rename to frontend/extension/src/types/proto/api/v2/user_setting_service_pb.js diff --git a/frontend/types/proto/store/activity_pb.d.ts b/frontend/extension/src/types/proto/store/activity_pb.d.ts similarity index 100% rename from frontend/types/proto/store/activity_pb.d.ts rename to frontend/extension/src/types/proto/store/activity_pb.d.ts diff --git a/frontend/types/proto/store/activity_pb.js b/frontend/extension/src/types/proto/store/activity_pb.js similarity index 100% rename from frontend/types/proto/store/activity_pb.js rename to frontend/extension/src/types/proto/store/activity_pb.js diff --git a/frontend/types/proto/store/common_pb.d.ts b/frontend/extension/src/types/proto/store/common_pb.d.ts similarity index 100% rename from frontend/types/proto/store/common_pb.d.ts rename to frontend/extension/src/types/proto/store/common_pb.d.ts diff --git a/frontend/types/proto/store/common_pb.js b/frontend/extension/src/types/proto/store/common_pb.js similarity index 100% rename from frontend/types/proto/store/common_pb.js rename to frontend/extension/src/types/proto/store/common_pb.js diff --git a/frontend/types/proto/store/shortcut_pb.d.ts b/frontend/extension/src/types/proto/store/shortcut_pb.d.ts similarity index 100% rename from frontend/types/proto/store/shortcut_pb.d.ts rename to frontend/extension/src/types/proto/store/shortcut_pb.d.ts diff --git a/frontend/types/proto/store/shortcut_pb.js b/frontend/extension/src/types/proto/store/shortcut_pb.js similarity index 100% rename from frontend/types/proto/store/shortcut_pb.js rename to frontend/extension/src/types/proto/store/shortcut_pb.js diff --git a/frontend/types/proto/store/user_setting_pb.d.ts b/frontend/extension/src/types/proto/store/user_setting_pb.d.ts similarity index 100% rename from frontend/types/proto/store/user_setting_pb.d.ts rename to frontend/extension/src/types/proto/store/user_setting_pb.d.ts diff --git a/frontend/types/proto/store/user_setting_pb.js b/frontend/extension/src/types/proto/store/user_setting_pb.js similarity index 100% rename from frontend/types/proto/store/user_setting_pb.js rename to frontend/extension/src/types/proto/store/user_setting_pb.js diff --git a/frontend/types/proto/store/workspace_setting_pb.d.ts b/frontend/extension/src/types/proto/store/workspace_setting_pb.d.ts similarity index 100% rename from frontend/types/proto/store/workspace_setting_pb.d.ts rename to frontend/extension/src/types/proto/store/workspace_setting_pb.d.ts diff --git a/frontend/types/proto/store/workspace_setting_pb.js b/frontend/extension/src/types/proto/store/workspace_setting_pb.js similarity index 100% rename from frontend/types/proto/store/workspace_setting_pb.js rename to frontend/extension/src/types/proto/store/workspace_setting_pb.js diff --git a/frontend/extension/tsconfig.json b/frontend/extension/tsconfig.json index ffccc6b..a2947a5 100644 --- a/frontend/extension/tsconfig.json +++ b/frontend/extension/tsconfig.json @@ -14,9 +14,6 @@ "@/*": [ "./src/*" ], - "@pbtypes/*": [ - "../types/*" - ] }, "baseUrl": "." } diff --git a/frontend/types/package.json b/frontend/types/package.json deleted file mode 100644 index 67d13fd..0000000 --- a/frontend/types/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "@bufbuild/protobuf": "^1.3.0" - } -} diff --git a/frontend/types/pnpm-lock.yaml b/frontend/types/pnpm-lock.yaml deleted file mode 100644 index 2bd6fed..0000000 --- a/frontend/types/pnpm-lock.yaml +++ /dev/null @@ -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 diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml index 5140c16..06a89a6 100644 --- a/proto/buf.gen.yaml +++ b/proto/buf.gen.yaml @@ -18,10 +18,12 @@ plugins: out: gen opt: - paths=source_relative - - plugin: buf.build/bufbuild/es:v1.3.0 - out: ../frontend/types/proto + # Generate types for the web client. - 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: