Merge pull request #1718 from makeplane/stage-release

dev: equate stage-release and develop branch

.env.example

@@ -19,6 +19,8 @@ NEXT_PUBLIC_ENABLE_SESSION_RECORDER=0
 NEXT_PUBLIC_TRACK_EVENTS=0
 # Slack for Slack Integration
 NEXT_PUBLIC_SLACK_CLIENT_ID=""
+# For Telemetry, set it to "app.plane.so"
+NEXT_PUBLIC_PLAUSIBLE_DOMAIN=""
 
 # Backend
 # Debug value for api server use it as 0 for production use

apps/app/components/account/google-login.tsx

@@ -20,17 +20,21 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = ({ handleSignIn }) => {
       callback: handleSignIn,
     });
 
-    window?.google?.accounts.id.renderButton(
-      googleSignInButton.current,
-      {
-        type: "standard",
-        theme: "outline",
-        size: "large",
-        logo_alignment: "center",
-        width: "360",
-        text: "signin_with",
-      } as GsiButtonConfiguration // customization attributes
-    );
+    try {
+      window?.google?.accounts.id.renderButton(
+        googleSignInButton.current,
+        {
+          type: "standard",
+          theme: "outline",
+          size: "large",
+          logo_alignment: "center",
+          width: 360,
+          text: "signin_with",
+        } as GsiButtonConfiguration // customization attributes
+      );
+    } catch (err) {
+      console.log(err);
+    }
 
     window?.google?.accounts.id.prompt(); // also display the One Tap dialog
 
@@ -50,7 +54,7 @@ export const GoogleLoginButton: FC<IGoogleLoginButton> = ({ handleSignIn }) => {
     <>
       <Script src="https://accounts.google.com/gsi/client" async defer onLoad={loadScript} />
       <div
-        className="overflow-hidden rounded w-full flex justify-center items-center !text-sm !font-medium !text-custom-text-100"
+        className="overflow-hidden rounded w-full"
         id="googleSignInButton"
         ref={googleSignInButton}
       />

apps/app/google.d.ts

@@ -37,7 +37,7 @@ interface GsiButtonConfiguration {
   text?: "signin_with" | "signup_with" | "continue_with" | "signup_with";
   shape?: "rectangular" | "pill" | "circle" | "square";
   logo_alignment?: "left" | "center";
-  width?: string;
+  width?: number;
   local?: string;
 }
 

apps/app/pages/_document.tsx

@@ -12,7 +12,13 @@ class MyDocument extends Document {
           <link rel="manifest" href="/manifest.json" />
           <link rel="apple-touch-icon" href="/icon.png" />
           <meta name="theme-color" content="#fff" />
-          <script defer data-domain="app.plane.so" src="https://plausible.io/js/script.js" />
+          {process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN && (
+            <script
+              defer
+              data-domain={process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN}
+              src="https://plausible.io/js/script.js"
+            />
+          )}
           <script defer src="https://cdn.jsdelivr.net/npm/@supabase/supabase-js@2" />
           {isSessionRecorderEnabled && process.env.NEXT_PUBLIC_SESSION_RECORDER_KEY && (
             <script

turbo.json

@@ -22,7 +22,8 @@
     "NEXT_PUBLIC_SLACK_CLIENT_ID",
     "NEXT_PUBLIC_SLACK_CLIENT_SECRET",
     "NEXT_PUBLIC_SUPABASE_URL",
-    "NEXT_PUBLIC_SUPABASE_ANON_KEY"
+    "NEXT_PUBLIC_SUPABASE_ANON_KEY",
+    "NEXT_PUBLIC_PLAUSIBLE_DOMAIN"
   ],
   "pipeline": {
     "build": {