fix: Node 10 tests (#1827)

* fix: Node 10 tests

* feat: Update linter, update tests

* fix: typescript version

* fix: Tests

* fix: Tests

* fix: node 6 build

* fix: Add conditional for PRs

* fix: Travis

Author: HazAT

.travis.yml

@@ -17,7 +17,7 @@ cache:
   directories:
     - node_modules
 
-matrix:
+jobs:
   include:
     - name: '@sentry/packages - build + lint + test + codecov + danger [node v8]'
       node_js: '8'
@@ -38,6 +38,7 @@ matrix:
         firefox: latest
       script: scripts/browser-integration.sh
     - name: '@sentry/browser - saucelabs tests'
+      if: fork = false
       node_js: '8'
       addons:
         sauce_connect: true

.vscode/extensions.json

@@ -1,5 +1,5 @@
 {
   // See http://go.microsoft.com/fwlink/?LinkId=827846
   // for the documentation about the extensions.json format
-  "recommendations": ["esbenp.prettier-vscode", "eg2.tslint", "stkb.rewrap"]
+  "recommendations": ["esbenp.prettier-vscode", "ms-vscode.vscode-typescript-tslint-plugin"]
 }

package.json

@@ -44,9 +44,9 @@
     "sinon": "^7.1.1",
     "ts-jest": "^23.10.5",
     "tslint": "^5.11.0",
-    "tslint-language-service": "^0.9.9",
     "typedoc": "^0.13.0",
     "typedoc-plugin-monorepo": "^0.1.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0",
+    "typescript-tslint-plugin": "^0.2.1"
   }
 }

packages/browser/package.json

@@ -48,7 +48,7 @@
     "rollup-plugin-uglify": "^3.0.0",
     "sinon": "^5.0.3",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1",
+    "typescript": "^3.2.0",
     "webpack": "^4.26.0"
   },
   "scripts": {

packages/browser/src/integrations/trycatch.ts

@@ -210,9 +210,10 @@ export class TryCatch implements Integration {
   }
 }
 
