From 687ff26ab7ac717f2ad7b18bbf63f4562af369bd Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Wed, 23 Aug 2023 21:16:05 -0700 Subject: [PATCH 01/15] Update .reflame.config.jsonc --- .reflame.config.jsonc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 85307948cc2..b93849959c8 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -4,8 +4,8 @@ // It's basically JSON, with the addition of comments, and looser syntax // (trailing commas!). // Reflame uses this to identify your app. - "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod - // "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork + // "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod + "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork // "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev // This is what shows up in the browser's tab bar. "title": "highlight.io", From bf2cb9ecc936ccc8f979da359fd9d04c04a43c08 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Sat, 16 Sep 2023 16:02:03 -0700 Subject: [PATCH 02/15] Update .reflame.config.jsonc --- .reflame.config.jsonc | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index b93849959c8..19aa5b5ad2e 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -25,24 +25,52 @@ ], "environments": { "production": { + "REACT_APP_FIREBASE_CONFIG_OBJECT": "{ apiKey: 'AIzaSyD7g86A3EzEKmoE7aZ04Re3HZ0B4bWlL68', authDomain: 'auth.highlight.run', databaseURL: 'https://highlight-f5c5b.firebaseio.com', projectId: 'highlight-f5c5b', storageBucket: 'highlight-f5c5b.appspot.com', messagingSenderId: '263184175068', appId: '1:263184175068:web:f8190c20320087d1c6c919',}", "REACT_APP_COMMIT_SHA": { "type": "expression", "value": "Reflame.gitCommitSha" }, + "REACT_APP_PRIVATE_GRAPH_URI": "https://pri.highlight.io", + "REACT_APP_ONPREM": "false", "REACT_APP_FRONTEND_URI": { "type": "expression", "value": "window.location.origin" }, + "REACT_APP_FRONTEND_ORG": "1jdkoe52", + "REACT_APP_PUBLIC_GRAPH_URI": "https://pub.highlight.run", + "REACT_APP_AUTH_MODE": "firebase", + "SLACK_CLIENT_ID": "1354469824468.1868913469441", + "REACT_APP_STRIPE_API_PK": "pk_live_51Hlqh1Gz4ry65q42eza36EDSeIpFng39KpZVJzPpsYg5AM7h1rpysaCcZQHnC4J5uNmbjXP6rmSRuf9yr6rfGNOB00aZ73tU9f", + "CLICKUP_CLIENT_ID": "7IRYQ44K5NKLWWFPBPJII08BW7KS4063", + "DISCORD_CLIENT_ID": "1024079182013149185", + "REACT_APP_FRONT_INTEGRATION_CLIENT_ID": "e77eb8f15b02423c9525", + "HEIGHT_CLIENT_ID": "w8GzB4GI8gGUE2iEAQMY8Wck44gK2ek2i4Q8q4myKQY", + "LINEAR_CLIENT_ID": "f60ff43c7376d0aceaa1e111db39e60d", + "DEMO_PROJECT_ID": "1344" }, "development": { + "REACT_APP_FIREBASE_CONFIG_OBJECT": "{ apiKey: 'AIzaSyD7g86A3EzEKmoE7aZ04Re3HZ0B4bWlL68', authDomain: 'auth.highlight.run', databaseURL: 'https://highlight-f5c5b.firebaseio.com', projectId: 'highlight-f5c5b', storageBucket: 'highlight-f5c5b.appspot.com', messagingSenderId: '263184175068', appId: '1:263184175068:web:f8190c20320087d1c6c919',}", "REACT_APP_COMMIT_SHA": { "type": "expression", "value": "Reflame.gitCommitSha" }, + "REACT_APP_PRIVATE_GRAPH_URI": "https://pri.highlight.io", + "REACT_APP_ONPREM": "false", "REACT_APP_FRONTEND_URI": { "type": "expression", "value": "window.location.origin" }, + "REACT_APP_FRONTEND_ORG": "1jdkoe52", + "REACT_APP_PUBLIC_GRAPH_URI": "https://pub.highlight.run", + "REACT_APP_AUTH_MODE": "firebase", + "SLACK_CLIENT_ID": "1354469824468.1868913469441", + "REACT_APP_STRIPE_API_PK": "pk_live_51Hlqh1Gz4ry65q42eza36EDSeIpFng39KpZVJzPpsYg5AM7h1rpysaCcZQHnC4J5uNmbjXP6rmSRuf9yr6rfGNOB00aZ73tU9f", + "CLICKUP_CLIENT_ID": "7IRYQ44K5NKLWWFPBPJII08BW7KS4063", + "DISCORD_CLIENT_ID": "1024079182013149185", + "REACT_APP_FRONT_INTEGRATION_CLIENT_ID": "e77eb8f15b02423c9525", + "HEIGHT_CLIENT_ID": "w8GzB4GI8gGUE2iEAQMY8Wck44gK2ek2i4Q8q4myKQY", + "LINEAR_CLIENT_ID": "f60ff43c7376d0aceaa1e111db39e60d", + "DEMO_PROJECT_ID": "1344" }, }, "defaultEnvironment": "production", From 9c96b73daf07b5f7b87001afa7310083487a7fd1 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Mon, 12 Aug 2024 18:29:32 -0700 Subject: [PATCH 03/15] Dev --- .reflame.config.jsonc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 19aa5b5ad2e..8cc90f0e003 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -5,8 +5,8 @@ // (trailing commas!). // Reflame uses this to identify your app. // "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod - "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork - // "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev + // "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork + "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev // This is what shows up in the browser's tab bar. "title": "highlight.io", // This is the description that shows up in Google search. From 221d869c98bec833ddf70ed7739573d6d80b9272 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Mon, 12 Aug 2024 19:00:59 -0700 Subject: [PATCH 04/15] Revert "Dev" This reverts commit 9c96b73daf07b5f7b87001afa7310083487a7fd1. --- .reflame.config.jsonc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 8cc90f0e003..19aa5b5ad2e 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -5,8 +5,8 @@ // (trailing commas!). // Reflame uses this to identify your app. // "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod - // "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork - "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev + "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork + // "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev // This is what shows up in the browser's tab bar. "title": "highlight.io", // This is the description that shows up in Google search. From ad1d6709894b66a166b39dc417f43d996ecf1c11 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Tue, 17 Sep 2024 17:54:54 -0700 Subject: [PATCH 05/15] WIP --- frontend/src/pages/Auth/SignIn.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/Auth/SignIn.tsx b/frontend/src/pages/Auth/SignIn.tsx index dd8cdb4a510..ab236273cc2 100644 --- a/frontend/src/pages/Auth/SignIn.tsx +++ b/frontend/src/pages/Auth/SignIn.tsx @@ -16,7 +16,7 @@ import SvgHighlightLogoOnLight from '@icons/HighlightLogoOnLight' import { AuthBody, AuthError, AuthFooter, AuthHeader } from '@pages/Auth/Layout' import useLocalStorage from '@rehooks/local-storage' import { auth } from '@util/auth' -import firebase from 'firebase/compat/app' +import type firebase from 'firebase/compat/app' import React, { useCallback, useEffect } from 'react' import { Link, useLocation, useNavigate } from 'react-router-dom' @@ -142,7 +142,7 @@ export const SignIn: React.FC = ({ setResolver }) => { {workspaceInvite ? `You're invited to join ‘${workspaceInvite.workspace_name}’` - : 'Welcome back.'} + : '!Welcome back.'} {AUTH_MODE !== 'oauth' ? ( From 440b8e6b349d1254a547814c148d0efa6d25dde8 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Tue, 17 Sep 2024 17:56:55 -0700 Subject: [PATCH 06/15] bump --- .reflame.config.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 19aa5b5ad2e..19908e80b82 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -402,7 +402,7 @@ ], }, "highlight.run": { - "version": "^9.1.0" + "version": "9.3.4" }, // TODO: create a library for this // Might need a shim entry point for .css? From 43268d867ec3f83fca7f97cb537c20be99e1e112 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Tue, 17 Sep 2024 18:02:19 -0700 Subject: [PATCH 07/15] back to dev --- .reflame.config.jsonc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 19908e80b82..96e20a0fe1c 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -5,8 +5,8 @@ // (trailing commas!). // Reflame uses this to identify your app. // "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod - "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork - // "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev + // "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork + "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev // This is what shows up in the browser's tab bar. "title": "highlight.io", // This is the description that shows up in Google search. From 6c95eef1d2adab41a4a657f6f52ea9acc62938bd Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Tue, 17 Sep 2024 18:04:24 -0700 Subject: [PATCH 08/15] Try again --- .reflame.config.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 96e20a0fe1c..1f4cc312132 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -1,5 +1,5 @@ { - // 3 + // 4 // This is a JSON with Comments file. // It's basically JSON, with the addition of comments, and looser syntax // (trailing commas!). From a74d5a726c87542d57252de428273648b7328fb7 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Tue, 17 Sep 2024 18:23:27 -0700 Subject: [PATCH 09/15] Try fix --- .reflame.config.jsonc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 1f4cc312132..107080e0fdf 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -5,8 +5,8 @@ // (trailing commas!). // Reflame uses this to identify your app. // "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod - // "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork - "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev + "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork + // "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev // This is what shows up in the browser's tab bar. "title": "highlight.io", // This is the description that shows up in Google search. @@ -407,7 +407,7 @@ // TODO: create a library for this // Might need a shim entry point for .css? "@highlight-run/react": { - "version": "^3.2.0", + "version": "5.0.4", }, "antd": { "entryPoints": [ From 7f6d8cf68025cc388c6bef33c3ad7a397b88ec05 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Fri, 18 Oct 2024 17:42:23 -0700 Subject: [PATCH 10/15] Update --- .reflame.config.jsonc | 4 ++-- frontend/src/pages/Auth/SignIn.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 107080e0fdf..21b208a1b57 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -5,8 +5,8 @@ // (trailing commas!). // Reflame uses this to identify your app. // "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod - "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork - // "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev + // "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork + "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev // This is what shows up in the browser's tab bar. "title": "highlight.io", // This is the description that shows up in Google search. diff --git a/frontend/src/pages/Auth/SignIn.tsx b/frontend/src/pages/Auth/SignIn.tsx index ab236273cc2..f9b1fab130d 100644 --- a/frontend/src/pages/Auth/SignIn.tsx +++ b/frontend/src/pages/Auth/SignIn.tsx @@ -142,7 +142,7 @@ export const SignIn: React.FC = ({ setResolver }) => { {workspaceInvite ? `You're invited to join ‘${workspaceInvite.workspace_name}’` - : '!Welcome back.'} + : 'Welcome back!1234'} {AUTH_MODE !== 'oauth' ? ( From 50212aee9f95ea47fdd9c63b7076738f6a6383f4 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Fri, 18 Oct 2024 18:44:15 -0700 Subject: [PATCH 11/15] Disable stories tests for now --- .reflame.config.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 21b208a1b57..7fdd5db030c 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -305,7 +305,7 @@ "./styles.css": "./noop.ts", }, "storybookCompatibility": { - "testStories": true, + "testStories": false, }, "npmPackages": { "ariakit": { From 70e81d911429d1e721daf2c94afb831c25a6e7ed Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Mon, 18 Nov 2024 21:19:34 -0800 Subject: [PATCH 12/15] Try prod --- frontend/src/pages/Auth/SignIn.tsx | 2 +- opentelemetry-sdk-workers | 2 +- rrweb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/Auth/SignIn.tsx b/frontend/src/pages/Auth/SignIn.tsx index f9b1fab130d..daeafdf590e 100644 --- a/frontend/src/pages/Auth/SignIn.tsx +++ b/frontend/src/pages/Auth/SignIn.tsx @@ -142,7 +142,7 @@ export const SignIn: React.FC = ({ setResolver }) => { {workspaceInvite ? `You're invited to join ‘${workspaceInvite.workspace_name}’` - : 'Welcome back!1234'} + : 'Welcome back!lj asd asdsadasdsasds'} {AUTH_MODE !== 'oauth' ? ( diff --git a/opentelemetry-sdk-workers b/opentelemetry-sdk-workers index 8c7b7a23d80..fe2b658d0e4 160000 --- a/opentelemetry-sdk-workers +++ b/opentelemetry-sdk-workers @@ -1 +1 @@ -Subproject commit 8c7b7a23d806838a6f522e7fe4d96eb337b43ac5 +Subproject commit fe2b658d0e48bb84e032ba26e00bc18cba8ad9db diff --git a/rrweb b/rrweb index d60d9a10286..a3aa0f4cebe 160000 --- a/rrweb +++ b/rrweb @@ -1 +1 @@ -Subproject commit d60d9a10286a4d08b3bb33ec7a7c024835e154ba +Subproject commit a3aa0f4cebe957874652d9c7d182163bee378c0b From 96ad0971c72aaccdb20a6edea2458e20760b527b Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Mon, 18 Nov 2024 22:15:31 -0800 Subject: [PATCH 13/15] Try all the tests --- .reflame.config.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 7fdd5db030c..21b208a1b57 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -305,7 +305,7 @@ "./styles.css": "./noop.ts", }, "storybookCompatibility": { - "testStories": false, + "testStories": true, }, "npmPackages": { "ariakit": { From 134962d330466e6f2850b122615cf194fb36ccb5 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Tue, 19 Nov 2024 17:36:36 -0800 Subject: [PATCH 14/15] Update --- frontend/src/pages/Auth/SignIn.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/Auth/SignIn.tsx b/frontend/src/pages/Auth/SignIn.tsx index daeafdf590e..0e83be6e20d 100644 --- a/frontend/src/pages/Auth/SignIn.tsx +++ b/frontend/src/pages/Auth/SignIn.tsx @@ -142,7 +142,7 @@ export const SignIn: React.FC = ({ setResolver }) => { {workspaceInvite ? `You're invited to join ‘${workspaceInvite.workspace_name}’` - : 'Welcome back!lj asd asdsadasdsasds'} + : 'Welcome back!lj asd asdsadasdsasds!!'} {AUTH_MODE !== 'oauth' ? ( From 7d1ee44cafce1773949bcbc9192b7e80cac1df00 Mon Sep 17 00:00:00 2001 From: Lewis Liu Date: Wed, 20 Nov 2024 14:33:21 -0800 Subject: [PATCH 15/15] Updates --- .reflame.config.jsonc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.reflame.config.jsonc b/.reflame.config.jsonc index 21b208a1b57..107080e0fdf 100644 --- a/.reflame.config.jsonc +++ b/.reflame.config.jsonc @@ -5,8 +5,8 @@ // (trailing commas!). // Reflame uses this to identify your app. // "appId": "01GVH35S71FJP26W72V3K7CB2N", // prod - // "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork - "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev + "appId": "01GSXZYQT1W0TZDJAG94P9S4BZ", // prod fork + // "appId": "01GR550WASJY2G2NSYZ4P54JJV", // dev // This is what shows up in the browser's tab bar. "title": "highlight.io", // This is the description that shows up in Google search.