Skip to content

Commit 0eef5a5

Browse files
author
Luca Forstner
committed
Merge remote-tracking branch 'origin/master' into lforst-create-react-app-e2e-test
2 parents 6362b2e + 4c6c6f6 commit 0eef5a5

Some content is hidden

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

50 files changed

+322
-190
lines changed

‎CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,30 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7+
## 7.14.0
8+
9+
- feat(nextjs): Add status to data-fetcher spans (#5777)
10+
- feat(nextjs): Auto-wrap API routes (#5778)
11+
- feat(nextjs): Promote option to automatically wrap data fetchers and API routes to non-experimental (#5793)
12+
- feat(utils): Modern implementation of `getGlobalObject` (#5809)
13+
- fix(gatsby): Include app-* entrypoints as they may include user source code (#5685)
14+
- fix(nextjs): Handle `pathname` being passed in object in `instrumentServer` (#5782)
15+
- fix(nextjs): Pass request in sampling context of data fetchers wrapper transaction (#5784)
16+
- fix(nextjs): Reverse order of checks for instrumenting server (#5828)
17+
- fix(nextjs): Rename `nextjs.data.server` ops (#5830)
18+
- fix(remix): Do not skip error handling if tracing is not enabled. (#5811)
19+
- fix(remix): Use import() to get `react-router-dom` in Express wrapper. (#5810)
20+
- fix(tracing): Remove `connection.downlink` measurement (#5794)
21+
- ref(browser): Use configured transport as fallback for client reports (#5797)
22+
- ref(nextjs): Use flush code from `withSentry` in all backend wrappers (#5814)
23+
- ref(nextjs): Use integration to add request data to transaction events (#5703)
24+
- ref(nextjs): Use`RequestData` integration for errors (#5729)
25+
- ref(node): Move request data functions back to `@sentry/node` (#5759)
26+
- ref(tracing): Don't track transaction sampling method (#5775)
27+
- ref(types): Use intersections instead of extend in envelope types (#5788)
28+
29+
Work in this release contributed by @Auspicus and @dagroe. Thank you for your contributions!
30+
731
## 7.13.0
832

933
- feat(browser): Use fetch `keepalive` flag (#5697)

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "3.4.0",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"packages": "packages/*",
55
"npmClient": "yarn",
66
"useWorkspaces": true

‎packages/angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/angular",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Official Sentry SDK for Angular",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
2121
"rxjs": "^6.5.5 || ^7.x"
2222
},
2323
"dependencies": {
24-
"@sentry/browser": "7.13.0",
25-
"@sentry/types": "7.13.0",
26-
"@sentry/utils": "7.13.0",
24+
"@sentry/browser": "7.14.0",
25+
"@sentry/types": "7.14.0",
26+
"@sentry/utils": "7.14.0",
2727
"tslib": "^2.0.0"
2828
},
2929
"devDependencies": {

‎packages/browser/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/browser",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Official Sentry SDK for browsers",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,9 +16,9 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/core": "7.13.0",
20-
"@sentry/types": "7.13.0",
21-
"@sentry/utils": "7.13.0",
19+
"@sentry/core": "7.14.0",
20+
"@sentry/types": "7.14.0",
21+
"@sentry/utils": "7.14.0",
2222
"tslib": "^1.9.3"
2323
},
2424
"devDependencies": {

‎packages/core/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/core",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Base implementation for all Sentry JavaScript SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,9 +16,9 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/hub": "7.13.0",
20-
"@sentry/types": "7.13.0",
21-
"@sentry/utils": "7.13.0",
19+
"@sentry/hub": "7.14.0",
20+
"@sentry/types": "7.14.0",
21+
"@sentry/utils": "7.14.0",
2222
"tslib": "^1.9.3"
2323
},
2424
"scripts": {

‎packages/core/src/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const SDK_VERSION = '7.13.0';
1+
export const SDK_VERSION = '7.14.0';

‎packages/e2e-tests/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/e2e-tests",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"license": "MIT",
55
"engines": {
66
"node": ">=10"
@@ -13,9 +13,10 @@
1313
"lint": "run-s lint:prettier lint:eslint",
1414
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
1515
"lint:prettier": "prettier --config ../../.prettierrc.json --check .",
16-
"test:e2e": "run-s test:validate-configuration test:run",
16+
"test:e2e": "run-s test:validate-configuration test:test-app-setups test:run",
1717
"test:run": "ts-node run.ts",
18-
"test:validate-configuration": "ts-node validate-verdaccio-configuration.ts"
18+
"test:validate-configuration": "ts-node validate-verdaccio-configuration.ts",
19+
"test:test-app-setups": "ts-node validate-test-app-setups.ts"
1920
},
2021
"devDependencies": {
2122
"@types/glob": "8.0.0",

‎packages/e2e-tests/run.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const PUBLISH_PACKAGES_DOCKER_IMAGE_NAME = 'publish-packages';
1313

1414
const publishScriptNodeVersion = process.env.E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION;
1515

16+
const DEFAULT_BUILD_TIMEOUT_SECONDS = 60;
1617
const DEFAULT_TEST_TIMEOUT_SECONDS = 60;
1718

1819
// 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 => {
127128
type Recipe = {
128129
testApplicationName: string;
129130
buildCommand?: string;
131+
buildTimeoutSeconds?: number;
130132
tests: {
131133
testName: string;
132134
testCommand: string;
@@ -142,6 +144,7 @@ const recipeResults: RecipeResult[] = recipePaths.map(recipePath => {
142144
cwd: path.dirname(recipePath),
143145
encoding: 'utf8',
144146
shell: true, // needed so we can pass the build command in as whole without splitting it up into args
147+
timeout: (recipe.buildTimeoutSeconds ?? DEFAULT_BUILD_TIMEOUT_SECONDS) * 1000,
145148
});
146149

147150
// 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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
yarn.lock

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@sentry:registry=http://localhost:4873
2+
@sentry-internal:registry=http://localhost:4873

‎packages/e2e-tests/test-applications/temporary-app-1/good.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log('Happy :)');

‎packages/e2e-tests/test-applications/temporary-app-1/package.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "temporary-app-1",
3+
"version": "1.0.0",
4+
"private": true,
5+
"scripts": {
6+
"start:good": "node good.js"
7+
},
8+
"dependencies": {
9+
"@sentry/node": "*"
10+
}
11+
}

‎packages/e2e-tests/test-applications/temporary-app-1/test-recipe.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "../../test-recipe-schema.json",
3+
"testApplicationName": "Temporary Application 1",
4+
"buildCommand": "yarn install --no-lockfile",
5+
"tests": [
6+
{
7+
"testName": "Example Test (Should Succeed)",
8+
"testCommand": "yarn start:good"
9+
}
10+
]
11+
}

‎packages/e2e-tests/test-applications/temporary-app-2/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
yarn.lock

‎packages/e2e-tests/test-applications/temporary-app-2/.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@sentry:registry=http://localhost:4873
2+
@sentry-internal:registry=http://localhost:4873

‎packages/e2e-tests/test-applications/temporary-app-2/good.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log('Happy :)');

‎packages/e2e-tests/test-applications/temporary-app-2/package.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "temporary-app-2",
3+
"version": "1.0.0",
4+
"private": true,
5+
"scripts": {
6+
"start:good": "node good.js"
7+
},
8+
"dependencies": {
9+
"@sentry/node": "*"
10+
}
11+
}

‎packages/e2e-tests/test-applications/temporary-app-2/test-recipe.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "../../test-recipe-schema.json",
3+
"testApplicationName": "Temporary Application 2",
4+
"buildCommand": "yarn install --no-lockfile",
5+
"tests": [
6+
{
7+
"testName": "Example Test (Should Succeed)",
8+
"testCommand": "yarn start:good"
9+
}
10+
]
11+
}

‎packages/e2e-tests/test-recipe-schema.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
"type": "string",
1212
"description": "Command that is run to install dependencies and build the test application. This command is only run once before all tests. Working directory of the command is the root of the test application."
1313
},
14+
"buildTimeoutSeconds": {
15+
"type": "number",
16+
"description": "Timeout for the build command in seconds. Default: 60"
17+
},
1418
"tests": {
1519
"type": "array",
1620
"description": "Tests to run in this test application",

‎packages/e2e-tests/validate-test-app-setups.ts

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/* eslint-disable no-console */
2+
import * as fs from 'fs';
3+
import * as glob from 'glob';
4+
import * as path from 'path';
5+
6+
const testRecipePaths = glob.sync('test-applications/*/test-recipe.json', {
7+
cwd: __dirname,
8+
absolute: true,
9+
});
10+
11+
testRecipePaths.forEach(testRecipePath => {
12+
const testAppPath = path.dirname(testRecipePath);
13+
const npmrcPath = path.resolve(testAppPath, '.npmrc');
14+
15+
if (!fs.existsSync(npmrcPath)) {
16+
console.log(
17+
`No .npmrc found in test application "${testAppPath}". Please add a .npmrc to this test application that uses the fake test registry. (More info in packages/e2e-tests/README.md)`,
18+
);
19+
process.exit(1);
20+
}
21+
22+
const npmrcContents = fs.readFileSync(npmrcPath, 'utf-8');
23+
if (!npmrcContents.includes('http://localhost:4873')) {
24+
console.log(
25+
`.npmrc in test application "${testAppPath} doesn't contain a reference to the fake test registry at "http://localhost:4873". Please add a .npmrc to this test application that uses the fake test registry. (More info in packages/e2e-tests/README.md)`,
26+
);
27+
process.exit(1);
28+
}
29+
30+
const gitignorePath = path.resolve(testAppPath, '.gitignore');
31+
32+
if (!fs.existsSync(gitignorePath)) {
33+
console.log(
34+
`No .gitignore found in test application "${testAppPath}". Please add a .gitignore to this test application that ignores any kind of lockfiles. (More info in packages/e2e-tests/README.md)`,
35+
);
36+
process.exit(1);
37+
}
38+
39+
const gitignoreContents = fs.readFileSync(gitignorePath, 'utf-8');
40+
if (!gitignoreContents.includes('lock')) {
41+
console.log(
42+
`.gitignore in test application "${testAppPath} doesn't contain an entry for a lockfile. Please add a .gitignore to this test application that ignores any kind of lockfiles. (More info in packages/e2e-tests/README.md)`,
43+
);
44+
process.exit(1);
45+
}
46+
});

‎packages/ember/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/ember",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Official Sentry SDK for Ember.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -30,10 +30,10 @@
3030
},
3131
"dependencies": {
3232
"@embroider/macros": "1.8.3",
33-
"@sentry/browser": "7.13.0",
34-
"@sentry/tracing": "7.13.0",
35-
"@sentry/types": "7.13.0",
36-
"@sentry/utils": "7.13.0",
33+
"@sentry/browser": "7.14.0",
34+
"@sentry/tracing": "7.14.0",
35+
"@sentry/types": "7.14.0",
36+
"@sentry/utils": "7.14.0",
3737
"ember-auto-import": "~1.12.1 || ~2.2.0",
3838
"ember-cli-babel": "~7.26.6",
3939
"ember-cli-htmlbars": "^6.0.1",

‎packages/eslint-config-sdk/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/eslint-config-sdk",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Official Sentry SDK eslint config",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -19,8 +19,8 @@
1919
"access": "public"
2020
},
2121
"dependencies": {
22-
"@sentry-internal/eslint-plugin-sdk": "7.13.0",
23-
"@sentry-internal/typescript": "7.13.0",
22+
"@sentry-internal/eslint-plugin-sdk": "7.14.0",
23+
"@sentry-internal/typescript": "7.14.0",
2424
"@typescript-eslint/eslint-plugin": "^3.9.0",
2525
"@typescript-eslint/parser": "^3.9.0",
2626
"eslint-config-prettier": "^6.11.0",

‎packages/eslint-plugin-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/eslint-plugin-sdk",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Official Sentry SDK eslint plugin",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",

‎packages/gatsby/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/gatsby",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Official Sentry SDK for Gatsby.js",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -20,10 +20,10 @@
2020
"access": "public"
2121
},
2222
"dependencies": {
23-
"@sentry/react": "7.13.0",
24-
"@sentry/tracing": "7.13.0",
25-
"@sentry/types": "7.13.0",
26-
"@sentry/utils": "7.13.0",
23+
"@sentry/react": "7.14.0",
24+
"@sentry/tracing": "7.14.0",
25+
"@sentry/types": "7.14.0",
26+
"@sentry/utils": "7.14.0",
2727
"@sentry/webpack-plugin": "1.19.0"
2828
},
2929
"peerDependencies": {

‎packages/hub/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/hub",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Sentry hub which handles global state managment.",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
@@ -16,8 +16,8 @@
1616
"access": "public"
1717
},
1818
"dependencies": {
19-
"@sentry/types": "7.13.0",
20-
"@sentry/utils": "7.13.0",
19+
"@sentry/types": "7.14.0",
20+
"@sentry/utils": "7.14.0",
2121
"tslib": "^1.9.3"
2222
},
2323
"scripts": {

‎packages/integration-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {

‎packages/integrations/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry/integrations",
3-
"version": "7.13.0",
3+
"version": "7.14.0",
44
"description": "Pluggable integrations that can be used to enhance JS SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations",
@@ -16,8 +16,8 @@
1616
"module": "build/npm/esm/index.js",
1717
"types": "build/npm/types/index.d.ts",
1818
"dependencies": {
19-
"@sentry/types": "7.13.0",
20-
"@sentry/utils": "7.13.0",
19+
"@sentry/types": "7.14.0",
20+
"@sentry/utils": "7.14.0",
2121
"localforage": "^1.8.1",
2222
"tslib": "^1.9.3"
2323
},

0 commit comments

Comments
 (0)