+/** JSDoc */
 function getFunctionName(fn: any): string {
   try {
-    return fn && fn.name || '<anonymous>';
+    return (fn && fn.name) || '<anonymous>';
   } catch (e) {
     // Just accessing custom props in some Selenium environments
     // can cause a "Permission denied" exception (see raven-js#495).

packages/core/package.json

@@ -28,7 +28,7 @@
     "prettier-check": "^2.0.0",
     "rimraf": "^2.6.2",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

packages/hub/package.json

@@ -26,7 +26,7 @@
     "prettier-check": "^2.0.0",
     "rimraf": "^2.6.2",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

packages/minimal/package.json

@@ -26,7 +26,7 @@
     "prettier-check": "^2.0.0",
     "rimraf": "^2.6.2",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

packages/node/package.json

@@ -38,7 +38,7 @@
     "prettier-check": "^2.0.0",
     "rimraf": "^2.6.2",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

packages/node/test/index.test.ts

@@ -151,18 +151,15 @@ describe('SentryNode', () => {
     });
 
     test('capture an exception', done => {
-      expect.assertions(8);
+      expect.assertions(5);
       getCurrentHub().bindClient(
         new NodeClient({
           beforeSend: (event: SentryEvent) => {
             expect(event.tags).toEqual({ test: '1' });
             expect(event.exception).not.toBeUndefined();
-            expect(event.exception!.values![0].stacktrace!.frames![2].pre_context).not.toBeUndefined();
-            expect(event.exception!.values![0].stacktrace!.frames![2].post_context).not.toBeUndefined();
             expect(event.exception!.values![0]).not.toBeUndefined();
-            expect(event.exception!.values![0].type).toBe('Error');
-            expect(event.exception!.values![0].value).toBe('test');
-            expect(event.exception!.values![0].stacktrace).toBeTruthy();
+            expect(event.exception!.values![0].stacktrace!).not.toBeUndefined();
+            expect(event.exception!.values![0].stacktrace!.frames![2]).not.toBeUndefined();
             done();
             return null;
           },
@@ -180,20 +177,22 @@ describe('SentryNode', () => {
     });
 
     test('capture an exception no pre/post context', done => {
-      expect.assertions(8);
+      expect.assertions(10);
       getCurrentHub().bindClient(
         new NodeClient({
           beforeSend: (event: SentryEvent) => {
             expect(event.tags).toEqual({ test: '1' });
             expect(event.exception).not.toBeUndefined();
+            expect(event.exception!.values![0]).not.toBeUndefined();
+            expect(event.exception!.values![0].stacktrace!).not.toBeUndefined();
+            expect(event.exception!.values![0].stacktrace!.frames![2]).not.toBeUndefined();
             expect(event.exception!.values![0].stacktrace!.frames![2].pre_context).toBeUndefined();
             expect(event.exception!.values![0].stacktrace!.frames![2].post_context).toBeUndefined();
-            expect(event.exception!.values![0]).not.toBeUndefined();
             expect(event.exception!.values![0].type).toBe('Error');
             expect(event.exception!.values![0].value).toBe('test');
             expect(event.exception!.values![0].stacktrace).toBeTruthy();
             done();
-            return event;
+            return null;
           },
           dsn,
           frameContextLines: 0,
@@ -217,7 +216,7 @@ describe('SentryNode', () => {
             expect(event.message).toBe('test');
             expect(event.exception).toBeUndefined();
             done();
-            return event;
+            return null;
           },
           dsn,
         }),
@@ -233,7 +232,7 @@ describe('SentryNode', () => {
             expect(event.message).toBe('test event');
             expect(event.exception).toBeUndefined();
             done();
-            return event;
+            return null;
           },
           dsn,
         }),
@@ -272,7 +271,7 @@ describe('SentryNode', () => {
               ].function,
             ).toEqual('testy');
             done();
-            return event;
+            return null;
           },
           dsn,
         }),

packages/types/package.json

@@ -19,7 +19,7 @@
     "prettier": "^1.14.0",
     "prettier-check": "^2.0.0",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

packages/typescript/package.json

@@ -15,7 +15,7 @@
   },
   "peerDependencies": {
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0"
   },
   "gitHead": "a91da22f8bd3bddb38fab7f868326e376da82d4d"
 }

packages/typescript/tsconfig.json

@@ -17,6 +17,17 @@
     "pretty": true,
     "sourceMap": true,
     "strict": true,
-    "target": "es5"
+    "target": "es5",
+    "strictBindCallApply": false,
+    "plugins": [
+      {
+        "name": "typescript-tslint-plugin",
+        "alwaysShowRuleFailuresAsWarnings": false,
+        "ignoreDefinitionFiles": true,
+        "configFile": "./tslint.json",
+        "suppressWhileTypeErrorsPresent": false,
+        "mockTypeScriptVersion": false
+      }
+    ]
   }
 }

packages/utils/package.json

@@ -24,7 +24,7 @@
     "prettier-check": "^2.0.0",
     "rimraf": "^2.6.2",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.2.0"
   },
   "scripts": {
     "build": "run-s clean && tsc -p tsconfig.build.json",

scripts/test.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e
 
-yarn
+# We need this check to skip engines check for typescript-tslint-plugin package
+if [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -le 6 ]]; then
+  yarn install --ignore-engines
+else
+  yarn install
+fi
 yarn build
 yarn test

yarn.lock

@@ -2283,12 +2283,6 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-id@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-id/-/caller-id-0.1.0.tgz#59bdac0893d12c3871408279231f97458364f07b"
-  dependencies:
-    stack-trace "~0.0.7"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@@ -4119,7 +4113,7 @@ genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
 
-get-caller-file@^1.0.1:
+get-caller-file@^1.0.1, get-caller-file@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
 
@@ -6775,11 +6769,12 @@ mocha@^4.1.0:
     mkdirp "0.5.1"
     supports-color "4.4.0"
 
-mock-require@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-2.0.2.tgz#1eaa71aad23013773d127dc7e91a3fbb4837d60d"
+mock-require@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.2.tgz#7ce759b559e3b194be5f20a5b1cece0eb363f53d"
   dependencies:
-    caller-id "^0.1.0"
+    get-caller-file "^1.0.2"
+    normalize-path "^2.1.1"
 
 modify-values@^1.0.0:
   version "1.0.1"
@@ -8982,7 +8977,7 @@ ssri@^6.0.0, ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-[email protected], stack-trace@~0.0.7:
+[email protected]:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
 
@@ -9482,12 +9477,6 @@ tslint-config-prettier@^1.12.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.17.0.tgz#946ed6117f98f3659a65848279156d87628c33dc"
 
-tslint-language-service@^0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/tslint-language-service/-/tslint-language-service-0.9.9.tgz#f546dc38483979e6fb3cfa59584ad8525b3ad4da"
-  dependencies:
-    mock-require "^2.0.2"
-
 tslint@^5.11.0:
   version "5.11.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
@@ -9587,10 +9576,22 @@ typedoc@^0.13.0:
     typedoc-default-themes "^0.5.0"
     typescript "3.1.x"
 
-[email protected], typescript@^3.0.1:
+typescript-tslint-plugin@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.2.1.tgz#6a0361cd311bdc9dcec2e70c8a54cab16829e47f"
+  dependencies:
+    minimatch "^3.0.4"
+    mock-require "^3.0.2"
+    vscode-languageserver "^5.1.0"
+
+[email protected]:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
 
+typescript@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
+
 uglify-es@^3.3.7:
   version "3.3.9"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
@@ -9844,6 +9845,32 @@ void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
+vscode-jsonrpc@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
+
+[email protected]:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
+  dependencies:
+    vscode-jsonrpc "^4.0.0"
+    vscode-languageserver-types "3.14.0"
+
+[email protected]:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
+
+vscode-languageserver@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
+  dependencies:
+    vscode-languageserver-protocol "3.14.1"
+    vscode-uri "^1.0.6"
+
+vscode-uri@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
+
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"