Skip to content

Commit

Permalink
Merge branch 'develop' into fn/trace
Browse files Browse the repository at this point in the history
  • Loading branch information
mydea committed Jan 3, 2024
2 parents d2ee9e0 + 35205b4 commit b3e0cc4
Show file tree
Hide file tree
Showing 1,124 changed files with 660 additions and 505 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {
},
},
{
files: ['scenarios/**', 'packages/rollup-utils/**'],
files: ['scenarios/**', 'dev-packages/rollup-utils/**'],
parserOptions: {
sourceType: 'module',
},
Expand Down
27 changes: 14 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ env:
CACHED_DEPENDENCY_PATHS: |
${{ github.workspace }}/node_modules
${{ github.workspace }}/packages/*/node_modules
${{ github.workspace }}/dev-packages/*/node_modules
~/.cache/ms-playwright/
~/.cache/mongodb-binaries/
Expand Down Expand Up @@ -102,7 +103,7 @@ jobs:
browser_integration:
- *shared
- *browser
- 'packages/browser-integration-tests/**'
- 'dev-packages/browser-integration-tests/**'
ember:
- *shared
- *browser
Expand All @@ -122,7 +123,7 @@ jobs:
node:
- *shared
- 'packages/node/**'
- 'packages/node-integration-tests/**'
- 'dev-packages/node-integration-tests/**'
deno:
- *shared
- *browser
Expand Down Expand Up @@ -601,7 +602,7 @@ jobs:
env:
PW_BUNDLE: ${{ matrix.bundle }}
run: |
cd packages/browser-integration-tests
cd dev-packages/browser-integration-tests
yarn test:ci
job_browser_loader_tests:
Expand Down Expand Up @@ -658,7 +659,7 @@ jobs:
env:
PW_BUNDLE: ${{ matrix.bundle }}
run: |
cd packages/browser-integration-tests
cd dev-packages/browser-integration-tests
yarn test:loader
job_browser_integration_tests:
Expand Down Expand Up @@ -762,7 +763,7 @@ jobs:
env:
NODE_VERSION: ${{ matrix.node }}
run: |
cd packages/node-integration-tests
cd dev-packages/node-integration-tests
yarn test
job_remix_integration_tests:
Expand Down Expand Up @@ -906,7 +907,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version-file: 'packages/e2e-tests/package.json'
node-version-file: 'dev-packages/e2e-tests/package.json'
- name: Restore caches
uses: ./.github/actions/restore-cache
env:
Expand All @@ -921,25 +922,25 @@ jobs:
- name: Get node version
id: versions
run: |
echo "echo node=$(jq -r '.volta.node' packages/e2e-tests/package.json)" >> $GITHUB_OUTPUT
echo "echo node=$(jq -r '.volta.node' dev-packages/e2e-tests/package.json)" >> $GITHUB_OUTPUT
- name: Validate Verdaccio
run: yarn test:validate
working-directory: packages/e2e-tests
working-directory: dev-packages/e2e-tests

- name: Prepare Verdaccio
run: yarn test:prepare
working-directory: packages/e2e-tests
working-directory: dev-packages/e2e-tests
env:
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}

- name: Build E2E app
working-directory: packages/e2e-tests/test-applications/${{ matrix.test-application }}
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
timeout-minutes: 5
run: yarn ${{ matrix.build-command || 'test:build' }}

- name: Run E2E test
working-directory: packages/e2e-tests/test-applications/${{ matrix.test-application }}
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
timeout-minutes: 5
run: yarn test:assert

Expand Down Expand Up @@ -996,12 +997,12 @@ jobs:

- name: Collect
run: yarn ci:collect
working-directory: packages/overhead-metrics
working-directory: dev-packages/overhead-metrics

- name: Process
id: process
run: yarn ci:process
working-directory: packages/overhead-metrics
working-directory: dev-packages/overhead-metrics
# Don't run on forks - the PR comment cannot be added.
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,21 +115,21 @@ jobs:
- name: Validate Verdaccio
run: yarn test:validate
working-directory: packages/e2e-tests
working-directory: dev-packages/e2e-tests

- name: Prepare Verdaccio
run: yarn test:prepare
working-directory: packages/e2e-tests
working-directory: dev-packages/e2e-tests
env:
E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ steps.versions.outputs.node }}

- name: Build E2E app
working-directory: packages/e2e-tests/test-applications/${{ matrix.test-application }}
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
timeout-minutes: 5
run: yarn ${{ matrix.build-command }}

- name: Run E2E test
working-directory: packages/e2e-tests/test-applications/${{ matrix.test-application }}
working-directory: dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}
timeout-minutes: 5
run: yarn test:assert

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/flaky-test-detector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
pull_request:
paths:
- 'packages/browser-integration-tests/suites/**'
- 'dev-packages/browser-integration-tests/suites/**'
branches-ignore:
- master

Expand Down Expand Up @@ -76,11 +76,11 @@ jobs:
with:
list-files: json
filters: |
browser_integration: packages/browser-integration-tests/suites/**
browser_integration: dev-packages/browser-integration-tests/suites/**
- name: Detect flaky tests
run: yarn test:detect-flaky
working-directory: packages/browser-integration-tests
working-directory: dev-packages/browser-integration-tests
env:
CHANGED_TEST_PATHS: ${{ steps.changed.outputs.browser_integration_files }}
TEST_RUN_COUNT: 'AUTO'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# dependencies
node_modules/
packages/*/package-lock.json
dev-packages/*/package-lock.json
package-lock.json

# build and test
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
packages/replay @getsentry/replay-sdk
packages/replay-worker @getsentry/replay-sdk
packages/browser-integration-tests/suites/replay @getsentry/replay-sdk
dev-packages/browser-integration-tests/suites/replay @getsentry/replay-sdk
14 changes: 9 additions & 5 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@
},
"nursery": {
"noUnusedImports": "error"
},
"performance": {
"all": true,
"noAccumulatingSpread": "error",
"noDelete": "off"
}
},
"ignore": [".vscode/*", "**/*.json"]
Expand All @@ -37,12 +42,11 @@
"indentWidth": 2,
"lineWidth": 120,
"ignore": [
"packages/browser-integration-tests/fixtures/loader.js",
"packages/browser-integration-tests/suites/**/*.json",
"packages/browser-integration-tests/loader-suites/**/*.js",
"packages/browser-integration-tests/suites/stacktraces/**/*.js",
"dev-packages/browser-integration-tests/fixtures/loader.js",
"dev-packages/browser-integration-tests/suites/**/*.json",
"dev-packages/browser-integration-tests/loader-suites/**/*.js",
"dev-packages/browser-integration-tests/suites/stacktraces/**/*.js",
"**/fixtures/*/*.json",
"packages/browser/examples/bundle.js",
"**/*.min.js"
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sentryTest(

// Ensure to register this _after_ getLocalTestUrl is called, as that also registers a default route for TEST_HOST
await page.route(`${TEST_HOST}/my-test-worker.js`, route => {
const filePath = path.resolve(__dirname, '../../../../replay-worker/examples/worker.min.js');
const filePath = path.resolve(__dirname, '../../../../../packages/replay-worker/examples/worker.min.js');

customCompressCalled++;

Expand Down
Loading

0 comments on commit b3e0cc4

Please sign in to comment.