Merge remote-tracking branch 'origin/master' into lforst-create-react-app-e2e-test

Author: Luca Forstner

CHANGELOG.md

@@ -4,6 +4,30 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.14.0
+
+- feat(nextjs): Add status to data-fetcher spans (#5777)
+- feat(nextjs): Auto-wrap API routes (#5778)
+- feat(nextjs): Promote option to automatically wrap data fetchers and API routes to non-experimental (#5793)
+- feat(utils): Modern implementation of `getGlobalObject` (#5809)
+- fix(gatsby): Include app-* entrypoints as they may include user source code (#5685)
+- fix(nextjs): Handle `pathname` being passed in object in `instrumentServer` (#5782)
+- fix(nextjs): Pass request in sampling context of data fetchers wrapper transaction (#5784)
+- fix(nextjs): Reverse order of checks for instrumenting server (#5828)
+- fix(nextjs): Rename `nextjs.data.server` ops (#5830) 
+- fix(remix): Do not skip error handling if tracing is not enabled. (#5811)
+- fix(remix): Use import() to get `react-router-dom` in Express wrapper. (#5810)
+- fix(tracing): Remove `connection.downlink` measurement (#5794)
+- ref(browser): Use configured transport as fallback for client reports (#5797)
+- ref(nextjs): Use flush code from `withSentry` in all backend wrappers (#5814)
+- ref(nextjs): Use integration to add request data to transaction events (#5703)
+- ref(nextjs): Use`RequestData` integration for errors (#5729)
+- ref(node): Move request data functions back to `@sentry/node` (#5759)
+- ref(tracing): Don't track transaction sampling method (#5775)
+- ref(types): Use intersections instead of extend in envelope types (#5788)
+
+Work in this release contributed by @Auspicus and @dagroe. Thank you for your contributions!
+
 ## 7.13.0
 
 - feat(browser): Use fetch `keepalive` flag (#5697)

lerna.json

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

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "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.13.0",
-    "@sentry/types": "7.13.0",
-    "@sentry/utils": "7.13.0",
+    "@sentry/browser": "7.14.0",
+    "@sentry/types": "7.14.0",
+    "@sentry/utils": "7.14.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "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.13.0",
-    "@sentry/types": "7.13.0",
-    "@sentry/utils": "7.13.0",
+    "@sentry/core": "7.14.0",
+    "@sentry/types": "7.14.0",
+    "@sentry/utils": "7.14.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "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,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "7.13.0",
-    "@sentry/types": "7.13.0",
-    "@sentry/utils": "7.13.0",
+    "@sentry/hub": "7.14.0",
+    "@sentry/types": "7.14.0",
+    "@sentry/utils": "7.14.0",
     "tslib": "^1.9.3"
   },
   "scripts": {

packages/core/src/version.ts

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

packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "7.13.0",
+  "version": "7.14.0",
   "license": "MIT",
   "engines": {
     "node": ">=10"
@@ -13,9 +13,10 @@
     "lint": "run-s lint:prettier lint:eslint",
     "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
     "lint:prettier": "prettier --config ../../.prettierrc.json --check .",
-    "test:e2e": "run-s test:validate-configuration test:run",
+    "test:e2e": "run-s test:validate-configuration test:test-app-setups test:run",
     "test:run": "ts-node run.ts",
-    "test:validate-configuration": "ts-node validate-verdaccio-configuration.ts"
+    "test:validate-configuration": "ts-node validate-verdaccio-configuration.ts",
+    "test:test-app-setups": "ts-node validate-test-app-setups.ts"
   },
   "devDependencies": {
     "@types/glob": "8.0.0",

packages/e2e-tests/run.ts

@@ -13,6 +13,7 @@ const PUBLISH_PACKAGES_DOCKER_IMAGE_NAME = 'publish-packages';
 
 const publishScriptNodeVersion = process.env.E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION;
 
+const DEFAULT_BUILD_TIMEOUT_SECONDS = 60;
 const DEFAULT_TEST_TIMEOUT_SECONDS = 60;
 
 // https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#grouping-log-lines
@@ -127,6 +128,7 @@ const recipeResults: RecipeResult[] = recipePaths.map(recipePath => {
   type Recipe = {
     testApplicationName: string;
     buildCommand?: string;
+    buildTimeoutSeconds?: number;
     tests: {
       testName: string;
       testCommand: string;
@@ -142,6 +144,7 @@ const recipeResults: RecipeResult[] = recipePaths.map(recipePath => {
       cwd: path.dirname(recipePath),
       encoding: 'utf8',
       shell: true, // needed so we can pass the build command in as whole without splitting it up into args
+      timeout: (recipe.buildTimeoutSeconds ?? DEFAULT_BUILD_TIMEOUT_SECONDS) * 1000,
     });
 
     // Prepends some text to the output build command's output so we can distinguish it from logging in this script

packages/e2e-tests/test-applications/temporary-app-1/.gitignore

@@ -0,0 +1 @@
+yarn.lock

packages/e2e-tests/test-applications/temporary-app-1/.npmrc

@@ -0,0 +1,2 @@
+@sentry:registry=http://localhost:4873
+@sentry-internal:registry=http://localhost:4873