From 1429dbbea95417d307b9d9c3946ec8e9e6823eee Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Wed, 30 Mar 2022 17:42:34 +0200 Subject: [PATCH 1/4] fixed gapi types Signed-off-by: Alex Rybchenko --- .changeset/thick-bees-brush.md | 5 +++++ plugins/gcalendar/package.json | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .changeset/thick-bees-brush.md diff --git a/.changeset/thick-bees-brush.md b/.changeset/thick-bees-brush.md new file mode 100644 index 0000000000..4ec068e0a1 --- /dev/null +++ b/.changeset/thick-bees-brush.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-gcalendar': patch +--- + +fixed google API types dependencies diff --git a/plugins/gcalendar/package.json b/plugins/gcalendar/package.json index 18e122c5be..d6e40fdf5a 100644 --- a/plugins/gcalendar/package.json +++ b/plugins/gcalendar/package.json @@ -36,7 +36,10 @@ "luxon": "^2.3.0", "material-ui-popup-state": "^1.9.3", "react-query": "^3.34.16", - "react-use": "^17.2.4" + "react-use": "^17.2.4", + "@types/gapi": "^0.0.41", + "@types/gapi.auth2": "^0.0.56", + "@types/gapi.client.calendar": "^3.0.10" }, "peerDependencies": { "react": "^16.13.1 || ^17.0.0" @@ -50,9 +53,6 @@ "@testing-library/react": "^12.1.3", "@testing-library/user-event": "^14.0.0", "@types/dompurify": "^2.3.3", - "@types/gapi": "^0.0.41", - "@types/gapi.auth2": "^0.0.56", - "@types/gapi.client.calendar": "^3.0.10", "@types/jest": "^26.0.7", "@types/node": "^16.11.26", "@types/sanitize-html": "^2.6.2", From 06c648242a7a7dc0a3dd4c66d5e860be1a2baba6 Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 19 Apr 2022 00:38:40 +0200 Subject: [PATCH 2/4] chore: reference the gapi.client.calnder types directly in the types.d.ts Signed-off-by: blam --- plugins/gcalendar/src/api/types.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/gcalendar/src/api/types.ts b/plugins/gcalendar/src/api/types.ts index b6d9a36eb9..5c8bbdd1c1 100644 --- a/plugins/gcalendar/src/api/types.ts +++ b/plugins/gcalendar/src/api/types.ts @@ -14,8 +14,7 @@ * limitations under the License. */ -/// -/// +/// export type GCalendarList = gapi.client.calendar.CalendarList; From f779860811989cad1254d9e712b43e42a32e3878 Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 19 Apr 2022 01:45:14 +0200 Subject: [PATCH 3/4] chore: fix deps level Signed-off-by: blam --- plugins/gcalendar/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/gcalendar/package.json b/plugins/gcalendar/package.json index d6e40fdf5a..bad78e3771 100644 --- a/plugins/gcalendar/package.json +++ b/plugins/gcalendar/package.json @@ -36,10 +36,7 @@ "luxon": "^2.3.0", "material-ui-popup-state": "^1.9.3", "react-query": "^3.34.16", - "react-use": "^17.2.4", - "@types/gapi": "^0.0.41", - "@types/gapi.auth2": "^0.0.56", - "@types/gapi.client.calendar": "^3.0.10" + "react-use": "^17.2.4" }, "peerDependencies": { "react": "^16.13.1 || ^17.0.0" @@ -57,7 +54,10 @@ "@types/node": "^16.11.26", "@types/sanitize-html": "^2.6.2", "cross-fetch": "^3.1.5", - "msw": "^0.35.0" + "msw": "^0.35.0", + "@types/gapi": "^0.0.41", + "@types/gapi.auth2": "^0.0.56", + "@types/gapi.client.calendar": "^3.0.10" }, "files": [ "dist" From 449385e3c015bc194681161a88d27b6af52f3522 Mon Sep 17 00:00:00 2001 From: Alex Rybchenko Date: Fri, 22 Apr 2022 11:43:57 +0100 Subject: [PATCH 4/4] added @maxim_mazurok/gapi.client.calendar types directly Signed-off-by: Alex Rybchenko --- plugins/gcalendar/package.json | 6 ++---- yarn.lock | 33 +++++++-------------------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/plugins/gcalendar/package.json b/plugins/gcalendar/package.json index bad78e3771..fc3fc87134 100644 --- a/plugins/gcalendar/package.json +++ b/plugins/gcalendar/package.json @@ -29,6 +29,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", + "@maxim_mazurok/gapi.client.calendar": "^3.0.20220408", "classnames": "^2.3.1", "cross-fetch": "^3.1.5", "dompurify": "^2.3.6", @@ -54,10 +55,7 @@ "@types/node": "^16.11.26", "@types/sanitize-html": "^2.6.2", "cross-fetch": "^3.1.5", - "msw": "^0.35.0", - "@types/gapi": "^0.0.41", - "@types/gapi.auth2": "^0.0.56", - "@types/gapi.client.calendar": "^3.0.10" + "msw": "^0.35.0" }, "files": [ "dist" diff --git a/yarn.lock b/yarn.lock index 2019dab306..d573f1a526 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4215,10 +4215,10 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" -"@maxim_mazurok/gapi.client.calendar@latest": - version "3.0.20220217" - resolved "https://registry.npmjs.org/@maxim_mazurok/gapi.client.calendar/-/gapi.client.calendar-3.0.20220217.tgz#86279915171ddc5f29afba9f9c19244d3e842a07" - integrity sha512-FMXqpSBmws0Arxrpg3zJJdM2NwYFd66N/C9blAAw9wt68aWa74N6okLVvOCs1FJF9asF7gHBZn8jAP+DHk+yxg== +"@maxim_mazurok/gapi.client.calendar@^3.0.20220408": + version "3.0.20220408" + resolved "https://registry.npmjs.org/@maxim_mazurok/gapi.client.calendar/-/gapi.client.calendar-3.0.20220408.tgz#f6c4c91a1785bc0484a9c0b14fd079215d9ed80f" + integrity sha512-G0PF3QE2wWTDIDTpCQFmwkZSxuHtJQyMlRzK2Li5ZYdZ+sL2wm16iRaa3C8wx6nUStN5kY7nHSAPJ4jeN4npGw== dependencies: "@types/gapi.client" "*" @@ -5927,30 +5927,11 @@ dependencies: "@types/node" "*" -"@types/gapi.auth2@^0.0.56": - version "0.0.56" - resolved "https://registry.npmjs.org/@types/gapi.auth2/-/gapi.auth2-0.0.56.tgz#2f7031f79390b8401e7950d8277ada874fd2731c" - integrity sha512-kGaBtGVCqGS3Y05L56dGVlBpJflxLfwA0zpMQnQgGRFk1tsMPbQnogG51UQjt1vCuYfRO0Jd9/K5KDtzjAbMkA== - dependencies: - "@types/gapi" "*" - -"@types/gapi.client.calendar@^3.0.10": - version "3.0.10" - resolved "https://registry.npmjs.org/@types/gapi.client.calendar/-/gapi.client.calendar-3.0.10.tgz#4b089d9af2753a07cf1d46adc83b1a7cedb8e355" - integrity sha512-NUStEVbHPOhFsw4cWE2CThe5eKpTlmz+fSu8mvEc7j+IDVNgk1kS4C6hZzBCdlIjFfOzdQM3Cyqkt5kt7ze3kA== - dependencies: - "@maxim_mazurok/gapi.client.calendar" latest - "@types/gapi.client@*": version "1.0.5" resolved "https://registry.npmjs.org/@types/gapi.client/-/gapi.client-1.0.5.tgz#a6eb97e664fe51656c5b52258bd0afef28c76308" integrity sha512-OTpbBMuzfC4lkvaomxqskI/iWRGW3zOZbDXZLNSyiuswTiSSGgILRLkg0POuZ4EgzEdaYaTlXpnXiCp07ri/Yw== -"@types/gapi@*", "@types/gapi@^0.0.41": - version "0.0.41" - resolved "https://registry.npmjs.org/@types/gapi/-/gapi-0.0.41.tgz#c477ee4f0951c005869219fd10b456ae2bba437e" - integrity sha512-tmHO66z/f91JZCDqinj/nNvQEszsz/hBT4+MvCSKT5sDzl5Ld/oXZ8WaecCBjRLw2uWKUInUHM9MhEXWkOiNjw== - "@types/git-url-parse@^9.0.0": version "9.0.1" resolved "https://registry.npmjs.org/@types/git-url-parse/-/git-url-parse-9.0.1.tgz#1c7cc89527ca8b5afcf260ead3b0e4e373c43938" @@ -6430,7 +6411,7 @@ resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== -"@types/react-dom@*", "@types/react-dom@<18.0.0", "@types/react-dom@^17": +"@types/react-dom@*", "@types/react-dom@<18.0.0": version "17.0.15" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.15.tgz#f2c8efde11521a4b7991e076cb9c70ba3bb0d156" integrity sha512-Tr9VU9DvNoHDWlmecmcsE5ZZiUkYx+nKBzum4Oxe1K0yJVyBlfbq7H3eXjxXqJczBKqPGq3EgfTru4MgKb9+Yw== @@ -25387,12 +25368,12 @@ ws@7.4.5: resolved "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== -ws@8.5.0, ws@^8.4.2: +ws@8.5.0, ws@^8.3.0, ws@^8.4.2: version "8.5.0" resolved "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== -"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.3.1, ws@^7.4.6, ws@^8.3.0: +"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.3.1, ws@^7.4.6: version "7.5.7" resolved "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==