feat: Reduce bundle size via better imports + install gcal + gvideo by default for google signups #17810

hbjORbj · 2024-11-23T07:36:02Z

What does this PR do?

New testing screencast

Screen.Recording.2024-11-23.at.3.08.25.AM.mov

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
N/A - I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Go through a sign up process using Google sign-in. DM me if you need help with this.

hbjORbj · 2024-11-23T07:37:15Z

packages/features/auth/lib/next-auth-options.ts

+import { OAuth2Client } from "google-auth-library";
+import { calendar_v3 } from "googleapis";


Size of full package is ~20MB while it's ~2-3MB for just calendar and OAuth

I've been working on a similar fix! there's the @googleapis/calendar package (and @googleapis/admin) to also slim down the node_modules. Can confirm this works

Potentially you need to use googleapis-common for the OAuth2Client

Potentially you need to use googleapis-common for the OAuth2Client

Ah yeah maybe if we remove googleapis. Thanks for the heads up!

I've been working on a similar fix! there's the @googleapis/calendar package (and @googleapis/admin) to also slim down the node_modules. Can confirm this works

Will handle that in #17811

graphite-app · 2024-11-23T07:40:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (11/23/24)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add foundation team as reviewer" took an action on this PR • (11/26/24)

1 reviewer was added to this PR based on Keith Williams's automation.

vercel · 2024-11-23T07:49:40Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Nov 26, 2024 5:11pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Nov 26, 2024 5:11pm

hbjORbj · 2024-11-23T07:50:01Z

packages/lib/server/service/google.ts

+import type { Credentials } from "google-auth-library";
+import type { OAuth2Client } from "google-auth-library";
+import type { calendar_v3 } from "googleapis";
+import { oauth2_v2 } from "googleapis";


github-actions · 2024-11-23T08:11:26Z

E2E results are ready!

Workflow #39314.1 latest results

emrysal

Generally not too happy with this.

GoogleService is a good idea, but it doesn't belong in @calcom/lib/server and there's a similar file that already exists in the app-store/googlecalendar/lib folder.
It makes more sense to make this an instantiatable class (like googlecalendar/lib) - as it involves credential initialisation.

Concluding I'm not sure why this logic is moving to calcom/lib?

socket-security · 2024-11-26T16:49:00Z

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher

View full report↗︎

socket-security · 2024-11-26T16:49:02Z

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

View full report↗︎

hbjORbj · 2024-11-26T17:02:22Z

@emrysal Thanks alex, addressed your feedback! 🙏

hbjORbj · 2024-11-26T18:02:07Z

apps/api/v2/src/ee/gcal/gcal.controller.ts

-import { Prisma } from "@prisma/client";
 import { Request } from "express";
-import { google } from "googleapis";
-import { z } from "zod";


These imports weren't being used

hbjORbj · 2024-11-26T18:02:17Z

apps/web/package.json

@@ -180,6 +182,7 @@
    "deasync": "^0.1.30",
    "detect-port": "^1.3.0",
    "env-cmd": "^10.1.0",
+    "google-auth-library": "^9.15.0",


Adding this as a dev dependency because we need to import type Credentials from the lib.

hbjORbj · 2024-11-26T18:02:39Z

packages/app-store/googlevideo/package.json

