Skip to content

Commit

Permalink
ref: Finishing touches before the 5.21.0 release (#2808)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
kamilogorek authored Aug 12, 2020
1 parent b262b10 commit 7a097b4
Show file tree
Hide file tree
Showing 47 changed files with 474 additions and 177 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,5 @@ extensions for APM
JavaScript SDKs with interfaces, type definitions and base classes.
- [`@sentry/utils`](https://github.com/getsentry/sentry-javascript/tree/master/packages/utils): A set of helpers and
utility functions useful for various SDKs.
- [`@sentry/typescript`](https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript): Shared
Typescript compiler and linter options.
- [`@sentry/types`](https://github.com/getsentry/sentry-javascript/tree/master/packages/types): Types used in all
packages.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"packages/browser",
"packages/core",
"packages/ember",
"packages/eslint-config-sentry-sdks",
"packages/eslint-plugin-sentry-sdks",
"packages/eslint-config-sdk",
"packages/eslint-plugin-sdk",
"packages/gatsby",
"packages/hub",
"packages/integrations",
Expand Down Expand Up @@ -61,7 +61,7 @@
"size-limit": "^4.5.5",
"ts-jest": "^24.0.2",
"typedoc": "^0.14.2",
"typescript": "3.4.5"
"typescript": "3.6.5"
},
"resolutions": {
"**/agent-base": "5"
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ module.exports = {
parserOptions: {
ecmaVersion: 2018,
},
extends: ['sentry-sdks'],
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"tslib": "^1.9.3"
},
"devDependencies": {
"eslint-config-sentry-sdks": "5.20.1",
"@sentry-internal/eslint-config-sdk": "5.20.1",
"eslint": "7.6.0",
"npm-run-all": "^4.1.2",
"prettier": "1.17.0",
"rimraf": "^2.6.3",
"typescript": "3.4.5"
"typescript": "3.6.5"
},
"scripts": {
"build": "run-p build:es5 build:esm",
Expand Down
6 changes: 3 additions & 3 deletions packages/apm/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module.exports = {
parserOptions: {
ecmaVersion: 2018,
},
extends: ['sentry-sdks'],
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
Expand All @@ -16,7 +16,7 @@ module.exports = {
},
},
{
files: ['test/**/*'],
files: ['test/**'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
Expand Down
4 changes: 2 additions & 2 deletions packages/apm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"tslib": "^1.9.3"
},
"devDependencies": {
"eslint-config-sentry-sdks": "5.20.1",
"@sentry-internal/eslint-config-sdk": "5.20.1",
"@types/express": "^4.17.1",
"eslint": "7.6.0",
"jest": "^24.7.1",
Expand All @@ -37,7 +37,7 @@
"rollup-plugin-node-resolve": "^4.2.3",
"rollup-plugin-terser": "^4.0.4",
"rollup-plugin-typescript2": "^0.21.0",
"typescript": "3.4.5"
"typescript": "3.6.5"
},
"scripts": {
"build": "run-p build:es5 build:esm build:bundle",
Expand Down
10 changes: 5 additions & 5 deletions packages/browser/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ module.exports = {
parserOptions: {
ecmaVersion: 2018,
},
extends: ['sentry-sdks'],
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*', 'src/loader.js'],
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**', 'coverage/**', 'src/loader.js'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
Expand All @@ -17,7 +17,7 @@ module.exports = {
},
},
{
files: ['test/**/*'],
files: ['test/**'],
rules: {
'jsdoc/require-jsdoc': 'off',
'no-console': 'off',
Expand All @@ -28,7 +28,7 @@ module.exports = {
},
},
{
files: ['test/integration/**/*'],
files: ['test/integration/**'],
env: {
mocha: true,
},
Expand All @@ -37,7 +37,7 @@ module.exports = {
},
},
{
files: ['test/integration/common/**/*', 'test/integration/suites/**/*'],
files: ['test/integration/common/**', 'test/integration/suites/**'],
rules: {
'no-unused-vars': 'off',
},
Expand Down
4 changes: 2 additions & 2 deletions packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"devDependencies": {
"@types/eslint": "^7.2.0",
"@types/md5": "2.1.33",
"eslint-config-sentry-sdks": "5.20.1",
"@sentry-internal/eslint-config-sdk": "5.20.1",
"eslint": "7.6.0",
"btoa": "^1.2.1",
"chai": "^4.1.2",
Expand All @@ -51,7 +51,7 @@
"rollup-plugin-terser": "^4.0.4",
"rollup-plugin-typescript2": "^0.21.0",
"sinon": "^7.3.2",
"typescript": "3.4.5",
"typescript": "3.6.5",
"webpack": "^4.30.0"
},
"scripts": {
Expand Down
19 changes: 10 additions & 9 deletions packages/browser/test/integration/browsers.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,16 @@ module.exports = {
real_mobile: true,
browser_version: null,
},
bs_ie10: {
base: "BrowserStack",
browser: "IE",
browser_version: "10.0",
os: "Windows",
os_version: "8",
device: null,
real_mobile: null,
},
// FIXME: Investigate why BrowserStack stopped running IE10 machine recently
// bs_ie10: {
// base: "BrowserStack",
// browser: "IE",
// browser_version: "10.0",
// os: "Windows",
// os_version: "8",
// device: null,
// real_mobile: null,
// },
bs_ie11: {
base: "BrowserStack",
browser: "IE",
Expand Down
6 changes: 3 additions & 3 deletions packages/core/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module.exports = {
parserOptions: {
ecmaVersion: 2018,
},
extends: ['sentry-sdks'],
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
Expand All @@ -16,7 +16,7 @@ module.exports = {
},
},
{
files: ['test/**/*'],
files: ['test/**'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"tslib": "^1.9.3"
},
"devDependencies": {
"eslint-config-sentry-sdks": "5.20.1",
"@sentry-internal/eslint-config-sdk": "5.20.1",
"eslint": "7.6.0",
"jest": "^24.7.1",
"npm-run-all": "^4.1.2",
"prettier": "1.17.0",
"rimraf": "^2.6.3",
"typescript": "3.4.5"
"typescript": "3.6.5"
},
"scripts": {
"build": "run-p build:es5 build:esm",
Expand Down
4 changes: 2 additions & 2 deletions packages/ember/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ module.exports = {
rules: {},
overrides: [
{
files: ['addon/**/*'],
plugins: ['sentry-sdks'],
files: ['addon/**'],
plugins: ['@sentry-internal/eslint-plugin-sdk'],
},
// node files
{
Expand Down
6 changes: 3 additions & 3 deletions packages/ember/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"eslint-config-sentry-sdks": "5.20.1",
"@sentry-internal/eslint-config-sdk": "5.20.1",
"@types/ember": "^3.16.0",
"@types/ember-qunit": "^3.4.9",
"@types/ember__test-helpers": "^1.7.0",
Expand All @@ -60,7 +60,7 @@
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.0",
"ember-sinon-qunit": "^5.0.0",
"ember-source": "~3.19.0",
"ember-source": "~3.12.0",
"ember-source-channel-url": "^2.0.1",
"ember-template-lint": "^2.9.1",
"ember-test-selectors": "^4.1.0",
Expand All @@ -71,7 +71,7 @@
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"qunit-dom": "^1.2.0",
"typescript": "3.4.5"
"typescript": "3.6.5"
},
"engines": {
"node": "10.* || >= 12"
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

# Official Sentry SDK eslint config

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

## Links
Expand All @@ -19,16 +19,16 @@

## General

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

## Configuration

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

```json
{
"extends": ["@sentry"],
"extends": ["@sentry-internal/sdk"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.d.ts"],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "eslint-config-sentry-sdks",
"name": "@sentry-internal/eslint-config-sdk",
"version": "5.20.1",
"description": "Official Sentry SDK eslint config",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sentry-sdks",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
"author": "Sentry",
"license": "MIT",
"keywords": [
Expand All @@ -19,8 +19,8 @@
"access": "public"
},
"dependencies": {
"eslint-plugin-sentry-sdks": "5.20.1",
"@sentry/typescript": "5.20.1",
"@sentry-internal/eslint-plugin-sdk": "5.20.1",
"@sentry-internal/typescript": "5.20.1",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"eslint-config-prettier": "^6.11.0",
Expand All @@ -34,7 +34,7 @@
},
"devDependencies": {
"eslint": "7.6.0",
"typescript": "3.4.5"
"typescript": "3.6.5"
},
"scripts": {
"link:yarn": "yarn link",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
node: true,
},
extends: ['prettier', 'eslint:recommended', 'plugin:import/errors', 'plugin:import/warnings'],
plugins: ['sentry-sdks', 'simple-import-sort'],
plugins: ['@sentry-internal/eslint-plugin-sdk', 'simple-import-sort'],
overrides: [
{
// Configuration for JavaScript files
Expand Down Expand Up @@ -101,7 +101,7 @@ module.exports = {
files: ['src/**/*'],
rules: {
// We want to prevent async await usage in our files to prevent uncessary bundle size.
'sentry-sdks/no-async-await': 'error',
'@sentry-internal/sdk/no-async-await': 'error',

// JSDOC comments are required for classes and methods. As we have a public facing codebase, documentation,
// even if it may seems excessive at times, is important to emphasize. Turned off in tests.
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "eslint-plugin-sentry-sdks",
"name": "@sentry-internal/eslint-plugin-sdk",
"version": "5.20.1",
"description": "Official Sentry SDK eslint plugin",
"repository": "git://github.com/getsentry/sentry-javascript.git",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sentry-sdks",
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
"author": "Sentry",
"license": "MIT",
"keywords": [
Expand All @@ -23,7 +23,7 @@
},
"devDependencies": {
"prettier": "1.17.0",
"typescript": "3.4.5",
"typescript": "3.6.5",
"mocha": "^6.2.0"
},
"scripts": {
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/gatsby/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ module.exports = {
parserOptions: {
ecmaVersion: 2018,
},
extends: ['sentry-sdks'],
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
"gatsby": "*"
},
"devDependencies": {
"eslint-config-sentry-sdks": "5.20.1",
"@sentry-internal/eslint-config-sdk": "5.20.1",
"eslint": "7.6.0",
"jest": "^24.7.1",
"npm-run-all": "^4.1.2",
"prettier": "1.17.0",
"rimraf": "^2.6.3",
"typescript": "3.4.5"
"typescript": "3.6.5"
},
"scripts": {
"build": "run-p build:es5 build:esm",
Expand Down
6 changes: 3 additions & 3 deletions packages/hub/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module.exports = {
parserOptions: {
ecmaVersion: 2018,
},
extends: ['sentry-sdks'],
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
Expand All @@ -16,7 +16,7 @@ module.exports = {
},
},
{
files: ['test/**/*'],
files: ['test/**'],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
Expand Down
Loading

0 comments on commit 7a097b4

Please sign in to comment.