merge'

.env.example

@@ -0,0 +1 @@
+MAPLIBRE_STYLE_URL=https://api.example.com/style.json?key=mykey

.eslintrc.js

@@ -18,6 +18,12 @@ module.exports = {
         react: {
             version: 'detect',
         },
+        'import/resolver': {
+            node: {
+                paths: ['eslint-rules'], // Add the directory containing your custom rules
+                extensions: ['.js', '.jsx', '.ts', '.tsx'], // Ensure ESLint resolves both JS and TS files
+            },
+        },
     },
     extends: [
         'eslint:recommended',
@@ -37,7 +43,7 @@ module.exports = {
         ecmaVersion: 2018,
         sourceType: 'module',
     },
-    plugins: ['prettier', 'react', 'cypress', '@typescript-eslint', 'no-only-tests', 'jest', 'compat'],
+    plugins: ['prettier', 'react', 'cypress', '@typescript-eslint', 'no-only-tests', 'jest', 'compat', 'posthog'],
     rules: {
         'no-console': ['error', { allow: ['warn', 'error'] }],
         'no-debugger': 'error',
@@ -91,7 +97,7 @@ module.exports = {
                 ],
             },
         ],
-        'react/forbid-elements': [
+        'posthog/warn-elements': [
             1,
             {
                 forbid: [
@@ -236,6 +242,16 @@ module.exports = {
                 '@typescript-eslint/no-var-requires': 'off',
             },
         },
+        {
+            files: 'eslint-rules/**/*',
+            extends: ['eslint:recommended'],
+            rules: {
+                '@typescript-eslint/no-var-requires': 'off',
+            },
+            env: {
+                node: true,
+            },
+        },
     ],
     reportUnusedDisableDirectives: true,
 }

.github/actions/build-n-cache-image/action.yml

@@ -4,15 +4,21 @@ inputs:
     actions-id-token-request-url:
         required: true
         description: "ACTIONS_ID_TOKEN_REQUEST_URL, issued by GitHub when permission 'id-token' is set to 'write'"
-    load:
+    save:
         required: false
         default: 'false'
-        description: Whether to load the image into local Docker after building it
+        description: Whether to save the image in the Depot ephemeral registry after building it
 
 outputs:
     tag:
         description: The tag of the image that was built
         value: ${{ steps.emit.outputs.tag }}
+    build-id:
+        description: The ID of the build
+        value: ${{ steps.build.outputs.build-id }}
+    unit-build-id:
+        description: The ID of the unit build
+        value: ${{ steps.build-unit.outputs.build-id }}
 
 runs:
     using: 'composite'
@@ -30,10 +36,10 @@ runs:
           uses: depot/build-push-action@v1
           with:
               buildx-fallback: false # buildx is so slow it's better to just fail
-              load: ${{ inputs.load }}
               tags: ${{ steps.emit.outputs.tag }}
               platforms: linux/amd64,linux/arm64
               build-args: COMMIT_HASH=${{ github.sha }}
+              save: ${{ inputs.save }}
           env:
               ACTIONS_ID_TOKEN_REQUEST_URL: ${{ inputs.actions-id-token-request-url }}
 
@@ -42,10 +48,10 @@ runs:
           uses: depot/build-push-action@v1
           with:
               buildx-fallback: false # buildx is so slow it's better to just fail
-              load: ${{ inputs.load }}
               file: production-unit.Dockerfile
               tags: ${{ steps.emit.outputs.tag }}
               platforms: linux/amd64
               build-args: COMMIT_HASH=${{ github.sha }}
+              save: ${{ inputs.save }}
           env:
               ACTIONS_ID_TOKEN_REQUEST_URL: ${{ inputs.actions-id-token-request-url }}

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

@@ -82,9 +82,9 @@ runs:
           # changed (requirements.txt has the already-published version)
           run: |
               sudo apt-get install libboost-all-dev unzip cmake curl uuid pkg-config
-              curl https://www.antlr.org/download/antlr4-cpp-runtime-4.13.0-source.zip --output antlr4-source.zip
+              curl https://www.antlr.org/download/antlr4-cpp-runtime-4.13.1-source.zip --output antlr4-source.zip
               # Check that the downloaded archive is the expected runtime - a security measure
-              anltr_known_md5sum="ff214b65fb02e150b4f515d7983bca92"
+              anltr_known_md5sum="c875c148991aacd043f733827644a76f"
               antlr_found_ms5sum="$(md5sum antlr4-source.zip | cut -d' ' -f1)"
               if [[ "$anltr_known_md5sum" != "$antlr_found_ms5sum" ]]; then
                   echo "Unexpected MD5 sum of antlr4-source.zip!"

.github/workflows/build-hogql-parser.yml

@@ -19,41 +19,47 @@ concurrency:
 jobs:
     check-version:
         name: Check version legitimacy
+        if: github.repository == 'PostHog/posthog'
         runs-on: ubuntu-22.04
         outputs:
-            parser_any_changed: ${{ steps.changed-files-yaml.outputs.parser_any_changed }}
+            parser-release-needed: ${{ steps.version.outputs.parser-release-needed }}
         steps:
             - uses: actions/checkout@v4
               with:
                   fetch-depth: 0 # Fetching all for comparison since last push (not just last commit)
 
             - name: Check if hogql_parser/ has changed
-              id: changed-files-yaml
+              id: changed-files
               uses: tj-actions/changed-files@v39
               with:
                   since_last_remote_commit: true
                   files_yaml: |
                       parser:
                       - hogql_parser/**
 
-            - name: Notify about release needed
-              if: steps.changed-files-yaml.outputs.parser_any_changed == 'true'
+            - name: Check if version was bumped
               shell: bash
+              id: version
               run: |
-                  published=$(curl -fSsl https://pypi.org/pypi/hogql-parser/json | jq -r '.info.version')
-                  local=$(python hogql_parser/setup.py --version)
-                  # TODO: Only comment if no comment alraedy exists for $local
-                  if [[ "$published" == "$local" ]]; then
-                    MESSAGE_BODY="It looks like the code of `hogql-parser` has changed since last push, but its version stayed the same at $local. 👀\nMake sure to resolve this in `hogql_parser/setup.py` before merging!"
-                    curl -s -u posthog-bot:${{ secrets.POSTHOG_BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} -X POST -d "{ \"body\": \"$MESSAGE_BODY\" }" "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
+                  parser_release_needed='false'
+                  if [[ ${{ steps.changed-files.outputs.parser_any_changed }} == 'true' ]]; then
+                    published=$(curl -fSsl https://pypi.org/pypi/hogql-parser/json | jq -r '.info.version')
+                    local=$(python hogql_parser/setup.py --version)
+                    if [[ "$published" != "$local" ]]; then
+                      parser_release_needed='true'
+                    else
+                      message_body="It looks like the code of \`hogql-parser\` has changed since last push, but its version stayed the same at $local. 👀\nMake sure to resolve this in \`hogql_parser/setup.py\` before merging!"
+                      curl -s -u posthog-bot:${{ secrets.POSTHOG_BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} -X POST -d "{ \"body\": \"$message_body\" }" "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
+                    fi
                   fi
+                  echo "::set-output name=parser-release-needed::$parser_release_needed"
 
     build-wheels:
         name: Build wheels on ${{ matrix.os }}
         needs: check-version
         runs-on: ${{ matrix.os }}
         timeout-minutes: 30
-        if: ${{ needs.check-version.outputs.parser_any_changed == 'true' }}
+        if: ${{ needs.check-version.outputs.parser-release-needed == 'true' }}
         strategy:
             matrix:
                 # As of October 2023, GitHub doesn't have ARM Actions runners… and ARM emulation is insanely slow

.github/workflows/ci-backend.yml

@@ -129,7 +129,7 @@ jobs:
 
             - name: Check formatting
               run: |
-                  black --exclude posthog/hogql/grammar --check .
+                  black --exclude posthog/hogql/grammar --check --diff .
 
             - name: Check static typing
               run: |
@@ -159,7 +159,7 @@ jobs:
               env:
                   # Installing a version of ANTLR compatible with what's in Homebrew as of October 2023 (version 4.13),
                   # as apt-get is quite out of date. The same version must be set in hogql_parser/pyproject.toml
-                  ANTLR_VERSION: '4.13.0'
+                  ANTLR_VERSION: '4.13.1'
 
     check-migrations:
         needs: changes

.github/workflows/ci-e2e.yml

@@ -76,15 +76,21 @@ jobs:
         permissions:
             contents: read
             id-token: write # allow issuing OIDC tokens for this workflow run
+        outputs:
+            tag: ${{ steps.build.outputs.tag }}
+            build-id: ${{ steps.build.outputs.build-id }}
+            unit-build-id: ${{ steps.build.outputs.unit-build-id }}
         steps:
             - name: Checkout
               if: needs.changes.outputs.shouldTriggerCypress == 'true'
               uses: actions/checkout@v3
-            - name: Get Docker image cached in Depot
+            - name: Build the Docker image with Depot
               if: needs.changes.outputs.shouldTriggerCypress == 'true'
               # Build the container image in preparation for the E2E tests
               uses: ./.github/actions/build-n-cache-image
+              id: build
               with:
+                  save: true
                   actions-id-token-request-url: ${{ env.ACTIONS_ID_TOKEN_REQUEST_URL }}
 
     cypress:
@@ -157,17 +163,20 @@ jobs:
               if: needs.changes.outputs.shouldTriggerCypress == 'true'
               run: ./bin/check_kafka_clickhouse_up
 
+            - name: Install Depot CLI
+              if: needs.changes.outputs.shouldTriggerCypress == 'true'
+              uses: depot/setup-action@v1
+
             - name: Get Docker image cached in Depot
               if: needs.changes.outputs.shouldTriggerCypress == 'true'
-              # We don't actually build the image here, because we use Depot, which acts as our cross-workflow cache.
-              # The build is first initiated in container-images-ci.yml, so by the time this runs, some layers already
-              # are cached, and the in-flight builds overall are deduplicated. According to Depot folks, this applies
-              # even if the builds _start_ concurrently! In short, only one build per commit push is ever executed.
-              uses: ./.github/actions/build-n-cache-image
-              id: docker-build
+              uses: depot/pull-action@v1
               with:
-                  actions-id-token-request-url: ${{ env.ACTIONS_ID_TOKEN_REQUEST_URL }}
-                  load: true
+                  # Use the production.Dockerfile image:
+                  # build-id: ${{ needs.container.outputs.build-id }}
+                  # Use the production-unit.Dockerfile image:
+                  build-id: ${{ needs.container.outputs.unit-build-id }}
+                  tags: |
+                      ${{ needs.container.outputs.tag }}
 
             - name: Write .env # This step intentionally has no if, so that GH always considers the action as having run
               run: |
@@ -199,8 +208,8 @@ jobs:
               run: |
                   mkdir -p /tmp/logs
 
-                  echo "Starting PostHog using the container image ${{ steps.docker-build.outputs.tag }}"
-                  DOCKER_RUN="docker run --rm --network host --add-host kafka:127.0.0.1 --env-file .env ${{ steps.docker-build.outputs.tag }}"
+                  echo "Starting PostHog using the container image ${{ needs.container.outputs.tag }}"
+                  DOCKER_RUN="docker run --rm --network host --add-host kafka:127.0.0.1 --env-file .env ${{ needs.container.outputs.tag }}"
 
                   $DOCKER_RUN ./bin/migrate
                   $DOCKER_RUN python manage.py setup_dev

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

@@ -197,6 +197,7 @@ jobs:
             CLICKHOUSE_DATABASE: 'posthog_test'
             KAFKA_HOSTS: 'kafka:9092'
             DATABASE_URL: 'postgres://posthog:posthog@localhost:5432/posthog'
+            RELOAD_PLUGIN_JITTER_MAX_MS: 0
             POE_EMBRACE_JOIN_FOR_TEAMS: ${{matrix.POE_EMBRACE_JOIN_FOR_TEAMS}}
 
         steps:

.storybook/decorators/withFeatureFlags.tsx

@@ -1,5 +1,5 @@
-import { useFeatureFlags } from '~/mocks/browser'
-import type { DecoratorFn } from '@storybook/react'
+import { setFeatureFlags } from '~/mocks/browser'
+import type { Decorator } from '@storybook/react'
 
 /** Global story decorator that allows setting feature flags.
  *
@@ -13,9 +13,9 @@ import type { DecoratorFn } from '@storybook/react'
  * } as ComponentMeta<typeof MyComponent>
  * ```
  */
-export const withFeatureFlags: DecoratorFn = (Story, { parameters }) => {
+export const withFeatureFlags: Decorator = (Story, { parameters }) => {
     if (parameters.featureFlags) {
-        useFeatureFlags(parameters.featureFlags)
+        setFeatureFlags(parameters.featureFlags)
     }
 
     return <Story />

.storybook/decorators/withKea/withKea.tsx

@@ -1,9 +1,9 @@
-import type { DecoratorFn } from '@storybook/react'
+import type { Decorator } from '@storybook/react'
 import { useAvailableFeatures } from '~/mocks/features'
 
 import { KeaStory } from './kea-story'
 
-export const withKea: DecoratorFn = (Story) => {
+export const withKea: Decorator = (Story) => {
     // Reset enabled enterprise features. Overwrite this line within your stories.
     useAvailableFeatures([])
     return (

.storybook/decorators/withMockDate.tsx

@@ -1,4 +1,4 @@
-import type { DecoratorFn } from '@storybook/react'
+import type { Decorator } from '@storybook/react'
 import MockDate from 'mockdate'
 
 /** Global story decorator that allows mocking of dates.
@@ -13,7 +13,7 @@ import MockDate from 'mockdate'
  * } as ComponentMeta<typeof MyComponent>
  * ```
  */
-export const withMockDate: DecoratorFn = (Story, { parameters }) => {
+export const withMockDate: Decorator = (Story, { parameters }) => {
     if (parameters.mockDate) {
         MockDate.set(parameters.mockDate)
     } else {

.storybook/decorators/withSnapshotsDisabled.tsx

@@ -1,9 +1,9 @@
-import { DecoratorFn } from '@storybook/react'
+import { Decorator } from '@storybook/react'
 import { inStorybookTestRunner } from 'lib/utils'
 
 /** Workaround for https://github.com/storybookjs/test-runner/issues/74 */
 // TODO: Smoke-test all the stories by removing this decorator, once all the stories pass
-export const withSnapshotsDisabled: DecoratorFn = (Story, { parameters }) => {
+export const withSnapshotsDisabled: Decorator = (Story, { parameters }) => {
     if (parameters?.testOptions?.skip && inStorybookTestRunner()) {
         return <>Disabled for Test Runner</>
     }

.storybook/decorators/withTheme.tsx

@@ -0,0 +1,44 @@
+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 theme
+    document.body.setAttribute('theme', theme === 'dark' ? 'dark' : 'light')
+
+    return <Story />
+}