Merge branch 'develop' into feat-replay-add-privacy-test

Author: billyvg

.github/workflows/auto-release.yml

@@ -0,0 +1,38 @@
+name: Gitflow - Auto prepare release
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+
+# This workflow tirggers a release when merging a branch with the pattern `prepare-release/VERSION` into master.
+jobs:
+  release:
+    runs-on: ubuntu-20.04
+    name: 'Prepare a new version'
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GH_RELEASE_PAT }}
+          fetch-depth: 0
+
+      # https://github.com/actions-ecosystem/action-regex-match
+      - uses: actions-ecosystem/action-regex-match@v2
+        id: version
+        with:
+          # Parse version from head branch
+          text: ${{ github.head_ref }}
+          # match: refs/heads/preprare-release/xx.xx.xx
+          regex: '^refs\/heads\/preprare-release\/(\d+\.\d+\.\d+)$'
+
+      - name: Prepare release
+        uses: getsentry/action-prepare-release@v1
+        if: github.event.pull_request.merged == true && steps.version.outputs.match != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
+        with:
+          version: ${{ steps.version.outputs.match != '' }}
+          force: false
+          merge_target: master

.github/workflows/build.yml

@@ -137,9 +137,12 @@ jobs:
       # Note: These next three have to be checked as strings ('true'/'false')!
       is_develop: ${{ github.ref == 'refs/heads/develop' }}
       is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
-      is_gitflow_sync: ${{ github.head_ref == 'refs/heads/develop' || github.head_ref == 'refs/heads/master' }}
-      has_gitflow_label: ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }}
-      force_skip_cache: ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }}
+      # When merging into master, or from master
+      is_gitflow_sync: ${{ github.head_ref == 'refs/heads/master' || github.ref == 'refs/heads/master' }}
+      has_gitflow_label:
+        ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' Gitflow ') }}
+      force_skip_cache:
+        ${{ github.event_name == 'pull_request' && contains(steps.pr-labels.outputs.labels, ' ci-skip-cache ') }}
 
   job_install_deps:
     name: Install Dependencies
@@ -162,17 +165,14 @@ jobs:
         id: compute_lockfile_hash
         run: echo "hash=${{ hashFiles('yarn.lock') }}" >> "$GITHUB_OUTPUT"
 
-      # When the `ci-skip-cache` label is added to a PR, we always want to skip dependency cache
       - name: Check dependency cache
         uses: actions/cache@v3
         id: cache_dependencies
-        if: needs.job_get_metadata.outputs.force_skip_cache == 'false'
         with:
           path: ${{ env.CACHED_DEPENDENCY_PATHS }}
           key: ${{ steps.compute_lockfile_hash.outputs.hash }}
 
       - name: Install dependencies
-        if: steps.cache_dependencies.outputs.cache-hit == '' || needs.job_get_metadata.outputs.force_skip_cache == 'true'
         run: yarn install --ignore-engines --frozen-lockfile
     outputs:
       dependency_cache_key: ${{ steps.compute_lockfile_hash.outputs.hash }}
@@ -215,7 +215,8 @@ jobs:
           path: node_modules/.cache/nx
           key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT }}
           # On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
