Merge remote-tracking branch 'origin' into by/cta-over-20k-annual-cus…

…tomers

.eslintrc.js

@@ -114,13 +114,8 @@ module.exports = {
                     },
                     {
                         name: 'antd',
-                        importNames: ['Tooltip'],
-                        message: 'Please use Tooltip from @posthog/lemon-ui instead.',
-                    },
-                    {
-                        name: 'antd',
-                        importNames: ['Alert'],
-                        message: 'Please use LemonBanner from @posthog/lemon-ui instead.',
+                        importNames: ['Card', 'Col', 'Row', 'Alert', 'Tooltip'],
+                        message: 'please use the Lemon equivalent instead',
                     },
                 ],
             },
@@ -141,23 +136,10 @@ module.exports = {
             'warn',
             {
                 forbid: [
-                    {
-                        element: 'Row',
-                        message:
-                            'use flex utility classes instead, e.g. <Row align="middle"> could be <div className="flex items-center">',
-                    },
-                    {
-                        element: 'Col',
-                        message: 'use flex utility classes instead - most of the time can simply be a plain <div>',
-                    },
                     {
                         element: 'Divider',
                         message: 'use <LemonDivider> instead',
                     },
-                    {
-                        element: 'Card',
-                        message: 'use utility classes instead',
-                    },
                     {
                         element: 'Button',
                         message: 'use <LemonButton> instead',

.github/actions/run-backend-tests/action.yml

@@ -44,9 +44,11 @@ runs:
           run: echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts
 
         - name: Set up Python
-          uses: actions/setup-python@v4
+          uses: actions/setup-python@v5
           with:
               python-version: ${{ inputs.python-version }}
+              cache: pip
+              cache-dependency-path: '**/requirements*.txt'
               token: ${{ inputs.token }}
 
         - name: Determine if hogql-parser has changed compared to master
@@ -85,9 +87,6 @@ runs:
           with:
               custom_cache_key_element: v2
 
-        - uses: syphar/restore-pip-download-cache@v1
-          if: steps.cache-backend-tests.outputs.cache-hit != 'true'
-
         - name: Install Python dependencies
           if: steps.cache-backend-tests.outputs.cache-hit != 'true'
           shell: bash

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly

.github/workflows/benchmark.yml

@@ -52,17 +52,16 @@ jobs:
                   docker compose -f docker-compose.dev.yml up -d
 
             - name: Set up Python
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: 3.10.10
+                  cache: 'pip'
+                  cache-dependency-path: '**/requirements*.txt'
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
               id: cache-benchmark-tests
 
-            - uses: syphar/restore-pip-download-cache@v1
-              if: steps.cache-benchmark-tests.outputs.cache-hit != 'true'
-
             - name: Install SAML (python3-saml) dependencies
               shell: bash
               run: |

.github/workflows/ci-backend.yml

@@ -103,19 +103,18 @@ jobs:
                   fetch-depth: 1
 
             - name: Set up Python
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: 3.10.10
+                  cache: 'pip'
+                  cache-dependency-path: '**/requirements*.txt'
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
                   custom_cache_key_element: v2-
 
-            - uses: syphar/restore-pip-download-cache@v1
-              if: steps.cache-backend-tests.outputs.cache-hit != 'true'
-
             - name: Install SAML (python3-saml) dependencies
               run: |
                   sudo apt-get update
@@ -181,19 +180,18 @@ jobs:
                   docker compose -f docker-compose.dev.yml up -d
 
             - name: Set up Python
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: 3.10.10
+                  cache: 'pip'
+                  cache-dependency-path: '**/requirements*.txt'
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
                   custom_cache_key_element: v1-
 
-            - uses: syphar/restore-pip-download-cache@v1
-              if: steps.cache-backend-tests.outputs.cache-hit != 'true'
-
             - name: Install SAML (python3-saml) dependencies
               run: |
                   sudo apt-get update
@@ -325,19 +323,18 @@ jobs:
                   docker compose -f docker-compose.dev.yml up -d
 
             - name: Set up Python
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: 3.10.10
+                  cache: 'pip'
+                  cache-dependency-path: '**/requirements*.txt'
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
                   custom_cache_key_element: v2-
 
-            - uses: syphar/restore-pip-download-cache@v1
-              if: steps.cache-backend-tests.outputs.cache-hit != 'true'
-
             - name: Install SAML (python3-saml) dependencies
               run: |
                   sudo apt-get update

.github/workflows/ci-hobby.yml

@@ -31,6 +31,7 @@ jobs:
               with:
                   python-version: '3.8'
                   cache: 'pip' # caching pip dependencies
+                  cache-dependency-path: '**/requirements*.txt'
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
             - name: Get python deps
               run: pip install python-digitalocean==1.17.0 requests==2.28.1

.github/workflows/ci-plugin-server.yml

@@ -115,9 +115,11 @@ jobs:
 
             - name: Set up Python
               if: needs.changes.outputs.plugin-server == 'true'
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: 3.10.10
+                  cache: 'pip'
+                  cache-dependency-path: '**/requirements*.txt'
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
@@ -126,9 +128,6 @@ jobs:
               with:
                   custom_cache_key_element: v1-
 
-            - uses: syphar/restore-pip-download-cache@v1
-              if: needs.changes.outputs.plugin-server == 'true' && steps.cache-backend-tests.outputs.cache-hit != 'true'
-
             - name: Install SAML (python3-saml) dependencies
               if: needs.changes.outputs.plugin-server == 'true'
               run: |
@@ -213,19 +212,18 @@ jobs:
               run: echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts
 
             - name: Set up Python
-              uses: actions/setup-python@v4
+              uses: actions/setup-python@v5
               with:
                   python-version: 3.10.10
+                  cache: 'pip'
+                  cache-dependency-path: '**/requirements*.txt'
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
                   custom_cache_key_element: v1-
 
-            - uses: syphar/restore-pip-download-cache@v1
-              if: steps.cache-backend-tests.outputs.cache-hit != 'true'
-
             - name: Install SAML (python3-saml) dependencies
               run: |
                   sudo apt-get update

.github/workflows/container-images-cd.yml

@@ -52,15 +52,15 @@ jobs:
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Configure AWS credentials
-              uses: aws-actions/configure-aws-credentials@v1
+              uses: aws-actions/configure-aws-credentials@v4
               with:
                   aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
                   aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
                   aws-region: us-east-1
 
             - name: Login to Amazon ECR
               id: aws-ecr
-              uses: aws-actions/amazon-ecr-login@v1
+              uses: aws-actions/amazon-ecr-login@v2
 
             - name: Build and push container image
               id: build

.github/workflows/pr-cleanup.yml

@@ -21,15 +21,15 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v3
 
-            - uses: aws-actions/configure-aws-credentials@v1
+            - uses: aws-actions/configure-aws-credentials@v4
               with:
                   aws-region: us-east-1
                   role-to-assume: arn:aws:iam::169684386827:role/github-terraform-infra-role
                   role-duration-seconds: 3600
 
             - name: Login to Amazon ECR
               id: aws-ecr
-              uses: aws-actions/amazon-ecr-login@v1
+              uses: aws-actions/amazon-ecr-login@v2
 
             - name: connect to tailscale
               uses: tailscale/github-action@8b804aa882ac3429b804a2a22f9803a2101a0db9

.github/workflows/pr-deploy.yml

@@ -36,7 +36,7 @@ jobs:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-            - uses: aws-actions/configure-aws-credentials@v1
+            - uses: aws-actions/configure-aws-credentials@v4
               with:
                   aws-region: us-east-1
                   role-to-assume: arn:aws:iam::169684386827:role/github-terraform-infra-role
@@ -53,7 +53,7 @@ jobs:
 
             - name: Login to Amazon ECR
               id: aws-ecr
-              uses: aws-actions/amazon-ecr-login@v1
+              uses: aws-actions/amazon-ecr-login@v2
 
             - name: Build and push PR test image
               id: build-unit

.storybook/decorators/withTheme.tsx

@@ -1,40 +1,16 @@
 import type { Decorator } from '@storybook/react'
 
-import { FEATURE_FLAGS } from 'lib/constants'
-
 /** Global story decorator that is used by the theming control to
  * switch between themes.
  */
 export const withTheme: Decorator = (Story, context) => {
     const theme = context.globals.theme
 
-    // set the body class
-    const actualClassState = document.body.classList.contains('posthog-3000')
-    const desiredClassState = theme !== 'legacy'
-
-    if (actualClassState !== desiredClassState) {
-        if (desiredClassState) {
-            document.body.classList.add('posthog-3000')
-        } else {
-            document.body.classList.remove('posthog-3000')
-        }
-    }
-
-    // set the feature flag
-    const actualFeatureFlagState = window.POSTHOG_APP_CONTEXT!.persisted_feature_flags?.includes(
-        FEATURE_FLAGS.POSTHOG_3000
-    )
-    const desiredFeatureFlagState = theme !== 'legacy'
-
-    if (actualFeatureFlagState !== desiredFeatureFlagState) {
-        const currentFlags = window.POSTHOG_APP_CONTEXT!.persisted_feature_flags || []
-        if (desiredFeatureFlagState) {
-            window.POSTHOG_APP_CONTEXT!.persisted_feature_flags = [...currentFlags, FEATURE_FLAGS.POSTHOG_3000]
-        } else {
-            window.POSTHOG_APP_CONTEXT!.persisted_feature_flags = currentFlags.filter(
-                (f) => f !== FEATURE_FLAGS.POSTHOG_3000
-            )
-        }
+    // set the body class. unfortunately this doesn't work on the initial render,
+    // meaning we need to toggle the theme one time for it to work. won't fix
+    // this, since we're removing the body class soon enough.
+    if (!document.body.classList.contains('posthog-3000')) {
+        document.body.classList.add('posthog-3000')
     }
 
     // set the theme

.storybook/preview.tsx

@@ -114,11 +114,10 @@ const preview: Preview = {
     globalTypes: {
         theme: {
             description: '',
-            defaultValue: 'legacy',
+            defaultValue: 'light',
             toolbar: {
                 title: 'Theme',
                 items: [
-                    { value: 'legacy', icon: 'faceneutral', title: 'Legacy' },
                     { value: 'light', icon: 'sun', title: 'Light' },
                     { value: 'dark', icon: 'moon', title: 'Dark' },
                 ],

.storybook/storybook.scss

@@ -4,16 +4,13 @@
     .ant-modal-wrap {
         z-index: 1050 !important;
     }
+
     .ant-select-dropdown,
     .ant-picker-dropdown {
         z-index: 1060 !important;
     }
+
     .ant-tooltip {
         z-index: 1060 !important;
     }
 }
-
-// allow taking screenshots of a scene's main content without overlapping top bar
-.TopBar {
-    position: relative !important;
-}