Merge branch 'master' into vue-types

Author: HazAT

CHANGELOG.md

@@ -3,6 +3,11 @@
 ## Unreleased
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
+- [react] feat: Add @sentry/react package (#2631)
+
+## 5.16.1
+
+- [node] fix: Requests to old `/store` endpoint need the `x-sentry-auth` header in node (#2637)
 
 ## 5.16.0
 

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

package.json

@@ -26,7 +26,7 @@
     "packages/integrations",
     "packages/minimal",
     "packages/node",
-    "packages/opentracing",
+    "packages/react",
     "packages/types",
     "packages/typescript",
     "packages/utils"

packages/apm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/apm",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "description": "Extensions for APM",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/apm",
@@ -16,11 +16,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "5.16.0",
-    "@sentry/hub": "5.16.0",
-    "@sentry/minimal": "5.16.0",
-    "@sentry/types": "5.16.0",
-    "@sentry/utils": "5.16.0",
+    "@sentry/browser": "5.16.1",
+    "@sentry/hub": "5.16.1",
+    "@sentry/minimal": "5.16.1",
+    "@sentry/types": "5.16.1",
+    "@sentry/utils": "5.16.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "5.16.0",
-    "@sentry/types": "5.16.0",
-    "@sentry/utils": "5.16.0",
+    "@sentry/core": "5.16.1",
+    "@sentry/types": "5.16.1",
+    "@sentry/utils": "5.16.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/browser/src/transports/fetch.ts

@@ -35,6 +35,10 @@ export class FetchTransport extends BaseTransport {
       referrerPolicy: (supportsReferrerPolicy() ? 'origin' : '') as ReferrerPolicy,
     };
 
+    if (this.options.fetchParameters !== undefined) {
+      Object.assign(options, this.options.fetchParameters);
+    }
+
     if (this.options.headers !== undefined) {
       options.headers = this.options.headers;
     }

packages/browser/src/version.ts

@@ -1,2 +1,2 @@
 export const SDK_NAME = 'sentry.javascript.browser';
-export const SDK_VERSION = '5.16.0';
+export const SDK_VERSION = '5.16.1';

packages/browser/test/unit/transports/fetch.test.ts

@@ -156,5 +156,29 @@ describe('FetchTransport', () => {
         }),
       ).equal(true);
     });
+
+    it('passes in fetch parameters', async () => {
+      transport = new Transports.FetchTransport({
+        dsn: testDsn,
+        fetchParameters: {
+          credentials: 'include',
+        },
+      });
+      const response = { status: 200 };
+
+      fetch.returns(Promise.resolve(response));
+
+      const res = await transport.sendEvent(payload);
+
+      expect(res.status).equal(Status.Success);
+      expect(
+        fetch.calledWith(transportUrl, {
+          body: JSON.stringify(payload),
+          credentials: 'include',
+          method: 'POST',
+          referrerPolicy: 'origin',
+        }),
+      ).equal(true);
+    });
   });
 });

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
@@ -16,10 +16,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "5.16.0",
-    "@sentry/minimal": "5.16.0",
-    "@sentry/types": "5.16.0",
-    "@sentry/utils": "5.16.0",
+    "@sentry/hub": "5.16.1",
+    "@sentry/minimal": "5.16.1",
+    "@sentry/types": "5.16.1",
+    "@sentry/utils": "5.16.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/core/src/api.ts