-          restore-keys: ${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
+          restore-keys:
+            ${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
 
       - name: Build packages
         # Under normal circumstances, using the git SHA as a cache key, there shouldn't ever be a cache hit on the built
@@ -468,7 +469,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [10, 12, 14, 16, 18]
+        node: [10, 12, 14, 16, '18.13.0']
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
@@ -798,7 +799,9 @@ jobs:
     needs: [job_get_metadata, job_build]
     runs-on: ubuntu-20.04
     timeout-minutes: 30
-    if: contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') || needs.job_get_metadata.outputs.is_develop == 'true'
+    if: |
+      contains(github.event.pull_request.labels.*.name, 'ci-overhead-measurements') ||
+      needs.job_get_metadata.outputs.is_develop == 'true'
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3

.github/workflows/clear-cache.yml

@@ -0,0 +1,11 @@
+name: Clear all GHA caches
+on:
+  workflow_dispatch:
+
+jobs:
+  clear-caches:
+    name: Delete all caches
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clear caches
+        uses: easimon/wipe-cache@v2

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

@@ -4,6 +4,19 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.37.0
+
+- feat: Add source map debug ids (#7068)
+- feat(browser): Add IndexedDb offline transport store (#6983)
+- feat(nextjs): Add auto-wrapping for server components (#6953)
+- feat(replay): Improve rrweb error ignoring (#7087 & #7094)
+- feat(replay): Send client_report when replay sending fails (#7093)
+- fix(node): `LocalVariables`, Improve frame matching for ESM (#7049)
+- fix(node): Add lru cache to http integration span map (#7064)
+- fix(replay): Export Replay from Sentry namespace in full CDN bundle (#7119)
+
+Work in this release contributed by @JamesHenry. Thank you for your contribution!
+
 ## 7.36.0
 
 This Release re-introduces the accidentally removed but still deprecated `maskInputOptions` option for Session Replay.

CHANGELOG.md

@@ -6,20 +6,20 @@ _These steps are only relevant to Sentry employees when preparing and publishing
 **If you want to release a new SDK for the first time, be sure to follow the [New SDK Release Checklist](./new-sdk-release-checklist.md)**
 
 1. Determine what version will be released (we use [semver](https://semver.org)).
-2. Update [`CHANGELOG.md`](https://github.com/getsentry/sentry-javascript/edit/master/CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release. (See details below.)
-  a. Merging the Changelog PR will automatically trigger a sync from `develop` -> `master`
-3. Run the [Prepare Release](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) workflow.
-  a. Wait for this until the sync to `master` is completed.
-4. A new issue should appear in https://github.com/getsentry/publish/issues.
-5. Ask a member of the [@getsentry/releases team](https://github.com/orgs/getsentry/teams/releases/members) to approve the release.
+2. Create a branch `prepare-release/VERSION`, eg. `prepare-release/7.37.0`, off develop
+3. Update [`CHANGELOG.md`](https://github.com/getsentry/sentry-javascript/edit/master/CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release. (See details below.)
+4. Create a PR towards `master` branch
+5. When the PR is merged, it will automatically trigger the [Prepare Release](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) on master.
+6. A new issue should appear in https://github.com/getsentry/publish/issues.
+7. Ask a member of the [@getsentry/releases team](https://github.com/orgs/getsentry/teams/releases/members) to approve the release.
   a. Once the release is completed, a sync from `master` ->` develop` will be automatically triggered
 
 ## Updating the Changelog
 
-1. Create a new branch.
+1. Create a new branch `prepare-release/VERSION` off of `develop`, e.g. `prepare-release/7.37.1`.
 2. Run `yarn changelog` and copy everything
 3. Create a new section in the changelog, deciding based on the changes whether it should be a minor bump or a patch release.
 4. Paste in the logs you copied earlier.
 5. Delete any which aren't user-facing changes.
 7. If any of the PRs are from external contributors, include underneath the commits `Work in this release contributed by <list of external contributors' GitHub usernames>. Thank you for your contributions!`. If there's only one external PR, don't forget to remove the final `s`. If there are three or more, use an Oxford comma. (It's in the Sentry styleguide!)
-8. Commit, push, and open a PR with the title `meta: Update changelog for <fill in relevant version here>` against `develop` branch.
+8. Commit, push, and open a PR with the title `meta(changelog): Update changelog for VERSION` against `master` branch.

docs/publishing-a-release.md

@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "build": "node ./scripts/verify-packages-versions.js && lerna run build:types,build:transpile,build:bundle",
+    "build": "node ./scripts/verify-packages-versions.js && run-s build:types build:transpile build:bundle",
     "build:bundle": "lerna run build:bundle",
     "build:dev": "lerna run build:types,build:transpile",
     "build:dev:filter": "lerna run build:dev --include-filtered-dependencies --include-filtered-dependents --scope",
@@ -109,8 +109,7 @@
     "typescript": "3.8.3"
   },
   "resolutions": {
-    "**/agent-base": "5",
-    "@types/express-serve-static-core": "4.17.30"
+    "**/agent-base": "5"
   },
   "version": "0.0.0",
   "name": "sentry-javascript"