Merge pull request #870 from bugsnag/release/v7.1.1

Release v7.1.1

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+
+## 7.1.1 (2020-05-26)
+
+### Fixed
+
+- (plugin-express): Use import syntax that works without TypeScript's `esModuleInterop` compiler flag [#866](https://github.com/bugsnag/bugsnag-js/pull/866)
+- (expo-cli): Ensure version detection logic for @bugsnag/expo works after v7.0.0 [#865](https://github.com/bugsnag/bugsnag-js/pull/865)
+- (core): Ensure callbacks supplied in config permit functions with no named arguments [#863](https://github.com/bugsnag/bugsnag-js/pull/863)
+
+
 ## 7.1.0 (2020-05-21)
 
 This update contains some substantial changes to plugin type definitions. If you are using TypeScript alongside a framework, you may need to make changes to your app. Please refer to the [upgrade guide](./UPGRADING.md).

packages/core/client.js

@@ -138,9 +138,9 @@ class Client {
     if (config.logger) this._logger = config.logger
 
     // add callbacks
-    if (config.onError && config.onError.length) this._cbs.e = this._cbs.e.concat(config.onError)
-    if (config.onBreadcrumb && config.onBreadcrumb.length) this._cbs.b = this._cbs.b.concat(config.onBreadcrumb)
-    if (config.onSession && config.onSession.length) this._cbs.s = this._cbs.s.concat(config.onSession)
+    if (config.onError) this._cbs.e = this._cbs.e.concat(config.onError)
+    if (config.onBreadcrumb) this._cbs.b = this._cbs.b.concat(config.onBreadcrumb)
+    if (config.onSession) this._cbs.s = this._cbs.s.concat(config.onSession)
 
     // finally warn about any invalid config where we fell back to the default
     if (keys(errors).length) {

packages/core/test/client.test.ts

@@ -159,16 +159,36 @@ describe('@bugsnag/core/client', () => {
       })
     })
     // eslint-disable-next-line jest/expect-expect
-    it('supports preventing send by returning false', done => {
+    it('supports preventing send by returning false in onError callback', done => {
+      const client = new Client({
+        apiKey: 'API_KEY_YEAH',
+        onError: () => false
+      })
+
+      client._setDelivery(client => ({
+        sendEvent: (payload) => {
+          done('sendEvent() should not be called')
+        },
+        sendSession: () => {}
+      }))
+
+      client.notify(new Error('oh em gee'))
+
+      // give the event loop a tick to see if the event gets sent
+      process.nextTick(() => done())
+    })
+    // eslint-disable-next-line jest/expect-expect
+    it('supports preventing send by returning false in notify callback', done => {
       const client = new Client({ apiKey: 'API_KEY_YEAH' })
+
       client._setDelivery(client => ({
         sendEvent: (payload) => {
           done('sendEvent() should not be called')
         },
         sendSession: () => {}
       }))
 
-      client.notify(new Error('oh em gee'), event => false)
+      client.notify(new Error('oh em gee'), () => false)
 
       // give the event loop a tick to see if the event gets sent
       process.nextTick(() => done())
@@ -362,10 +382,12 @@ describe('@bugsnag/core/client', () => {
 
     it('should call the callback even if the event doesn’t send (enabledReleaseStages)', done => {
       const client = new Client({ apiKey: 'API_KEY', enabledReleaseStages: ['production'], releaseStage: 'development' })
+
       client._setDelivery(client => ({
         sendSession: () => {},
-        sendEvent: (payload, cb) => cb(null)
+        sendEvent: () => { done('sendEvent() should not be called') }
       }))
+
       // @ts-ignore
       client.notify(new Error('111'), {}, (err, event) => {
         expect(err).toBe(null)
@@ -377,10 +399,12 @@ describe('@bugsnag/core/client', () => {
 
     it('should call the callback even if the event doesn’t send (onError)', done => {
       const client = new Client({ apiKey: 'API_KEY', onError: () => false })
+
       client._setDelivery(client => ({
         sendSession: () => {},
-        sendEvent: (payload, cb) => cb(null)
+        sendEvent: () => { done('sendEvent() should not be called') }
       }))
+
       // @ts-ignore
       client.notify(new Error('111'), {}, (err, event) => {
         expect(err).toBe(null)
@@ -462,7 +486,7 @@ describe('@bugsnag/core/client', () => {
       let calls = 0
       const client = new Client({
         apiKey: 'API_KEY_YEAH',
-        onBreadcrumb: b => {
+        onBreadcrumb: () => {
           calls++
           return false
         }
@@ -476,7 +500,7 @@ describe('@bugsnag/core/client', () => {
       let calls = 0
       const client = new Client({
         apiKey: 'API_KEY_YEAH',
-        onBreadcrumb: b => {
+        onBreadcrumb: () => {
           calls++
           throw new Error('uh oh')
         }
@@ -560,7 +584,7 @@ describe('@bugsnag/core/client', () => {
     })
 
     it('does not start the session if onSession returns false', () => {
-      const client = new Client({ apiKey: 'API_KEY', onSession: s => false })
+      const client = new Client({ apiKey: 'API_KEY', onSession: () => false })
       const sessionDelegate = {
         startSession: () => {},
         pauseSession: () => {},
@@ -577,7 +601,7 @@ describe('@bugsnag/core/client', () => {
     it('tolerates errors in onSession callbacks', () => {
       const client = new Client({
         apiKey: 'API_KEY',
-        onSession: s => {
+        onSession: () => {
           throw new Error('oh no')
         }
       })

packages/expo-cli/lib/insert.js

@@ -35,7 +35,7 @@ Bugsnag.start();
 
 const getCode = async (projectRoot) => {
   const manifestRange = await detectInstalled(projectRoot)
-  const isPostV7 = !manifestRange || semver.satisfies('7.0.0', manifestRange)
+  const isPostV7 = !manifestRange || semver.ltr('6.99.99', manifestRange)
   return code[isPostV7 ? 'postV7' : 'preV7']
 }
 

packages/expo-cli/lib/test/fixtures/already-installed-01/App.js

@@ -0,0 +1,21 @@
+const React = require('react')
+const { StyleSheet, Text, View } = require('react-native')
+
+export default class App extends React.Component {
+  render () {
+    return (
+      <View style={styles.container}>
+        <Text>Hello Expo!</Text>
+      </View>
+    )
+  }
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center'
+  }
+})

packages/expo-cli/lib/test/fixtures/already-installed-01/app.json

@@ -0,0 +1,39 @@
+{
+  "expo": {
+    "name": "Bugsnag test fixture",
+    "slug": "bugsnag-test-fixture",
+    "privacy": "unlisted",
+    "sdkVersion": "32.0.0",
+    "platforms": [
+      "ios",
+      "android"
+    ],
+    "version": "1.0.0",
+    "orientation": "portrait",
+    "icon": "./assets/icon.png",
+    "splash": {
+      "image": "./assets/splash.png",
+      "resizeMode": "contain",
+      "backgroundColor": "#ffffff"
+    },
+    "updates": {
+      "fallbackToCacheTimeout": 0
+    },
+    "assetBundlePatterns": [
+      "**/*"
+    ],
+    "extra": {
+      "bugsnag": {
+        "apiKey": "XoXoXoXoXoXo"
+      }
+    },
+    "hooks": {
+      "postPublish": [
+        {
+          "file": "@bugsnag/expo/hooks/post-publish.js",
+          "config": {}
+        }
+      ]
+    }
+  }
+}

packages/expo-cli/lib/test/fixtures/already-installed-01/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "bugsnag-test-fixture-05",
+  "private": "true",
+  "version": "0.0.0",
+  "dependencies": {
+    "@bugsnag/expo": "^7.0.1"
+  }
+}

packages/expo-cli/lib/test/insert.test.js

@@ -58,4 +58,12 @@ describe('expo-cli: insert', () => {
     const appJs = await promisify(readFile)(`${projectRoot}/App.js`, 'utf8')
     expect(appJs).toMatch(/^import bugsnag from '@bugsnag\/expo';\sconst bugsnagClient = bugsnag\(\);\s/)
   })
+
+  it('inserts correct code for post v7.0.0 versions of Bugsnag', async () => {
+    const projectRoot = await prepareFixture('already-installed-01')
+    const msg = await insert(projectRoot)
+    expect(msg).toBe(undefined)
+    const appJs = await promisify(readFile)(`${projectRoot}/App.js`, 'utf8')
+    expect(appJs).toMatch(/^import Bugsnag from '@bugsnag\/expo';\sBugsnag\.start\(\);\s/)
+  })
 })

packages/plugin-express/types/bugsnag-express.d.ts

@@ -1,5 +1,5 @@
 import { Plugin, Client } from '@bugsnag/core'
-import express from 'express'
+import * as express from 'express'
 
 declare const bugsnagPluginExpress: Plugin
 export default bugsnagPluginExpress