@@ -80,8 +80,7 @@ export class API {
 
   /**
    * Returns an object that can be used in request headers.
-   *
-   * @deprecated in favor of `getStoreEndpointWithUrlEncodedAuth` and `getEnvelopeEndpointWithUrlEncodedAuth`.
+   * This is needed for node and the old /store endpoint in sentry
    */
   public getRequestHeaders(clientName: string, clientVersion: string): { [key: string]: string } {
     const dsn = this._dsnObject;

packages/core/test/lib/base.test.ts

@@ -7,7 +7,7 @@ import { TestClient } from '../mocks/client';
 import { TestIntegration } from '../mocks/integration';
 import { FakeTransport } from '../mocks/transport';
 
-const PUBLIC_DSN = 'https://username@domain/path';
+const PUBLIC_DSN = 'https://username@domain/123';
 declare var global: any;
 
 jest.mock('@sentry/utils', () => {

packages/core/test/lib/sdk.test.ts

@@ -6,7 +6,7 @@ import { TestClient } from '../mocks/client';
 
 declare var global: any;
 
-const PUBLIC_DSN = 'https://username@domain/path';
+const PUBLIC_DSN = 'https://username@domain/123';
 
 jest.mock('@sentry/hub', () => ({
   getCurrentHub(): {

packages/hub/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/hub",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "description": "Sentry hub which handles global state managment.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/types": "5.16.0",
-    "@sentry/utils": "5.16.0",
+    "@sentry/types": "5.16.1",
+    "@sentry/utils": "5.16.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/integrations/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/integrations",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "description": "Pluggable integrations that can be used to enhance JS SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations",
@@ -16,8 +16,8 @@
   "module": "esm/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@sentry/types": "5.16.0",
-    "@sentry/utils": "5.16.0",
+    "@sentry/types": "5.16.1",
+    "@sentry/utils": "5.16.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/minimal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/minimal",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "description": "Sentry minimal library that can be used in other packages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal",
@@ -16,8 +16,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/hub": "5.16.0",
-    "@sentry/types": "5.16.0",
+    "@sentry/hub": "5.16.1",
+    "@sentry/types": "5.16.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "5.16.0",
+  "version": "5.16.1",
   "description": "Offical Sentry SDK for Node.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -16,11 +16,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/apm": "5.16.0",
-    "@sentry/core": "5.16.0",
-    "@sentry/hub": "5.16.0",
-    "@sentry/types": "5.16.0",
-    "@sentry/utils": "5.16.0",
+    "@sentry/apm": "5.16.1",
+    "@sentry/core": "5.16.1",
+    "@sentry/hub": "5.16.1",
+    "@sentry/types": "5.16.1",
+    "@sentry/utils": "5.16.1",
     "cookie": "^0.3.1",
     "https-proxy-agent": "^4.0.0",
     "lru_map": "^0.3.3",

packages/node/src/transports/base.ts

@@ -6,7 +6,7 @@ import * as http from 'http';
 import * as https from 'https';
 import * as url from 'url';
 
-// import { SDK_NAME, SDK_VERSION } from '../version';
+import { SDK_NAME, SDK_VERSION } from '../version';
 
 /**
  * Internal used interface for typescript.
@@ -59,14 +59,13 @@ export abstract class BaseTransport implements Transport {
   /** Returns a build request option object used by request */
   protected _getRequestOptions(uri: url.URL): http.RequestOptions | https.RequestOptions {
     const headers = {
-      // The auth headers are not included because auth is done via query string to match @sentry/browser.
-      //
-      // ...this._api.getRequestHeaders(SDK_NAME, SDK_VERSION)
+      ...this._api.getRequestHeaders(SDK_NAME, SDK_VERSION),
       ...this.options.headers,
     };
-    const { hostname, pathname, port, protocol, search } = uri;
+    const { hostname, pathname, port, protocol } = uri;
     // See https://github.com/nodejs/node/blob/38146e717fed2fabe3aacb6540d839475e0ce1c6/lib/internal/url.js#L1268-L1290
-    const path = `${pathname}${search}`;
+    // We ignore the query string on purpose
+    const path = `${pathname}`;
 
     return {
       agent: this.client,

packages/node/src/version.ts

@@ -1,2 +1,2 @@
 export const SDK_NAME = 'sentry.javascript.node';
-export const SDK_VERSION = '5.16.0';
+export const SDK_VERSION = '5.16.1';

packages/node/test/transports/http.test.ts

@@ -6,7 +6,7 @@ import { HTTPTransport } from '../../src/transports/http';
 
 const mockSetEncoding = jest.fn();
 const dsn = 'http://[email protected]:8989/mysubpath/50622';
-const transportPath = '/mysubpath/api/50622/store/?sentry_key=9e9fd4523d784609a5fc0ebb1080592f&sentry_version=7';
+const transportPath = '/mysubpath/api/50622/store/';
 let mockReturnCode = 200;
 let mockHeaders = {};
 
@@ -28,7 +28,7 @@ function createTransport(options: TransportOptions): HTTPTransport {
 }
 
 function assertBasicOptions(options: any): void {
-  expect(options.headers).not.toContain('X-Sentry-Auth'); // auth is part of the query string
+  expect(options.headers['X-Sentry-Auth']).toBeTruthy();
   expect(options.port).toEqual('8989');
   expect(options.path).toEqual(transportPath);
   expect(options.hostname).toEqual('sentry.io');

packages/node/test/transports/https.test.ts

@@ -6,7 +6,7 @@ import { HTTPSTransport } from '../../src/transports/https';
 
 const mockSetEncoding = jest.fn();
 const dsn = 'https://[email protected]:8989/mysubpath/50622';
-const transportPath = '/mysubpath/api/50622/store/?sentry_key=9e9fd4523d784609a5fc0ebb1080592f&sentry_version=7';
+const transportPath = '/mysubpath/api/50622/store/';
 let mockReturnCode = 200;
 let mockHeaders = {};
 
@@ -34,7 +34,7 @@ function createTransport(options: TransportOptions): HTTPSTransport {
 }
 
 function assertBasicOptions(options: any): void {
-  expect(options.headers).not.toContain('X-Sentry-Auth'); // auth is part of the query string
+  expect(options.headers['X-Sentry-Auth']).toBeTruthy();
   expect(options.port).toEqual('8989');
   expect(options.path).toEqual(transportPath);
   expect(options.hostname).toEqual('sentry.io');

packages/react/.npmignore

@@ -0,0 +1,4 @@
+*
+!/dist/**/*
+!/esm/**/*
+*.tsbuildinfo

packages/react/LICENSE

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2019, Sentry
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

packages/react/README.md

@@ -0,0 +1,13 @@
+<p align="center">
+  <a href="https://sentry.io" target="_blank" align="center">
+    <img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" width="280">
+  </a>
+  <br />
+</p>
+
+# Official Sentry SDK for ReactJS
+
+## Links
+
+- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+- [TypeDoc](http://getsentry.github.io/sentry-javascript/)