Skip to content

Commit df42f71

Browse files
authored
Merge branch 'develop' into nh/automatic-function-middleware-instrumentation
2 parents e7f8e23 + 8b2aff0 commit df42f71

File tree

149 files changed

+5072
-3629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+5072
-3629
lines changed
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
name: add-cdn-bundle
3+
description: Create a new CDN bundle for the browser package with specified features
4+
argument-hint: <feature-combo> (e.g., replay.logs.metrics, tracing.logs, tracing.replay.feedback.logs.metrics)
5+
---
6+
7+
# Add CDN Bundle Skill
8+
9+
This skill creates a new CDN bundle for the browser package that includes a specific combination of features.
10+
11+
## Input
12+
13+
The user provides a feature combination using dot notation:
14+
15+
- `logs.metrics` - Bundle with logs and metrics
16+
- `replay.logs.metrics` - Bundle with replay, logs, and metrics
17+
- `tracing.replay.logs` - Bundle with tracing, replay, and logs
18+
- `tracing.replay.feedback.logs.metrics` - Full featured bundle
19+
20+
**Feature order in bundle names:** `tracing``replay``feedback``logs``metrics`
21+
22+
## Instructions
23+
24+
Follow the detailed guide at [docs/adding-cdn-bundle.md](../../../docs/adding-cdn-bundle.md) to create the bundle.
25+
26+
### Quick Reference - Naming Conventions
27+
28+
Given a feature combination, derive these variants:
29+
30+
| Placeholder | Example (`replay.logs.metrics`) |
31+
| ------------------------------- | ------------------------------- |
32+
| `{FEATURE_COMBO}` | `replay.logs.metrics` |
33+
| `{feature_combo}` | `replay_logs_metrics` |
34+
| `{featureCombo}` | `replayLogsMetrics` |
35+
| `{Human Readable Features}` | `Replay, Logs, Metrics` |
36+
| `{Human Readable Feature List}` | `Replay, Logs, and Metrics` |
37+
38+
### Quick Reference - Files to Create/Modify
39+
40+
1. **Create** `packages/browser/src/index.bundle.{FEATURE_COMBO}.ts`
41+
2. **Create** `packages/browser/test/index.bundle.{FEATURE_COMBO}.test.ts`
42+
3. **Modify** `packages/browser/rollup.bundle.config.mjs`
43+
4. **Modify** `.size-limit.js`
44+
5. **Modify** `dev-packages/browser-integration-tests/package.json`
45+
6. **Modify** `dev-packages/browser-integration-tests/utils/generatePlugin.ts`
46+
7. **Modify** `.github/workflows/build.yml`
47+
48+
### Verification Steps
49+
50+
After making changes:
51+
52+
```bash
53+
yarn lint
54+
cd packages/browser && yarn build:dev
55+
cd packages/browser && yarn test
56+
```

.cursor/commands/add_cdn_bundle.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Add CDN Bundle for `{FEATURE_COMBO}`
2+
3+
Create a new CDN bundle for the browser package that includes `{FEATURE_COMBO}` (e.g., `replay.logs.metrics`, `tracing.logs`, etc.).
4+
5+
## Instructions
6+
7+
Follow the detailed guide at [docs/adding-cdn-bundle.md](../../docs/adding-cdn-bundle.md) to create the bundle.
8+
9+
## Quick Reference - Naming Conventions
10+
11+
| Placeholder | Example (`replay.logs.metrics`) |
12+
| ------------------------------- | ------------------------------- |
13+
| `{FEATURE_COMBO}` | `replay.logs.metrics` |
14+
| `{feature_combo}` | `replay_logs_metrics` |
15+
| `{featureCombo}` | `replayLogsMetrics` |
16+
| `{Human Readable Features}` | `Replay, Logs, Metrics` |
17+
| `{Human Readable Feature List}` | `Replay, Logs, and Metrics` |
18+
19+
## Quick Reference - Files to Create/Modify
20+
21+
1. **Create** `packages/browser/src/index.bundle.{FEATURE_COMBO}.ts`
22+
2. **Create** `packages/browser/test/index.bundle.{FEATURE_COMBO}.test.ts`
23+
3. **Modify** `packages/browser/rollup.bundle.config.mjs`
24+
4. **Modify** `.size-limit.js`
25+
5. **Modify** `dev-packages/browser-integration-tests/package.json`
26+
6. **Modify** `dev-packages/browser-integration-tests/utils/generatePlugin.ts`
27+
7. **Modify** `.github/workflows/build.yml`
28+
29+
## Verification Steps
30+
31+
After making changes:
32+
33+
1. Run `yarn lint` to check for linting issues
34+
2. Run `cd packages/browser && yarn build:dev` to verify TypeScript compilation
35+
3. Run `cd packages/browser && yarn test` to run the unit tests

