Merge remote-tracking branch 'upstream/master' into feat/separate-source-reading

Author: timfish

.eslintrc.js

@@ -1,3 +1,6 @@
+// Note: All paths are relative to the directory in which eslint is being run, rather than the directory where this file
+// lives
+
 module.exports = {
   root: true,
   env: {
@@ -7,20 +10,18 @@ module.exports = {
     ecmaVersion: 2018,
   },
   extends: ['@sentry-internal/sdk'],
-  ignorePatterns: [
-    'coverage/**',
-    'build/**',
-    'dist/**',
-    'esm/**',
-    'examples/**',
-    'scripts/**',
-    'test/manual/**',
-  ],
+  ignorePatterns: ['coverage/**', 'build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**', 'test/manual/**'],
   overrides: [
     {
       files: ['*.ts', '*.tsx', '*.d.ts'],
       parserOptions: {
-        project: './tsconfig.json',
+        project: ['tsconfig.json'],
+      },
+    },
+    {
+      files: ['test/**/*.ts', 'test/**/*.tsx'],
+      parserOptions: {
+        project: ['tsconfig.test.json'],
       },
     },
     {

.github/workflows/build.yml

@@ -10,6 +10,7 @@ env:
   CACHED_DEPENDENCY_PATHS: |
     ${{ github.workspace }}/node_modules
     ${{ github.workspace }}/packages/**/node_modules
+    ~/.cache/ms-playwright/
 
   # DEPENDENCY_CACHE_KEY: can't be set here because we don't have access to yarn.lock
 
@@ -115,6 +116,8 @@ jobs:
           key: ${{ env.BUILD_CACHE_KEY }}
       - name: Check bundle sizes
         uses: getsentry/size-limit-action@v3
+        # Only run size check on master or pull requests
+        if: github.ref == 'refs/heads/master' || github.event_name == 'pull_request'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           skip_step: build
@@ -268,15 +271,45 @@ jobs:
             ${{ github.workspace }}/packages/**/*.tgz
             ${{ github.workspace }}/packages/serverless/dist-awslambda-layer/*.zip
 
-  job_browserstack_test:
-    name: BrowserStack
+  job_browser_playwright_tests:
+    name: Browser Playwright Tests
     needs: job_build
     runs-on: ubuntu-latest
-    timeout-minutes: 45
+    steps:
+      - name: Check out current commit (${{ github.sha }})
+        uses: actions/checkout@v2
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '16'
+      - name: Check dependency cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
+          key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check build cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_BUILD_PATHS }}
+          key: ${{ env.BUILD_CACHE_KEY }}
+      - name: Run Playwright tests
+        run: |
+          cd packages/integration-tests
+          yarn run playwright install-deps webkit
+          yarn test:ci
+
+  job_browser_integration_tests:
+    name: Browser Integration Tests (${{ matrix.browser }})
+    needs: job_build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     continue-on-error: true
-    # TODO: Fix BrowserStack tests
-    # if: startsWith(github.ref, 'refs/heads/release/')
-    if: false
+    strategy:
+      matrix:
+        browser:
+          - ChromeHeadless
+          - FirefoxHeadless
+          - WebkitHeadless
     steps:
       - name: Check out current commit (${{ github.sha }})
         uses: actions/checkout@v2
@@ -294,10 +327,34 @@ jobs:
           key: ${{ env.BUILD_CACHE_KEY }}
       - name: Run integration tests
         env:
-          BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
-          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+          KARMA_BROWSER: ${{ matrix.browser }}
         run: |
           cd packages/browser
-          yarn test:integration:checkbrowsers
+          [[ $KARMA_BROWSER == WebkitHeadless ]] && yarn run playwright install-deps webkit
           yarn test:integration
+
+  job_browser_build_tests:
+    name: Browser Build Tests
+    needs: job_build
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    continue-on-error: true
+    steps:
+      - name: Check out current commit (${{ github.sha }})
+        uses: actions/checkout@v2
+      - name: Set up Node
+        uses: actions/setup-node@v1
+      - name: Check dependency cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
+          key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check build cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_BUILD_PATHS }}
+          key: ${{ env.BUILD_CACHE_KEY }}
+      - name: Run build tests
+        run: |
+          cd packages/browser
           yarn test:package

.size-limit.js

@@ -5,12 +5,25 @@ module.exports = [
     gzip: true,
     limit: '100 KB',
   },
+  {
+    name: '@sentry/browser - CDN Bundle (minified)',
+    path: 'packages/browser/build/bundle.min.js',
+    gzip: false,
+    limit: '120 KB',
+  },
   {
     name: '@sentry/browser - Webpack',
     path: 'packages/browser/esm/index.js',
     import: '{ init }',
     limit: '100 KB',
   },
+  {
+    name: '@sentry/browser - Webpack - gzip = false',
+    path: 'packages/browser/esm/index.js',
+    import: '{ init }',
+    gzip: false,
+    limit: '100 KB',
+  },
   {
     name: '@sentry/react - Webpack',
     path: 'packages/react/esm/index.js',

CHANGELOG.md

@@ -4,6 +4,52 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.17.0-beta.0
+
+This beta releases contains several internal refactors that help reduce the bundle size of the SDK and help prep for our [upcoming major release](https://github.com/getsentry/sentry-javascript/issues/4240). There are no breaking changes in this patch unless you are using our internal `Dsn` class. We also deprecated our typescript enums and our internal `API` class. We've detailed how to update your sdk usage if you are using the `Dsn` class or any of the deprecated methods in our [migration documentation](./MIGRATION.md#upgrading-from-6.x-to-6.17.0).
+
+- feat(core): Deprecate API class (#4281)
+- feat(dsn): Remove Dsn class (#4325)
+- feat(ember): Update ember dependencies (#4253)
+- fix(nextjs): Add sentry-cli existence check for enabling webpack plugin #4311
+- ref(tracing): deprecate span status enum (#4299)
+- ref(types): drop unused logLevel (#4317)
+- ref(types): deprecate request status enum (#4316)
+- ref(types): deprecate outcome enum (#4315)
+- ref(types): deprecate transactionmethod enum (#4314)
+- ref(types): deprecate status enum (#4298)
+- ref(types): deprecate severity enum (#4280)
+
+## 6.16.1
+
+- feat(nextjs): Support Next.js v12 (#4093)
+- fix(nextjs): Disable server instrumentation on Vercel (#4255)
+- feat(tracing): Add metadata around idleTimeout (#4251)
+
+Work in this release contributed by @KATT. Thank you for your contribution!
+
+## 6.16.0
+
+- feat(angular): Add Angular 13 to peer dep (#4183)
+- fix(angular): Finish routing span before starting another one (#4191)
+- fix(angular): Use ui category for span operations (#4222)
+- feat(ember): Use @types/ember__debug (#4173)
+- fix(ember): Use ui category for span operations (#4221)
+- feat(eslint-config): Enable array-callback-return rule (#4229)
+- ref(eslint-config): Update spaced-comment rule (#4235)
+- fix(integrations): Use ui category for vue span operations (#4219)
+- fix(nextjs): Add sideEffects flag to NextJS SDK (#4216)
+- fix(node): Make http integration spans have http span operation (#4224)
+- fix(react): Mark react package as having no side effects (#4213)
+- fix(react): Use ui category for operations (#4218)
+- fix(tracing): Add express category to express middleware spans (#4223)
+- fix(tracing): Treat HTTP status code below 100 as UnknownError (#4131)
+- fix(types): Make Options type method params contravariant (#4234)
+- fix(vue): Mark Vue as having no side effects. (#4217)
+- fix(vue): Use ui category for span operations (#4220)
+
+Work in this release contributed by @jherdman and @travigd. Thank you for your contribution!
+
 ## 6.15.0
 
 - fix(browser): Capture stacktrace on `DOMExceptions`, if possible (#4160)

MIGRATION.md

@@ -1,3 +1,99 @@
+# Upgrading from 6.x to 6.17.0
+
+You only need to make changes when migrating to `6.17.0` if you are using our internal `Dsn` class. Our internal API class and typescript enums were deprecated, so we recommend you migrate them as well.
+
+The internal `Dsn` class was removed in `6.17.0`. For additional details, you can look at the [PR where this change happened](https://github.com/getsentry/sentry-javascript/pull/4325). To migrate, see the following example.
+
+```js
+// New in 6.17.0:
+import { dsnToString, makeDsn } from '@sentry/utils';
+
+const dsn = makeDsn(process.env.SENTRY_DSN);
+console.log(dsnToString(dsn));
+
+// Before:
+import { Dsn } from '@sentry/utils';
+
+const dsn = new Dsn(process.env.SENTRY_DSN);
+console.log(dsn.toString());
+```
+
+The internal API class was deprecated, and will be removed in the next major release. More details can be found in the [PR that made this change](https://github.com/getsentry/sentry-javascript/pull/4281). To migrate, see the following example.
+
+```js
+// New in 6.17.0:
+import {
+  initAPIDetails,
+  getEnvelopeEndpointWithUrlEncodedAuth,
+  getStoreEndpointWithUrlEncodedAuth,
+} from '@sentry/core';
+
+const dsn = initAPIDetails(dsn, metadata, tunnel);
+const dsn = api.dsn;
+const storeEndpoint = getEnvelopeEndpointWithUrlEncodedAuth(api.dsn, api.tunnel);
+const envelopeEndpoint = getStoreEndpointWithUrlEncodedAuth(api.dsn);
+
+// Before:
+import { API } from '@sentry/core';
+
+const api = new API(dsn, metadata, tunnel);
+const dsn = api.getDsn();
+const storeEndpoint = api.getStoreEndpointWithUrlEncodedAuth();
+const envelopeEndpoint = api.getEnvelopeEndpointWithUrlEncodedAuth();
+```
+
+## Enum changes
+
+We've detailed how to migrate off our enums `Severity`, `Status` and `SpanStatus`. We also made changes to deprecate `TransactionMethod`, `Outcome` and `RequestSessionStatus` enums, but those are internal only APIs.
+
+#### Severity
+
+We deprecated the `Severity` enum in `@sentry/types` and it will be removed in the next major release. We recommend using string literals to save on bundle size. [PR](https://github.com/getsentry/sentry-javascript/pull/4280). We also removed the `Severity.fromString` method. This was done to save on bundle size.
+
+```js
+// New in 6.17.0:
+import { severityFromString } from '@sentry/utils';
+
+const severity = severityFromString(level);
+
+// Before:
+import { Severity } from '@sentry/types';
+
+const severity = Severity.fromString(level);
+```
+
+#### Status
+
+We deprecated the `Status` enum in `@sentry/types` and it will be removed in the next major release. We recommend using string literals to save on bundle size. [PR](https://github.com/getsentry/sentry-javascript/pull/4298). We also removed the `Status.fromHttpCode` method. This was done to save on bundle size.
+
+```js
+// New in 6.17.0:
+import { eventStatusFromHttpCode } from '@sentry/utils';
+
+const status = eventStatusFromHttpCode(500);
+
+// Before:
+import { Status } from '@sentry/types';
+
+const status = Status.fromHttpCode(500);
+```
+
+#### SpanStatus
+
+We deprecated the `Status` enum in `@sentry/tracing` and it will be removed in the next major release. We recommend using string literals to save on bundle size. [PR](https://github.com/getsentry/sentry-javascript/pull/4299). We also removed the `SpanStatus.fromHttpCode` method. This was done to save on bundle size.
+
+```js
+// New in 6.17.0:
+import { spanStatusfromHttpCode } from '@sentry/utils';
+
+const status = spanStatusfromHttpCode(403);
+
+// Before:
+import { SpanStatus } from '@sentry/tracing';
+
+const status = SpanStatus.fromHttpCode(403);
+```
+
 # Upgrading from 4.x to 5.x/6.x
 
 In this version upgrade, there are a few breaking changes. This guide should help you update your code accordingly.

README.md

@@ -18,6 +18,14 @@ _Bad software is everywhere, and we're tired of it. Sentry is on a mission to he
 This is the next line of Sentry JavaScript SDKs, comprised in the `@sentry/` namespace. It will provide a more
 convenient interface and improved consistency between various JavaScript environments.
 
+---
+
+**Sentry is Hiring!!!**
+
+Would you like to work on Open Source software and help maintain this repository? Apply today https://grnh.se/ca81c1701us.
+
+---
+
 ## Links
 
 - [![TypeDoc](https://img.shields.io/badge/documentation-TypeDoc-green.svg)](http://getsentry.github.io/sentry-javascript/)

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "6.15.0",
+  "version": "6.17.0-beta.0",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

package.json

@@ -2,9 +2,10 @@
   "private": true,
   "scripts": {
     "build": "node ./scripts/verify-packages-versions.js && lerna run --stream --concurrency 1 --sort build",
+    "build:cjs": "lerna run --stream --concurrency 1 --sort build:cjs",
     "build:dev": "lerna run --stream --concurrency 1 --sort build:dev",
     "build:dev:filter": "lerna run --stream --concurrency 1 --sort build:dev --include-filtered-dependencies --include-filtered-dependents --scope",
-    "build:es5": "lerna run --stream --concurrency 1 --sort build:es5",
+    "build:es5": "yarn lerna run --stream --concurrency 1 --sort build:cjs # *** backwards compatibility - remove in v7 ***",
     "build:esm": "lerna run --stream --concurrency 1 --sort build:esm",
     "build:watch": "lerna run --parallel build:watch",
     "build:dev:watch": "lerna run --parallel build:dev:watch",
@@ -18,7 +19,7 @@
     "pack:changed": "lerna run pack --since",
     "prepublishOnly": "lerna run --stream --concurrency 1 prepublishOnly",
     "postpublish": "make publish-docs && lerna run --stream --concurrency 1 postpublish",
-    "test": "lerna run --stream --concurrency 1 --sort test"
+    "test": "lerna run --ignore @sentry-internal/browser-integration-tests --stream --concurrency 1 --sort test"
   },
   "volta": {
     "node": "14.17.0",
@@ -33,6 +34,7 @@
     "packages/eslint-plugin-sdk",
     "packages/gatsby",
     "packages/hub",
+    "packages/integration-tests",
     "packages/integrations",
     "packages/minimal",
     "packages/nextjs",
@@ -58,19 +60,19 @@
     "chai": "^4.1.2",
     "codecov": "^3.6.5",
     "eslint": "7.32.0",
-    "jest": "^24.7.1",
+    "jest": "^24.9.0",
     "karma-browserstack-launcher": "^1.5.1",
     "karma-firefox-launcher": "^1.1.0",
     "lerna": "3.13.4",
     "madge": "4.0.2",
     "mocha": "^6.1.4",
-    "npm-run-all": "^4.1.2",
-    "prettier": "1.19.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "1.19.1",
     "replace-in-file": "^4.0.0",
-    "rimraf": "^2.6.3",
+    "rimraf": "^3.0.2",
     "sinon": "^7.3.2",
     "size-limit": "^4.5.5",
-    "ts-jest": "^24.0.2",
+    "ts-jest": "^24.3.0",
     "typedoc": "^0.18.0",
     "typescript": "3.7.5"
   },