Skip to content

Commit 7a097b4

Browse files
kamilogorekkamilogorek
authored
ref: Finishing touches before the 5.21.0 release (getsentry#2808)
* ref: Use ** glob instead of **/* * Fix ember 'any' lint warning and ignore test coverage * Ignore IE10 integration tests for now * Update TypeScript to 3.6.5 * Use @sentry-internal for ESLint config and plugin * Move typescript package to @sentry-internal * Add sdk name to eslint config and plugin * Last polishes
1 parent b262b10 commit 7a097b4

Some content is hidden

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

47 files changed

+474
-177
lines changed

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,5 @@ extensions for APM
9292
JavaScript SDKs with interfaces, type definitions and base classes.
9393
- [`@sentry/utils`](https://github.com/getsentry/sentry-javascript/tree/master/packages/utils): A set of helpers and
9494
utility functions useful for various SDKs.
95-
- [`@sentry/typescript`](https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript): Shared
96-
Typescript compiler and linter options.
9795
- [`@sentry/types`](https://github.com/getsentry/sentry-javascript/tree/master/packages/types): Types used in all
9896
packages.

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"packages/browser",
2424
"packages/core",
2525
"packages/ember",
26-
"packages/eslint-config-sentry-sdks",
27-
"packages/eslint-plugin-sentry-sdks",
26+
"packages/eslint-config-sdk",
27+
"packages/eslint-plugin-sdk",
2828
"packages/gatsby",
2929
"packages/hub",
3030
"packages/integrations",
@@ -61,7 +61,7 @@
6161
"size-limit": "^4.5.5",
6262
"ts-jest": "^24.0.2",
6363
"typedoc": "^0.14.2",
64-
"typescript": "3.4.5"
64+
"typescript": "3.6.5"
6565
},
6666
"resolutions": {
6767
"**/agent-base": "5"

‎packages/angular/.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module.exports = {
77
parserOptions: {
88
ecmaVersion: 2018,
99
},
10-
extends: ['sentry-sdks'],
11-
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
10+
extends: ['@sentry-internal/sdk'],
11+
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
1212
overrides: [
1313
{
1414
files: ['*.ts', '*.tsx', '*.d.ts'],

‎packages/angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"tslib": "^1.9.3"
2727
},
2828
"devDependencies": {
29-
"eslint-config-sentry-sdks": "5.20.1",
29+
"@sentry-internal/eslint-config-sdk": "5.20.1",
3030
"eslint": "7.6.0",
3131
"npm-run-all": "^4.1.2",
3232
"prettier": "1.17.0",
3333
"rimraf": "^2.6.3",
34-
"typescript": "3.4.5"
34+
"typescript": "3.6.5"
3535
},
3636
"scripts": {
3737
"build": "run-p build:es5 build:esm",

‎packages/apm/.eslintrc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module.exports = {
66
parserOptions: {
77
ecmaVersion: 2018,
88
},
9-
extends: ['sentry-sdks'],
10-
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
9+
extends: ['@sentry-internal/sdk'],
10+
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
1111
overrides: [
1212
{
1313
files: ['*.ts', '*.tsx', '*.d.ts'],
@@ -16,7 +16,7 @@ module.exports = {
1616
},
1717
},
1818
{
19-
files: ['test/**/*'],
19+
files: ['test/**'],
2020
rules: {
2121
'@typescript-eslint/no-explicit-any': 'off',
2222
'@typescript-eslint/no-non-null-assertion': 'off',

‎packages/apm/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"tslib": "^1.9.3"
2525
},
2626
"devDependencies": {
27-
"eslint-config-sentry-sdks": "5.20.1",
27+
"@sentry-internal/eslint-config-sdk": "5.20.1",
2828
"@types/express": "^4.17.1",
2929
"eslint": "7.6.0",
3030
"jest": "^24.7.1",
@@ -37,7 +37,7 @@
3737
"rollup-plugin-node-resolve": "^4.2.3",
3838
"rollup-plugin-terser": "^4.0.4",
3939
"rollup-plugin-typescript2": "^0.21.0",
40-
"typescript": "3.4.5"
40+
"typescript": "3.6.5"
4141
},
4242
"scripts": {
4343
"build": "run-p build:es5 build:esm build:bundle",

‎packages/browser/.eslintrc.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module.exports = {
77
parserOptions: {
88
ecmaVersion: 2018,
99
},
10-
extends: ['sentry-sdks'],
11-
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*', 'src/loader.js'],
10+
extends: ['@sentry-internal/sdk'],
11+
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**', 'coverage/**', 'src/loader.js'],
1212
overrides: [
1313
{
1414
files: ['*.ts', '*.tsx', '*.d.ts'],
@@ -17,7 +17,7 @@ module.exports = {
1717
},
1818
},
1919
{
20-
files: ['test/**/*'],
20+
files: ['test/**'],
2121
rules: {
2222
'jsdoc/require-jsdoc': 'off',
2323
'no-console': 'off',
@@ -28,7 +28,7 @@ module.exports = {
2828
},
2929
},
3030
{
31-
files: ['test/integration/**/*'],
31+
files: ['test/integration/**'],
3232
env: {
3333
mocha: true,
3434
},
@@ -37,7 +37,7 @@ module.exports = {
3737
},
3838
},
3939
{
40-
files: ['test/integration/common/**/*', 'test/integration/suites/**/*'],
40+
files: ['test/integration/common/**', 'test/integration/suites/**'],
4141
rules: {
4242
'no-unused-vars': 'off',
4343
},

‎packages/browser/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"devDependencies": {
2525
"@types/eslint": "^7.2.0",
2626
"@types/md5": "2.1.33",
27-
"eslint-config-sentry-sdks": "5.20.1",
27+
"@sentry-internal/eslint-config-sdk": "5.20.1",
2828
"eslint": "7.6.0",
2929
"btoa": "^1.2.1",
3030
"chai": "^4.1.2",
@@ -51,7 +51,7 @@
5151
"rollup-plugin-terser": "^4.0.4",
5252
"rollup-plugin-typescript2": "^0.21.0",
5353
"sinon": "^7.3.2",
54-
"typescript": "3.4.5",
54+
"typescript": "3.6.5",
5555
"webpack": "^4.30.0"
5656
},
5757
"scripts": {

‎packages/browser/test/integration/browsers.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,16 @@ module.exports = {
8383
real_mobile: true,
8484
browser_version: null,
8585
},
86-
bs_ie10: {
87-
base: "BrowserStack",
88-
browser: "IE",
89-
browser_version: "10.0",
90-
os: "Windows",
91-
os_version: "8",
92-
device: null,
93-
real_mobile: null,
94-
},
86+
// FIXME: Investigate why BrowserStack stopped running IE10 machine recently
87+
// bs_ie10: {
88+
// base: "BrowserStack",
89+
// browser: "IE",
90+
// browser_version: "10.0",
91+
// os: "Windows",
92+
// os_version: "8",
93+
// device: null,
94+
// real_mobile: null,
95+
// },
9596
bs_ie11: {
9697
base: "BrowserStack",
9798
browser: "IE",

‎packages/core/.eslintrc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module.exports = {
66
parserOptions: {
77
ecmaVersion: 2018,
88
},
9-
extends: ['sentry-sdks'],
10-
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
9+
extends: ['@sentry-internal/sdk'],
10+
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
1111
overrides: [
1212
{
1313
files: ['*.ts', '*.tsx', '*.d.ts'],
@@ -16,7 +16,7 @@ module.exports = {
1616
},
1717
},
1818
{
19-
files: ['test/**/*'],
19+
files: ['test/**'],
2020
rules: {
2121
'@typescript-eslint/no-explicit-any': 'off',
2222
'@typescript-eslint/no-non-null-assertion': 'off',

‎packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {
26-
"eslint-config-sentry-sdks": "5.20.1",
26+
"@sentry-internal/eslint-config-sdk": "5.20.1",
2727
"eslint": "7.6.0",
2828
"jest": "^24.7.1",
2929
"npm-run-all": "^4.1.2",
3030
"prettier": "1.17.0",
3131
"rimraf": "^2.6.3",
32-
"typescript": "3.4.5"
32+
"typescript": "3.6.5"
3333
},
3434
"scripts": {
3535
"build": "run-p build:es5 build:esm",

‎packages/ember/.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ module.exports = {
2121
rules: {},
2222
overrides: [
2323
{
24-
files: ['addon/**/*'],
25-
plugins: ['sentry-sdks'],
24+
files: ['addon/**'],
25+
plugins: ['@sentry-internal/eslint-plugin-sdk'],
2626
},
2727
// node files
2828
{

‎packages/ember/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@ember/optional-features": "^1.3.0",
4040
"@glimmer/component": "^1.0.0",
4141
"@glimmer/tracking": "^1.0.0",
42-
"eslint-config-sentry-sdks": "5.20.1",
42+
"@sentry-internal/eslint-config-sdk": "5.20.1",
4343
"@types/ember": "^3.16.0",
4444
"@types/ember-qunit": "^3.4.9",
4545
"@types/ember__test-helpers": "^1.7.0",
@@ -60,7 +60,7 @@
6060
"ember-qunit": "^4.6.0",
6161
"ember-resolver": "^8.0.0",
6262
"ember-sinon-qunit": "^5.0.0",
63-
"ember-source": "~3.19.0",
63+
"ember-source": "~3.12.0",
6464
"ember-source-channel-url": "^2.0.1",
6565
"ember-template-lint": "^2.9.1",
6666
"ember-test-selectors": "^4.1.0",
@@ -71,7 +71,7 @@
7171
"loader.js": "^4.7.0",
7272
"npm-run-all": "^4.1.5",
7373
"qunit-dom": "^1.2.0",
74-
"typescript": "3.4.5"
74+
"typescript": "3.6.5"
7575
},
7676
"engines": {
7777
"node": "10.* || >= 12"

‎packages/eslint-config-sentry-sdks/.npmignore renamed to ‎packages/eslint-config-sdk/.npmignore

File renamed without changes.

‎packages/eslint-config-sentry-sdks/LICENSE renamed to ‎packages/eslint-config-sdk/LICENSE

File renamed without changes.

‎packages/eslint-config-sentry-sdks/README.md renamed to ‎packages/eslint-config-sdk/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
# Official Sentry SDK eslint config
99

10-
[![npm version](https://img.shields.io/npm/v/@sentry/integrations.svg)](https://www.npmjs.com/package/@sentry/integrations)
11-
[![npm dm](https://img.shields.io/npm/dm/@sentry/integrations.svg)](https://www.npmjs.com/package/@sentry/integrations)
12-
[![npm dt](https://img.shields.io/npm/dt/@sentry/integrations.svg)](https://www.npmjs.com/package/@sentry/integrations)
10+
[![npm version](https://img.shields.io/npm/v/@sentry-internal/eslint-config-sdk.svg)](https://www.npmjs.com/package/@sentry-internal/eslint-config-sdk)
11+
[![npm dm](https://img.shields.io/npm/dm/@sentry-internal/eslint-config-sdk.svg)](https://www.npmjs.com/package/@sentry-internal/eslint-config-sdk)
12+
[![npm dt](https://img.shields.io/npm/dt/@sentry-internal/eslint-config-sdk.svg)](https://www.npmjs.com/package/@sentry-internal/eslint-config-sdk)
1313
[![typedoc](https://img.shields.io/badge/docs-typedoc-blue.svg)](http://getsentry.github.io/sentry-javascript/)
1414

1515
## Links
@@ -19,16 +19,16 @@
1919

2020
## General
2121

22-
Install with `yarn add -D eslint-config-sentry-sdks`
22+
Install with `yarn add -D @sentry-internal/eslint-config-sdk`
2323

2424
## Configuration
2525

26-
Use `sentry-sdks` for base rules. Make sure to specify your tsconfig under `parserOptions.project` so that you can
26+
Use `@sentry-internal` for base rules. Make sure to specify your tsconfig under `parserOptions.project` so that you can
2727
correctly use the typescript rules. This configuration comes with
2828

2929
```json
3030
{
31-
"extends": ["@sentry"],
31+
"extends": ["@sentry-internal/sdk"],
3232
"overrides": [
3333
{
3434
"files": ["*.ts", "*.tsx", "*.d.ts"],

‎packages/eslint-config-sentry-sdks/package.json renamed to ‎packages/eslint-config-sdk/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"name": "eslint-config-sentry-sdks",
2+
"name": "@sentry-internal/eslint-config-sdk",
33
"version": "5.20.1",
44
"description": "Official Sentry SDK eslint config",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
6-
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sentry-sdks",
6+
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
77
"author": "Sentry",
88
"license": "MIT",
99
"keywords": [
@@ -19,8 +19,8 @@
1919
"access": "public"
2020
},
2121
"dependencies": {
22-
"eslint-plugin-sentry-sdks": "5.20.1",
23-
"@sentry/typescript": "5.20.1",
22+
"@sentry-internal/eslint-plugin-sdk": "5.20.1",
23+
"@sentry-internal/typescript": "5.20.1",
2424
"@typescript-eslint/eslint-plugin": "^3.9.0",
2525
"@typescript-eslint/parser": "^3.9.0",
2626
"eslint-config-prettier": "^6.11.0",
@@ -34,7 +34,7 @@
3434
},
3535
"devDependencies": {
3636
"eslint": "7.6.0",
37-
"typescript": "3.4.5"
37+
"typescript": "3.6.5"
3838
},
3939
"scripts": {
4040
"link:yarn": "yarn link",

‎packages/eslint-config-sentry-sdks/src/index.js renamed to ‎packages/eslint-config-sdk/src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
node: true,
55
},
66
extends: ['prettier', 'eslint:recommended', 'plugin:import/errors', 'plugin:import/warnings'],
7-
plugins: ['sentry-sdks', 'simple-import-sort'],
7+
plugins: ['@sentry-internal/eslint-plugin-sdk', 'simple-import-sort'],
88
overrides: [
99
{
1010
// Configuration for JavaScript files
@@ -101,7 +101,7 @@ module.exports = {
101101
files: ['src/**/*'],
102102
rules: {
103103
// We want to prevent async await usage in our files to prevent uncessary bundle size.
104-
'sentry-sdks/no-async-await': 'error',
104+
'@sentry-internal/sdk/no-async-await': 'error',
105105

106106
// JSDOC comments are required for classes and methods. As we have a public facing codebase, documentation,
107107
// even if it may seems excessive at times, is important to emphasize. Turned off in tests.

‎packages/eslint-plugin-sentry-sdks/.npmignore renamed to ‎packages/eslint-plugin-sdk/.npmignore

File renamed without changes.

‎packages/eslint-plugin-sentry-sdks/LICENSE renamed to ‎packages/eslint-plugin-sdk/LICENSE

File renamed without changes.

‎packages/eslint-plugin-sentry-sdks/package.json renamed to ‎packages/eslint-plugin-sdk/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"name": "eslint-plugin-sentry-sdks",
2+
"name": "@sentry-internal/eslint-plugin-sdk",
33
"version": "5.20.1",
44
"description": "Official Sentry SDK eslint plugin",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
6-
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sentry-sdks",
6+
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
77
"author": "Sentry",
88
"license": "MIT",
99
"keywords": [
@@ -23,7 +23,7 @@
2323
},
2424
"devDependencies": {
2525
"prettier": "1.17.0",
26-
"typescript": "3.4.5",
26+
"typescript": "3.6.5",
2727
"mocha": "^6.2.0"
2828
},
2929
"scripts": {

‎packages/eslint-plugin-sentry-sdks/src/index.js renamed to ‎packages/eslint-plugin-sdk/src/index.js

File renamed without changes.

‎packages/eslint-plugin-sentry-sdks/src/rules/no-async-await.js renamed to ‎packages/eslint-plugin-sdk/src/rules/no-async-await.js

File renamed without changes.

‎packages/eslint-plugin-sentry-sdks/test/lib/rules/no-async-await.js renamed to ‎packages/eslint-plugin-sdk/test/lib/rules/no-async-await.js

File renamed without changes.

‎packages/gatsby/.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ module.exports = {
88
parserOptions: {
99
ecmaVersion: 2018,
1010
},
11-
extends: ['sentry-sdks'],
12-
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
11+
extends: ['@sentry-internal/sdk'],
12+
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
1313
overrides: [
1414
{
1515
files: ['*.ts', '*.tsx', '*.d.ts'],

‎packages/gatsby/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
"gatsby": "*"
3434
},
3535
"devDependencies": {
36-
"eslint-config-sentry-sdks": "5.20.1",
36+
"@sentry-internal/eslint-config-sdk": "5.20.1",
3737
"eslint": "7.6.0",
3838
"jest": "^24.7.1",
3939
"npm-run-all": "^4.1.2",
4040
"prettier": "1.17.0",
4141
"rimraf": "^2.6.3",
42-
"typescript": "3.4.5"
42+
"typescript": "3.6.5"
4343
},
4444
"scripts": {
4545
"build": "run-p build:es5 build:esm",

‎packages/hub/.eslintrc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ module.exports = {
66
parserOptions: {
77
ecmaVersion: 2018,
88
},
9-
extends: ['sentry-sdks'],
10-
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
9+
extends: ['@sentry-internal/sdk'],
10+
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
1111
overrides: [
1212
{
1313
files: ['*.ts', '*.tsx', '*.d.ts'],
@@ -16,7 +16,7 @@ module.exports = {
1616
},
1717
},
1818
{
19-
files: ['test/**/*'],
19+
files: ['test/**'],
2020
rules: {
2121
'@typescript-eslint/no-explicit-any': 'off',
2222
'@typescript-eslint/no-non-null-assertion': 'off',

0 commit comments

Comments
 (0)