Skip to content

ref(eslint): Consolidate initial set of packages #4102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 2, 2021
Merged

ref(eslint): Consolidate initial set of packages #4102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4679d5
ref(eslint): Consolidate packages to minimum
AbhiPrasad Oct 28, 2021
d78fe79
make necessary fixes
AbhiPrasad Oct 28, 2021
b79dbd7
remove redundant env declarations
AbhiPrasad Oct 28, 2021
f691ad2
remove new line
AbhiPrasad Oct 28, 2021
0a7eb08
remove from package.json
AbhiPrasad Oct 28, 2021
bfd209e
Update packages/eslint-config-sdk/src/index.js
AbhiPrasad Oct 29, 2021
ca60ec4
remove uneeded es6 declares
AbhiPrasad Oct 29, 2021
cf6b60d
align eslint ignore with current setup
AbhiPrasad Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module.exports = {
root: true,
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: [
'coverage/**',
'build/**',
'dist/**',
'esm/**',
'examples/**',
'scripts/**',
'test/manual/**',
Comment on lines +15 to +17
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll admit IDK how far off these are from being compliant with our eslint rules, but is there a reason we wouldn't want to keep them in line with everything else?

],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
}
],
};
16 changes: 1 addition & 15 deletions packages/angular/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
module.exports = {
root: true,
env: {
es6: true,
browser: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
],
extends: ['../../.eslintrc.js'],
};
1 change: 0 additions & 1 deletion packages/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"@angular/common": "^10.0.3",
"@angular/core": "^10.0.3",
"@angular/router": "^10.0.3",
"@sentry-internal/eslint-config-sdk": "6.13.3",
"npm-run-all": "^4.1.2",
"prettier": "1.19.0",
"rimraf": "^2.6.3",
Expand Down
25 changes: 1 addition & 24 deletions packages/core/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
module.exports = {
root: true,
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
{
files: ['test/**'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
},
],
extends: ['../../.eslintrc.js'],
};
1 change: 0 additions & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"tslib": "^1.9.3"
},
"devDependencies": {
"@sentry-internal/eslint-config-sdk": "6.13.3",
"jest": "^24.7.1",
"npm-run-all": "^4.1.2",
"prettier": "1.19.0",
Expand Down
5 changes: 3 additions & 2 deletions packages/eslint-config-sdk/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,16 @@ module.exports = {
env: {
jest: true,
},
files: ['*.test.ts', '*.test.tsx', '*.test.js', '*.test.jsx'],
files: ['*.test.ts', '*.test.tsx', '*.test.js', '*.test.jsx', 'test/**/*.ts', 'test/**/*.js'],
rules: {
'max-lines': 'off',

'@typescript-eslint/explicit-function-return-type': 'off',
'no-unused-expressions': 'off',
'@typescript-eslint/no-unused-expressions': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/explicit-member-accessibility': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
},
{
Expand Down
14 changes: 1 addition & 13 deletions packages/gatsby/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
module.exports = {
root: true,
env: {
es6: true,
browser: true,
node: true,
},
parserOptions: {
ecmaVersion: 2018,
jsx: true,
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By looking at the changes (specially env), I assume the entries that exist in the parent configuration are overridden (you can't extend them and you need to define the whole entry), is this correct? If yes, does having jsx here make any difference? If no, there are some entires in env that are duplicated from the parent config file.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as per https://eslint.org/docs/user-guide/configuring/configuration-files#extending-configuration-files, extending merges the entries, will make changes as appropriate.

extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
],
extends: ['../../.eslintrc.js'],
};
1 change: 0 additions & 1 deletion packages/gatsby/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"gatsby": "^2.0.0 || ^3.0.0"
},
"devDependencies": {
"@sentry-internal/eslint-config-sdk": "6.13.3",
"@sentry/types": "6.13.3",
"@testing-library/react": "^10.4.9",
"jest": "^24.7.1",
Expand Down
25 changes: 1 addition & 24 deletions packages/hub/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
module.exports = {
root: true,
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
{
files: ['test/**'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
},
],
extends: ['../../.eslintrc.js'],
};
1 change: 0 additions & 1 deletion packages/hub/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"tslib": "^1.9.3"
},
"devDependencies": {
"@sentry-internal/eslint-config-sdk": "6.13.3",
"jest": "^24.7.1",
"npm-run-all": "^4.1.2",
"prettier": "1.19.0",
Expand Down
28 changes: 1 addition & 27 deletions packages/integrations/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
module.exports = {
root: true,
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
{
files: ['test/**'],
env: {
mocha: true,
},
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
},
],
extends: ['../../.eslintrc.js'],
};
1 change: 0 additions & 1 deletion packages/integrations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"tslib": "^1.9.3"
},
"devDependencies": {
"@sentry-internal/eslint-config-sdk": "6.13.3",
"chai": "^4.1.2",
"jest": "^24.7.1",
"npm-run-all": "^4.1.2",
Expand Down
25 changes: 1 addition & 24 deletions packages/minimal/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
module.exports = {
root: true,
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
{
files: ['test/**'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
},
],
extends: ['../../.eslintrc.js'],
};
1 change: 0 additions & 1 deletion packages/minimal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"tslib": "^1.9.3"
},
"devDependencies": {
"@sentry-internal/eslint-config-sdk": "6.13.3",
"jest": "^24.7.1",
"npm-run-all": "^4.1.2",
"prettier": "1.19.0",
Expand Down
1 change: 0 additions & 1 deletion packages/node/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module.exports = {
root: true,
env: {
es6: true,
node: true,
},
parserOptions: {
Expand Down
1 change: 0 additions & 1 deletion packages/react/test/errorboundary.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Scope } from '@sentry/browser';
import { Event, Severity } from '@sentry/types';
import { fireEvent, render, screen } from '@testing-library/react';
import * as React from 'react';
import { useState } from 'react';
Expand Down
25 changes: 1 addition & 24 deletions packages/tracing/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
module.exports = {
root: true,
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
{
files: ['test/**'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
},
],
extends: ['../../.eslintrc.js'],
};
1 change: 0 additions & 1 deletion packages/tracing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"tslib": "^1.9.3"
},
"devDependencies": {
"@sentry-internal/eslint-config-sdk": "6.13.3",
"@sentry/browser": "6.13.3",
"@types/express": "^4.17.1",
"@types/jsdom": "^16.2.3",
Expand Down
20 changes: 2 additions & 18 deletions packages/types/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
module.exports = {
root: true,
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
],
extends: ['../../.eslintrc.js'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
},
}
};
1 change: 0 additions & 1 deletion packages/types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"access": "public"
},
"devDependencies": {
"@sentry-internal/eslint-config-sdk": "6.13.3",
"npm-run-all": "^4.1.2",
"prettier": "1.19.0",
"typescript": "3.7.5"
Expand Down
28 changes: 1 addition & 27 deletions packages/utils/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
module.exports = {
root: true,
env: {
es6: true,
},
parserOptions: {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
parserOptions: {
project: './tsconfig.json',
},
},
{
files: ['test/**'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
},
},
],
rules: {
'max-lines': 'off',
},
extends: ['../../.eslintrc.js'],
};
1 change: 1 addition & 0 deletions packages/utils/src/instrument.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable max-lines */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this exception required? Isn't the rule inherited?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because of the diff made here: https://github.com/getsentry/sentry-javascript/pull/4102/files#diff-e2a9dcf5ab42942e96e53586f56d6a05b1935c419f7590f610715173657bc7fcL27

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially this should be a separate PR, but I'd love to see us turn that rule back on and actually split up those files so they're easier to work with.

/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/ban-types */
import { WrappedFunction } from '@sentry/types';
Expand Down
1 change: 1 addition & 0 deletions packages/utils/src/object.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable max-lines */
/* eslint-disable @typescript-eslint/no-explicit-any */
import { ExtendedError, WrappedFunction } from '@sentry/types';

Expand Down
Loading