Merge branch 'master' into patch-1

Author: bang9

CHANGELOG.md

@@ -1,3 +1,18 @@
+### 5.8.0 (December 6, 2019)
+* Add support to defer saving an amplitude cookie and logging events until a user has opted in
+
+### 5.7.1 (December 2, 2019)
+* Fix issue where null unsentKey and unsentIdentifyKeys were causing log crashes
+
+### 5.7.0 (November 22, 2019)
+* Namespace AsyncStorage with api key to prevent cross domain contamination
+
+### 5.6.0 (October 21, 2019)
+
+* Drop esm module from package.json to prevent it from being the default build.
+* Add fallback localStorage support to the esm module.
+* Fix integrity hash
+
 ### 5.5.0 (October 9, 2019)
 
 * Fix bug where optOut settings would be overridden by cookie loading

README.md

@@ -11,7 +11,7 @@ Please see our [installation guide](https://amplitude.zendesk.com/hc/en-us/artic
 [![npm version](https://badge.fury.io/js/amplitude-js.svg)](https://badge.fury.io/js/amplitude-js)
 [![Bower version](https://badge.fury.io/bo/amplitude-js.svg)](https://badge.fury.io/bo/amplitude-js)
 
-[5.5.0 - Released on October 9, 2019](https://github.com/amplitude/Amplitude-JavaScript/releases/latest)
+[5.8.0 - Released on December 6, 2019](https://github.com/amplitude/Amplitude-JavaScript/releases/latest)
 
 
 # JavaScript SDK Reference #
@@ -25,6 +25,13 @@ See our [JavaScript SDK Reference](https://amplitude.zendesk.com/hc/en-us/articl
 # Changelog #
 Click [here](https://github.com/amplitude/Amplitude-JavaScript/blob/master/CHANGELOG.md) to view the JavaScript SDK Changelog.
 
+# React Native #
+
+This library now supports react-native. It has two dependencies on react-native modules you will have to install yourself:
+
+* [react-native-device-info](https://www.npmjs.com/package/react-native-device-info)
+* [@react-native-community/async-storage](https://www.npmjs.com/package/@react-native-community/async-storage)
+
 # Upgrading Major Versions and Breaking Changes #
 
 ## 5.0

package.json

@@ -1,7 +1,7 @@
 {
   "name": "amplitude-js",
   "author": "Amplitude <support@amplitude.com>",
-  "version": "5.5.0",
+  "version": "5.8.0",
   "license": "MIT",
   "description": "Javascript library for Amplitude Analytics",
   "keywords": [
@@ -10,7 +10,6 @@
   ],
   "repository": "git://github.com/amplitude/amplitude-javascript.git",
   "main": "amplitude.js",
-  "module": "amplitude.esm.js",
   "react-native": "amplitude.native.js",
   "dependencies": {
     "@amplitude/ua-parser-js": "0.7.20",

rollup.config.js

@@ -22,8 +22,8 @@ export default {
     }),
     replace({
       BUILD_COMPAT_SNIPPET: 'true',
-      BUILD_COMPAT_2_0: 'true',
       BUILD_COMPAT_LOCAL_STORAGE: 'true',
+      BUILD_COMPAT_2_0: 'true',
       BUILD_COMPAT_REACT_NATIVE: 'false',
     }),
     commonjs(),

rollup.esm.js

@@ -22,9 +22,9 @@ export default {
     }),
     replace({
       BUILD_COMPAT_SNIPPET: 'false',
-      BUILD_COMPAT_2_0: 'false',
+      BUILD_COMPAT_LOCAL_STORAGE: 'true',
+      BUILD_COMPAT_2_0: 'true',
       BUILD_COMPAT_REACT_NATIVE: 'false',
-      BUILD_COMPAT_LOCAL_STORAGE: 'false',
     }),
     commonjs({
       include: "node_modules/**"