@@ -6,8 +6,7 @@
  "main": "./index.ts",
  "description": "Google Meet is Google's web-based video conferencing platform, designed to compete with major conferencing platforms.",
  "dependencies": {
-    "@calcom/prisma": "*",
-    "googleapis": "^84.0.0"


we don't use anything from googleapis in /googlevideo

hbjORbj · 2024-11-26T18:03:04Z

packages/app-store/googlecalendar/package.json

@@ -7,7 +7,7 @@
  "description": "Google Calendar is a time management and scheduling service developed by Google. Allows users to create and edit events, with options available for type and time. Available to anyone that has a Gmail account on both mobile and web versions.",
  "dependencies": {
    "@calcom/prisma": "*",
-    "googleapis": "^84.0.0"
+    "@googleapis/calendar": "^9.7.9"


app-store/googlecalendar only uses calendar

emrysal

LFG! Nice work man 👏 - works locally; very happy with the new imports.

hbjORbj added 3 commits November 23, 2024 02:32

wip

135a514

Merge remote-tracking branch 'origin/main' into feat/gcal-gmeets-default

55078de

use light imports

cc56860

graphite-app bot requested a review from a team November 23, 2024 07:36

dosubot bot added app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar ✨ feature New feature or request ❗️ .env changes contains changes to env variables labels Nov 23, 2024

keithwillcode added consumer core area: core, team members only labels Nov 23, 2024

hbjORbj added the ready-for-e2e label Nov 23, 2024

hbjORbj commented Nov 23, 2024

View reviewed changes

fix

beb612b

hbjORbj commented Nov 23, 2024

View reviewed changes

vercel bot deployed to Preview – api November 23, 2024 07:58 View deployment

vercel bot deployed to Preview – dev November 23, 2024 08:18 View deployment

hbjORbj enabled auto-merge (squash) November 23, 2024 08:40

Merge remote-tracking branch 'origin/main'

399a758

vercel bot deployed to Preview – api November 25, 2024 13:43 View deployment

vercel bot deployed to Preview – dev November 25, 2024 13:49 View deployment

hbjORbj mentioned this pull request Nov 25, 2024

perf: Reduce bundle size via better imports with googleapis #17811

Merged

3 tasks

emrysal requested changes Nov 25, 2024

View reviewed changes

github-actions bot marked this pull request as draft November 25, 2024 17:05

auto-merge was automatically disabled November 25, 2024 17:05
Pull request was converted to draft

perf: Reduce bundle size via better imports with googleapis (#17811)

5699be3

vercel bot deployed to Preview – api November 25, 2024 17:56 View deployment

vercel bot deployed to Preview – dev November 25, 2024 18:04 View deployment

Merge branch 'main' into feat/gcal-gmeets-default

f265b82

vercel bot deployed to Preview – api November 25, 2024 18:49 View deployment

vercel bot deployed to Preview – dev November 25, 2024 18:58 View deployment

fix test

3455782

hbjORbj changed the title ~~feat: [with OOM fix] install gcal + gvideo by default for google signups (~~ feat: Reduce bundle size via better imports + install gcal + gvideo by default for google signups Nov 26, 2024

hbjORbj added 2 commits November 26, 2024 11:47

refactor

ba8c198

Merge remote-tracking branch 'origin/main' into feat/gcal-gmeets-default

3934314

hbjORbj added 2 commits November 26, 2024 11:51

update vite.config.js

ea61da4

fix

44eb60d

vercel bot deployed to Preview – api November 26, 2024 17:11 View deployment

fix unit test failing

1858c86

vercel bot deployed to Preview – api November 26, 2024 17:21 View deployment

hbjORbj marked this pull request as ready for review November 26, 2024 17:37

dosubot bot added the performance area: performance, page load, slow, slow endpoints, loading screen, unresponsive label Nov 26, 2024

vercel bot deployed to Preview – dev November 26, 2024 17:37 View deployment

graphite-app bot requested a review from a team November 26, 2024 17:37

hbjORbj added ready-for-e2e and removed ready-for-e2e labels Nov 26, 2024

hbjORbj commented Nov 26, 2024

View reviewed changes

emrysal approved these changes Dec 6, 2024

View reviewed changes

emrysal merged commit b8219c2 into main Dec 6, 2024
80 of 88 checks passed

emrysal deleted the feat/gcal-gmeets-default branch December 6, 2024 02:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Reduce bundle size via better imports + install gcal + gvideo by default for google signups #17810

feat: Reduce bundle size via better imports + install gcal + gvideo by default for google signups #17810

hbjORbj commented Nov 23, 2024 •

edited

Loading

hbjORbj Nov 23, 2024 •

edited

Loading

emrysal Nov 23, 2024

emrysal Nov 23, 2024

hbjORbj Nov 25, 2024 •

edited

Loading

hbjORbj Nov 25, 2024

graphite-app bot commented Nov 23, 2024 •

edited

Loading

vercel bot commented Nov 23, 2024 •

edited

Loading

hbjORbj Nov 23, 2024

github-actions bot commented Nov 23, 2024 •

edited

Loading

emrysal left a comment

socket-security bot commented Nov 26, 2024 •

edited

Loading

socket-security bot commented Nov 26, 2024 •

edited

Loading

hbjORbj commented Nov 26, 2024

hbjORbj Nov 26, 2024

hbjORbj Nov 26, 2024

hbjORbj Nov 26, 2024

hbjORbj Nov 26, 2024

emrysal left a comment

		import { OAuth2Client } from "google-auth-library";
		import { calendar_v3 } from "googleapis";

feat: Reduce bundle size via better imports + install gcal + gvideo by default for google signups #17810

feat: Reduce bundle size via better imports + install gcal + gvideo by default for google signups #17810

Conversation

hbjORbj commented Nov 23, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

hbjORbj Nov 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hbjORbj Nov 25, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

graphite-app bot commented Nov 23, 2024 • edited Loading

Graphite Automations

vercel bot commented Nov 23, 2024 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Nov 23, 2024 • edited Loading

E2E results are ready!

emrysal left a comment

Choose a reason for hiding this comment

socket-security bot commented Nov 26, 2024 • edited Loading

socket-security bot commented Nov 26, 2024 • edited Loading

hbjORbj commented Nov 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emrysal left a comment

Choose a reason for hiding this comment

hbjORbj commented Nov 23, 2024 •

edited

Loading

hbjORbj Nov 23, 2024 •

edited

Loading

hbjORbj Nov 25, 2024 •

edited

Loading

graphite-app bot commented Nov 23, 2024 •

edited

Loading

vercel bot commented Nov 23, 2024 •

edited

Loading

github-actions bot commented Nov 23, 2024 •

edited

Loading

socket-security bot commented Nov 26, 2024 •

edited

Loading

socket-security bot commented Nov 26, 2024 •

edited

Loading