.github/dependabot.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ updates:
1212
directory: '/'
1313
schedule:
1414
interval: 'weekly'
15-
allow:
16-
- dependency-name: '@sentry/*'
17-
- dependency-name: '@playwright/test'
18-
- dependency-name: '@opentelemetry/*'
1915
ignore:
2016
- dependency-name: '@opentelemetry/instrumentation'
2117
- dependency-name: '@opentelemetry/instrumentation-*'
18+
- dependency-name: 'typescript'
2219
groups:
2320
opentelemetry:
2421
patterns:
2522
- '@opentelemetry/*'
23+
remix:
24+
patterns:
25+
- '@remix-run/*'
2626
versioning-strategy: increase
2727
commit-message:
2828
prefix: feat
29-
prefix-development: feat
29+
prefix-development: chore
3030
include: scope
3131
exclude-paths:
32-
- 'dev-packages/e2e-tests/test-applications/'
32+
- 'dev-packages/e2e-tests/test-applications/**'

.github/workflows/build.yml

Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,6 @@ jobs:
175175
'nx-never-restore'}}
176176

177177
- name: Build packages
178-
# Set the CODECOV_TOKEN for Bundle Analysis
179-
env:
180-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
181178
run: yarn build
182179

183180
- name: Upload build artifacts
@@ -431,18 +428,12 @@ jobs:
431428
run: yarn test:ci:browser
432429
if: github.event_name != 'pull_request'
433430

434-
- name: Compute test coverage
435-
uses: codecov/codecov-action@v5
436-
with:
437-
token: ${{ secrets.CODECOV_TOKEN }}
438-
439-
- name: Upload test results to Codecov
431+
- name: Parse and Upload Coverage
440432
if: cancelled() == false
441433
continue-on-error: true
442-
uses: codecov/test-results-action@v1
434+
uses: getsentry/codecov-action@main
443435
with:
444-
files: packages/**/*.junit.xml
445-
token: ${{ secrets.CODECOV_TOKEN }}
436+
token: ${{ secrets.GITHUB_TOKEN }}
446437

447438
job_bun_unit_tests:
448439
name: Bun Unit Tests
@@ -538,18 +529,12 @@ jobs:
538529
env:
539530
NODE_VERSION: ${{ matrix.node }}
540531

541-
- name: Compute test coverage
542-
uses: codecov/codecov-action@v5
543-
with:
544-
token: ${{ secrets.CODECOV_TOKEN }}
545-
546-
- name: Upload test results to Codecov
532+
- name: Parse and Upload Coverage
547533
if: cancelled() == false
548534
continue-on-error: true
549-
uses: codecov/test-results-action@v1
535+
uses: getsentry/codecov-action@main
550536
with:
551-
files: packages/**/*.junit.xml
552-
token: ${{ secrets.CODECOV_TOKEN }}
537+
token: ${{ secrets.GITHUB_TOKEN }}
553538

554539
job_browser_playwright_tests:
555540
name:
@@ -566,21 +551,24 @@ jobs:
566551
- esm
567552
- bundle
568553
- bundle_min
554+
- bundle_logs_metrics
569555
- bundle_replay
556+
- bundle_replay_logs_metrics
570557
- bundle_tracing
571558
- bundle_tracing_logs_metrics
572559
- bundle_tracing_replay
560+
- bundle_tracing_replay_logs_metrics
573561
- bundle_tracing_replay_feedback
574-
- bundle_tracing_replay_feedback_min
575562
- bundle_tracing_replay_feedback_logs_metrics
563+
- bundle_tracing_replay_feedback_logs_metrics_min
576564
project:
577565
- chromium
578566
include:
579567
# Only check all projects for full bundle
580568
# We also shard the tests as they take the longest
581-
- bundle: bundle_tracing_replay_feedback_min
569+
- bundle: bundle_tracing_replay_feedback_logs_metrics_min
582570
project: 'webkit'
583-
- bundle: bundle_tracing_replay_feedback_min
571+
- bundle: bundle_tracing_replay_feedback_logs_metrics_min
584572
project: 'firefox'
585573
- bundle: esm
586574
project: chromium
@@ -641,13 +629,13 @@ jobs:
641629
overwrite: true
642630
retention-days: 7
643631

