Skip to content

Commit

Permalink
Merge branch 'master' into docker_dev_full_fix
Browse files Browse the repository at this point in the history
* master: (659 commits)
  fix: more tz/date fiddling to get this property thing working (#27423)
  fix(hogql): support virtual tables with lazy tables (#27404)
  fix: Removing target options for survey resets its value to remove validation error (#27139)
  chore: Use `actions/{download,upload}-artifact@v4` (#27413)
  feat(clickhouse): when HTTP pass ca_cert and verify  to pool manager (#27399)
  fix: typo in dashboard template configuration (#27417)
  fix(experiments): Force refresh when `start_date` is provided (#27396)
  feat(data-warehouse): Reset the pipeline source files when resync is selected on the frontend (#27402)
  chore(data-warehouse): Added SSL error as a non retryable error (#27395)
  chore(data-warehouse): Upgrade deltalake package (#27393)
  chore(data-warehouse): Kill the delta subprocess if need be (#27392)
  feat: Add P75 quantile (#27409)
  fix: property labels need to be known about in the backend but are defined in the front end (#27328)
  fix(editor-3001): show header on mobile for editor (#27373)
  chore: Enable web vitals capture (#27394)
  feat: Add human friendly comparison periods toggle (#27176)
  feat: promote data warehouse from taxonomic filter component (#27364)
  chore(experiments): Improve result state resetting (#27391)
  fix: Track records completed in heartbeat (#26686)
  fix(data-warehouse): Handle NaN values from SQL sources (#27360)
  ...
  • Loading branch information
fuziontech committed Jan 10, 2025
2 parents 9591841 + 8e215e3 commit 229dd09
Show file tree
Hide file tree
Showing 1,947 changed files with 96,230 additions and 35,903 deletions.
3 changes: 3 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
if [ -z "${FLOX_VERSION}" ]; then # Don't activate if already activated
flox activate
fi
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.eslintrc.js
jest.config.ts
node_modules
rust
livestream
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const globals = {
}

module.exports = {
ignorePatterns: ['node_modules', 'plugin-server'],
ignorePatterns: ['node_modules', 'plugin-server', 'rust', 'livestream'],
env,
settings: {
react: {
Expand Down
4 changes: 4 additions & 0 deletions .flox/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
run/
cache/
lib/
log/
4 changes: 4 additions & 0 deletions .flox/env.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "posthog",
"version": 1
}
70 changes: 70 additions & 0 deletions .flox/env/direnv-setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#!/bin/bash

if ! command -v direnv &> /dev/null; then
# Install direnv based on platform
if command -v brew &> /dev/null; then
echo "🔄 Installing direnv using 'brew install direnv'..."
HOMEBREW_NO_ENV_HINTS=1 brew install -q direnv
elif command -v apt &> /dev/null; then
echo "🔄 Installing direnv using 'apt install direnv'..."
sudo apt update && sudo apt install -yq direnv
elif command -v dnf &> /dev/null; then
echo "🔄 Installing direnv using 'dnf install direnv'..."
sudo dnf install -yq direnv
else
echo "🔄 Installing direnv using 'curl -sfL https://direnv.net/install.sh | bash'"
curl -sfL https://direnv.net/install.sh | bash
fi
echo "✅ Installed direnv"
else
echo "⏩ direnv already installed"
fi

# Determine shell and config file
shell_name=$(basename "$SHELL")
case "$shell_name" in
"bash")
config_file="$HOME/.bashrc"
hook_command='eval "$(direnv hook bash)"'
;;
"zsh")
config_file="$HOME/.zshrc"
hook_command='eval "$(direnv hook zsh)"'
;;
"fish")
config_file="$HOME/.config/fish/config.fish"
hook_command='direnv hook fish | source'
mkdir -p "$(dirname "$config_file")"
;;
"tcsh")
config_file="$HOME/.cshrc"
hook_command='eval `direnv hook tcsh`'
;;
*)
echo "Unsupported shell: $shell_name"
return 1
;;
esac

echo "🐚 Configuring your default shell, $SHELL, for direnv"

# Add hook to shell config if not already present
if ! grep -q "direnv hook" "$config_file" 2>/dev/null; then
echo -e "\n# Initialize direnv - added by PostHog's Flox activation hook (../posthog/.flox/env/manifest.toml)\n$hook_command" >> "$config_file"
echo "✅ Injected direnv hook into $config_file"
else
echo "⏩ direnv hook already present in $config_file"
fi

# Add hook to shell config if not already present
if ! grep -q "warn_timeout" "$HOME/.config/direnv/direnv.toml" 2>/dev/null; then
echo "[global]\nwarn_timeout = 0 # Ignore timeout from this issue: https://github.com/direnv/direnv/issues/1065 - added by PostHog's Flox activation hook (../posthog/.flox/env/manifest.toml)" >> "$HOME/.config/direnv/direnv.toml"
echo "✅ Configured ~/.config/direnv/direnv.toml"
else
echo "⏩ ~/.config/direnv/direnv.toml already configured"
fi

echo "💫 direnv is now active"

# Allow this directory's .envrc to be loaded
direnv allow
Loading

0 comments on commit 229dd09

Please sign in to comment.