Merge branch 'next' into convert-tests-to-jest-4

* next:
  hash is not required
  include client-side sourcemap upload example
  Tests: Update local-test-util script to use same dockerfile base as others
  v7.3.3
  Organise the changelog into sections
  Update changelog
  test(plugin-contextualize): convert tests
  test(plugin-client-ip): convert tests
  fix(lerna): replace all non-server characters in branch names when publishing
  chore: clean test dependencies
  test(plugin-react-native-client-sync): convert tests
  Tests: Ensure tests use latest V2 mazerunner release
  docs: Fix typos in upgrade guide
  Tests: Improve duplicate request resilience using reset_with_timeout

CHANGELOG.md

@@ -1,12 +1,20 @@
 # Changelog
 
-## TBD
+## 7.3.3 (2020-08-26)
+
+### Added
 
-- (plugin-angular): Update bundles and package entrypoints to support the Ivy renderer. [#994](https://github.com/bugsnag/bugsnag-js/pull/994)
 - (plugin-react): Make type definitions `BugsnagErrorBoundary` and `BugsnagPluginReactResult` available for external use. [934](https://github.com/bugsnag/bugsnag-js/pull/934) / [#1009](https://github.com/bugsnag/bugsnag-js/pull/1009)
+
+### Changed
+
+- Use a peer dependency on @bugsnag/core in plugins [#1012](https://github.com/bugsnag/bugsnag-js/pull/1012)
+
+### Fixed
+
 - (expo): Ensure type definitions allow config to be supplied without an `apiKey`, as it may be supplied in `app.json` instead. [#1010](https://github.com/bugsnag/bugsnag-js/pull/1010)
+- (plugin-angular): Update bundles and package entrypoints to support the Ivy renderer. [#994](https://github.com/bugsnag/bugsnag-js/pull/994)
 - (react-native): Add `codeBundleId` to config type definition. [#1011](https://github.com/bugsnag/bugsnag-js/pull/1011)
-- Use a peer dependency on @bugsnag/core in plugins [#1012](https://github.com/bugsnag/bugsnag-js/pull/1012)
 
 ## 7.3.2 (2020-08-17)
 

bin/local-test-util

@@ -247,6 +247,6 @@ async function runTests (args) {
     `-v`, `${process.cwd()}/test/browser/:/app/test/browser`,
     `-w`, `/app/test/browser`,
     `-p`, `9020:9020`,
-    `855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-cli`
+    `855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-v2-cli`
   ].concat(args || []))
 }

dockerfiles/Dockerfile.browser

@@ -45,7 +45,7 @@ RUN find . -name package.json -type f -mindepth 2 -maxdepth 3 ! -path "./node_mo
 RUN rm -fr **/*/node_modules/
 
 # The maze-runner browser tests
-FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-cli as browser-maze-runner
+FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-v2-cli as browser-maze-runner
 RUN apk add --no-cache ruby-dev build-base libffi-dev curl-dev
 ENV GLIBC_VERSION 2.23-r3
 

dockerfiles/Dockerfile.expo

@@ -1,5 +1,5 @@
 # CI test image for unit/lint/type tests
-FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-cli as expo-maze-runner
+FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-v2-cli as expo-maze-runner
 RUN apk add --no-cache ruby-dev build-base libffi-dev curl-dev curl
 COPY /test/expo /app/test/expo
 WORKDIR /app/test/expo

dockerfiles/Dockerfile.node

@@ -21,7 +21,7 @@ RUN npm pack --verbose packages/plugin-koa/
 RUN npm pack --verbose packages/plugin-restify/
 
 # The maze-runner node tests
-FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-cli as node-maze-runner
+FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-v2-cli as node-maze-runner
 WORKDIR /app/
 COPY packages/node/ .
 COPY test/node test/node

dockerfiles/Dockerfile.react-native

@@ -1,5 +1,5 @@
 # CI test image for unit/lint/type tests
-FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:typed-platform-checks-ci
+FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:latest-v2-cli
 RUN apk add --no-cache ruby-dev build-base libffi-dev curl-dev curl
 COPY /test/react-native /app/test/react-native
 WORKDIR /app/test/react-native

examples/js/nuxtjs/README.md

@@ -56,7 +56,7 @@ build: {
 
 		if (!isDev && isClient) {
 
-			config.devtool = '#source-map'
+			config.devtool = 'source-map'
 
 		 	config.plugins.push(
 				new BugsnagSourceMapUploaderPlugin({

examples/js/nuxtjs/nuxt.config.js

@@ -55,7 +55,20 @@ module.exports = {
     ** You can extend webpack config here
     */
     extend (config, ctx) {
+      if (!isDev && isClient) {
 
+        config.devtool = 'source-map'
+
+        config.plugins.push(
+          new BugsnagSourceMapUploaderPlugin({
+            apiKey: 'YOUR_BROWSER_API_KEY',
+            appVersion: require('./package.json').version,
+            releaseStage: 'production',
+            overwrite: true,
+            publicPath: '*'
+          })
+        )
+      }
     }
   }
 }

jest.config.js

@@ -25,6 +25,7 @@ module.exports = {
         testsForPackage('plugin-browser-context'),
         testsForPackage('plugin-browser-device'),
         testsForPackage('plugin-browser-request'),
+        testsForPackage('plugin-client-ip'),
         testsForPackage('plugin-window-unhandled-rejection'),
         testsForPackage('plugin-window-onerror'),
         testsForPackage('plugin-strip-query-string'),
@@ -42,6 +43,7 @@ module.exports = {
         testsForPackage('plugin-react-native-app-state-breadcrumbs'),
         testsForPackage('plugin-react-native-unhandled-rejection'),
         testsForPackage('plugin-react-native-hermes'),
+        testsForPackage('plugin-react-native-client-sync'),
         testsForPackage('plugin-react-native-event-sync')
       ],
       setupFiles: [
@@ -55,6 +57,7 @@ module.exports = {
       testEnvironment: 'node',
       testMatch: [
         testsForPackage('delivery-node'),
+        testsForPackage('plugin-contextualize'),
         testsForPackage('plugin-server-*'),
         testsForPackage('plugin-strip-project-root'),
         testsForPackage('plugin-intercept'),

lerna.json

@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "7.3.2"
+  "version": "7.3.3"
 }

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bugsnag/browser",
-  "version": "7.3.0",
+  "version": "7.3.3",
   "main": "dist/bugsnag.js",
   "types": "types/bugsnag.d.ts",
   "description": "Bugsnag error reporter for browser JavaScript",
@@ -32,29 +32,29 @@
   "license": "MIT",
   "devDependencies": {
     "@bugsnag/core": "^7.0.1",
-    "@bugsnag/delivery-x-domain-request": "^7.3.0",
-    "@bugsnag/delivery-xml-http-request": "^7.3.0",
-    "@bugsnag/plugin-app-duration": "^7.3.0",
-    "@bugsnag/plugin-browser-context": "^7.3.0",
-    "@bugsnag/plugin-browser-device": "^7.3.0",
-    "@bugsnag/plugin-browser-request": "^7.3.0",
-    "@bugsnag/plugin-browser-session": "^7.3.0",
-    "@bugsnag/plugin-client-ip": "^7.3.0",
-    "@bugsnag/plugin-console-breadcrumbs": "^7.3.0",
-    "@bugsnag/plugin-inline-script-content": "^7.3.0",
-    "@bugsnag/plugin-interaction-breadcrumbs": "^7.3.0",
-    "@bugsnag/plugin-navigation-breadcrumbs": "^7.3.0",
-    "@bugsnag/plugin-network-breadcrumbs": "^7.3.0",
-    "@bugsnag/plugin-simple-throttle": "^7.3.0",
-    "@bugsnag/plugin-strip-query-string": "^7.3.0",
-    "@bugsnag/plugin-window-onerror": "^7.3.0",
-    "@bugsnag/plugin-window-unhandled-rejection": "^7.3.0",
+    "@bugsnag/delivery-x-domain-request": "^7.3.3",
+    "@bugsnag/delivery-xml-http-request": "^7.3.3",
+    "@bugsnag/plugin-app-duration": "^7.3.3",
+    "@bugsnag/plugin-browser-context": "^7.3.3",
+    "@bugsnag/plugin-browser-device": "^7.3.3",
+    "@bugsnag/plugin-browser-request": "^7.3.3",
+    "@bugsnag/plugin-browser-session": "^7.3.3",
+    "@bugsnag/plugin-client-ip": "^7.3.3",
+    "@bugsnag/plugin-console-breadcrumbs": "^7.3.3",
+    "@bugsnag/plugin-inline-script-content": "^7.3.3",
+    "@bugsnag/plugin-interaction-breadcrumbs": "^7.3.3",
+    "@bugsnag/plugin-navigation-breadcrumbs": "^7.3.3",
+    "@bugsnag/plugin-network-breadcrumbs": "^7.3.3",
+    "@bugsnag/plugin-simple-throttle": "^7.3.3",
+    "@bugsnag/plugin-strip-query-string": "^7.3.3",
+    "@bugsnag/plugin-window-onerror": "^7.3.3",
+    "@bugsnag/plugin-window-unhandled-rejection": "^7.3.3",
     "cloudfront": "^0.4.1",
     "knox": "^0.9.2",
     "mime": "1.4.1",
     "semver": "^5.5.1"
   },
   "dependencies": {
-    "@bugsnag/core": "^7.3.0"
+    "@bugsnag/core": "^7.3.3"
   }
 }

packages/core/client.d.ts

@@ -1,4 +1,4 @@
-import { Client, OnErrorCallback, Config, Breadcrumb, Session, OnSessionCallback, OnBreadcrumbCallback, Plugin, Device, App } from './types'
+import { Client, OnErrorCallback, Config, Breadcrumb, Session, OnSessionCallback, OnBreadcrumbCallback, Plugin, Device, App, User } from './types'
 import EventWithInternals from './event'
 
 interface LoggerConfig {
@@ -46,6 +46,8 @@ export default class ClientWithInternals<T extends Config = Config> extends Clie
   _delivery: Delivery
   _setDelivery: (handler: (client: Client) => Delivery) => void
 
+  _user: User
+
   _metadata: { [key: string]: any }
 
   startSession(): ClientWithInternals

packages/core/event.d.ts

@@ -16,6 +16,7 @@ interface HandledState {
 export default class EventWithInternals extends Event {
   constructor (errorClass: string, errorMessage: string, stacktrace: any[], handledState?: HandledState, originalError?: Error)
   _metadata: { [key: string]: any }
+  _user: User
   _handledState: HandledState
   _session?: Session
   toJSON(): {

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bugsnag/core",
   "main": "index.js",
-  "version": "7.3.0",
+  "version": "7.3.3",
   "types": "types/index.d.ts",
   "description": "Core classes and utilities for Bugsnag notifiers",
   "homepage": "https://www.bugsnag.com/",

packages/delivery-expo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bugsnag/delivery-expo",
-  "version": "7.3.0",
+  "version": "7.3.3",
   "main": "delivery.js",
   "description": "@bugsnag/js delivery mechanism to send events and sessions from Expo, using the FileSystem API to cache and retry sending failed payloads",
   "homepage": "https://www.bugsnag.com/",
@@ -24,7 +24,7 @@
     "expo-file-system": "^6.0.2"
   },
   "devDependencies": {
-    "@bugsnag/core": "^7.3.0",
+    "@bugsnag/core": "^7.3.3",
     "jasmine": "3.1.0",
     "nyc": "^12.0.2"
   },

packages/delivery-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bugsnag/delivery-node",
-  "version": "7.3.0",
+  "version": "7.3.3",
   "main": "delivery.js",
   "description": "@bugsnag/node delivery mechanism",
   "homepage": "https://www.bugsnag.com/",
@@ -17,7 +17,7 @@
   "author": "Bugsnag",
   "license": "MIT",
   "devDependencies": {
-    "@bugsnag/core": "^7.3.0"
+    "@bugsnag/core": "^7.3.3"
   },
   "peerDependencies": {
     "@bugsnag/core": "^7.0.0"

packages/delivery-react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bugsnag/delivery-react-native",
-  "version": "7.3.0",
+  "version": "7.3.3",
   "main": "delivery.js",
   "description": "@bugsnag/js delivery mechanism for React Native",
   "homepage": "https://www.bugsnag.com/",
@@ -20,7 +20,7 @@
   "author": "Bugsnag",
   "license": "MIT",
   "devDependencies": {
-    "@bugsnag/core": "^7.3.0",
+    "@bugsnag/core": "^7.3.3",
     "jasmine": "3.1.0",
     "nyc": "^12.0.2"
   },

packages/delivery-x-domain-request/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bugsnag/delivery-x-domain-request",
-  "version": "7.3.0",
+  "version": "7.3.3",
   "main": "delivery.js",
   "description": "@bugsnag/js delivery mechanism for IE 8, 9 and 10",
   "homepage": "https://www.bugsnag.com/",
@@ -17,7 +17,7 @@
   "author": "Bugsnag",
   "license": "MIT",
   "devDependencies": {
-    "@bugsnag/core": "^7.3.0"
+    "@bugsnag/core": "^7.3.3"
   },
   "peerDependencies": {
     "@bugsnag/core": "^7.0.0"

packages/delivery-xml-http-request/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bugsnag/delivery-xml-http-request",
-  "version": "7.3.0",
+  "version": "7.3.3",
   "main": "delivery.js",
   "description": "@bugsnag/js delivery mechanism for most browsers",
   "homepage": "https://www.bugsnag.com/",
@@ -17,7 +17,7 @@
   "author": "Bugsnag",
   "license": "MIT",
   "devDependencies": {
-    "@bugsnag/core": "^7.3.0"
+    "@bugsnag/core": "^7.3.3"
   },
   "peerDependencies": {
     "@bugsnag/core": "^7.0.0"