644-
- name: Upload test results to Codecov
632+
- name: Parse and Upload Coverage
645633
if: cancelled() == false
646634
continue-on-error: true
647-
uses: codecov/test-results-action@v1
635+
uses: getsentry/codecov-action@main
648636
with:
637+
token: ${{ secrets.GITHUB_TOKEN }}
649638
directory: dev-packages/browser-integration-tests
650-
token: ${{ secrets.CODECOV_TOKEN }}
651639

652640
job_browser_loader_tests:
653641
name: PW ${{ matrix.bundle }} Tests
@@ -702,13 +690,13 @@ jobs:
702690
overwrite: true
703691
retention-days: 7
704692

705-
- name: Upload test results to Codecov
693+
- name: Parse and Upload Coverage
694+
uses: getsentry/codecov-action@main
706695
if: cancelled() == false
707696
continue-on-error: true
708-
uses: codecov/test-results-action@v1
709697
with:
698+
token: ${{ secrets.GITHUB_TOKEN }}
710699
directory: dev-packages/browser-integration-tests
711-
token: ${{ secrets.CODECOV_TOKEN }}
712700

713701
job_check_for_faulty_dts:
714702
name: Check for faulty .d.ts files
@@ -776,13 +764,13 @@ jobs:
776764
working-directory: dev-packages/node-integration-tests
777765
run: yarn test
778766

779-
- name: Upload test results to Codecov
767+
- name: Parse and Upload Coverage
780768
if: cancelled() == false
781769
continue-on-error: true
782-
uses: codecov/test-results-action@v1
770+
uses: getsentry/codecov-action@main
783771
with:
772+
token: ${{ secrets.GITHUB_TOKEN }}
784773
directory: dev-packages/node-integration-tests
785-
token: ${{ secrets.CODECOV_TOKEN }}
786774

787775
job_cloudflare_integration_tests:
788776
name: Cloudflare Integration Tests
@@ -843,13 +831,13 @@ jobs:
843831
cd packages/remix
844832
yarn test:integration:ci
845833
846-
- name: Upload test results to Codecov
834+
- name: Parse and Upload Coverage
847835
if: cancelled() == false
848836
continue-on-error: true
849-
uses: codecov/test-results-action@v1
837+
uses: getsentry/codecov-action@main
850838
with:
851839
directory: packages/remix
852-
token: ${{ secrets.CODECOV_TOKEN }}
840+
token: ${{ secrets.GITHUB_TOKEN }}
853841

854842
job_e2e_prepare:
855843
name: Prepare E2E tests
@@ -1034,13 +1022,13 @@ jobs:
10341022
retention-days: 7
10351023
if-no-files-found: ignore
10361024

1037-
- name: Upload test results to Codecov
1025+
- name: Parse and Upload Coverage
10381026
if: cancelled() == false
10391027
continue-on-error: true
1040-
uses: codecov/test-results-action@v1
1028+
uses: getsentry/codecov-action@main
10411029
with:
10421030
directory: dev-packages/e2e-tests
1043-
token: ${{ secrets.CODECOV_TOKEN }}
1031+
token: ${{ secrets.GITHUB_TOKEN }}
10441032

10451033
# - We skip optional tests on release branches
10461034
job_optional_e2e_tests:

.github/workflows/external-contributors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737

3838
- name: Generate GitHub App token
3939
id: app-token
40-
uses: actions/create-github-app-token@v1
40+
uses: actions/create-github-app-token@v2
4141
with:
4242
app-id: ${{ vars.GITFLOW_APP_ID }}
4343
private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}
4444

4545
- name: Create PR with changes
46-
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
46+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
4747
with:
4848
token: ${{ steps.app-token.outputs.token }}
4949
commit-message: 'chore: Add external contributor to CHANGELOG.md'

.github/workflows/gitflow-sync-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Generate GitHub App token
2929
id: app-token
30-
uses: actions/create-github-app-token@v1
30+
uses: actions/create-github-app-token@v2
3131
with:
3232
app-id: ${{ vars.GITFLOW_APP_ID }}
3333
private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ packages/gatsby/gatsby-node.d.ts
6464

6565
#junit reports
6666
packages/**/*.junit.xml
67+
68+
# Local Claude Code settings that should not be committed
69+
.claude/settings.local.json

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ packages/browser/test/loader.js
22
packages/replay-worker/examples/worker.min.js
33
dev-packages/browser-integration-tests/fixtures
44
**/test.ts-snapshots/**
5+
6+
/.nx/cache
7+
/.nx/workspace-data

0 commit comments

Comments
 (0)