Merge remote-tracking branch 'upstream/master' into feat/move-hub

Author: timfish

CHANGELOG.md

@@ -4,6 +4,14 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.14.1
+
+- fix(nextjs): Handle CJS API route exports (#5865)
+- fix(node): Only set `DeviceContext.boot_time` if `os.uptime()` is valid (#5859)
+- fix(tracing): Warn if `resolvers` is not defined in `ApolloServer` config (#5850)
+- fix(utils): Normalize when serializing envelope (#5851)
+- ref(react): Improve React Router v6 error message (#5853)
+
 ## 7.14.0
 
 - feat(nextjs): Add status to data-fetcher spans (#5777)

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "7.14.0",
+  "version": "7.14.1",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "7.14.0",
+  "version": "7.14.1",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "7.14.0",
-    "@sentry/types": "7.14.0",
-    "@sentry/utils": "7.14.0",
+    "@sentry/browser": "7.14.1",
+    "@sentry/types": "7.14.1",
+    "@sentry/utils": "7.14.1",
     "tslib": "^2.0.0"
   },
   "devDependencies": {

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "7.14.0",
+  "version": "7.14.1",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "7.14.0",
-    "@sentry/types": "7.14.0",
-    "@sentry/utils": "7.14.0",
+    "@sentry/core": "7.14.1",
+    "@sentry/types": "7.14.1",
+    "@sentry/utils": "7.14.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "7.14.0",
+  "version": "7.14.1",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "7.14.0",
-    "@sentry/utils": "7.14.0",
+    "@sentry/types": "7.14.1",
+    "@sentry/utils": "7.14.1",
     "tslib": "^1.9.3"
   },
   "scripts": {

packages/core/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = '7.14.0';
+export const SDK_VERSION = '7.14.1';

packages/e2e-tests/README.md

@@ -40,12 +40,6 @@ cat > test-applications/my-new-test-application/.npmrc << EOF
 @sentry-internal:registry=http://localhost:4873
 EOF
 
-# Add a gitignore that ignores lockfiles
-cat > test-applications/my-new-test-application/.gitignore << EOF
-yarn.lock
-package-lock.json
-EOF
-
 # Add a test recipe file to the test application
 touch test-applications/my-new-test-application/test-recipe.json
 ```
@@ -56,7 +50,7 @@ To get you started with the recipe, you can copy the following into `test-recipe
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "My New Test Application",
-  "buildCommand": "yarn install --no-lockfile",
+  "buildCommand": "yarn install --pure-lockfile",
   "tests": [
     {
       "testName": "My new test",
@@ -71,7 +65,9 @@ The `test-recipe.json` files follow a schema (`e2e-tests/test-recipe-schema.json
 fields:
 
 - The `buildCommand` command runs only once before any of the tests and is supposed to build the test application. If
-  this command returns a non-zero exit code, it counts as a failed test and the test application's tests are not run.
+  this command returns a non-zero exit code, it counts as a failed test and the test application's tests are not run. In
+  the example above, we use the `--pure-lockfile` flag to install depencies without modifiying the lockfile so that
+  there aren't any changes in the git worktree after running the tests.
 - The `testCommand` command is supposed to run tests on the test application. If the configured command returns a
   non-zero exit code, it counts as a failed test.
 - A test timeout can be configured via `timeoutSeconds`, it defaults to `60`.

packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "7.14.0",
+  "version": "7.14.1",
   "license": "MIT",
   "engines": {
     "node": ">=10"

packages/e2e-tests/test-applications/create-react-app/.gitignore

@@ -23,4 +23,3 @@ yarn-debug.log*
 yarn-error.log*
 
 !*.d.ts
-yarn.lock

packages/e2e-tests/test-applications/create-react-app/test-recipe.json

@@ -1,6 +1,6 @@
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "create-react-app",
-  "buildCommand": "yarn install && yarn build",
+  "buildCommand": "yarn install --pure-lockfile && yarn build",
   "tests": []
 }