fix: Web compatibility (#351)

* build: use bob to comply with web target
* docs: remove v2 mention
* fix: make mock typeless, commonjs module
* ci: update node image version
* build: change file naming, copy flow files
* docs: mention supported platforms

Author: Krzysztof

.circleci/config.yml

@@ -18,7 +18,7 @@ checkout step for each job: &addWorkspace
 default config for js: &js_defaults
   <<: *defaults
   docker:
-    - image: circleci/node:8
+    - image: circleci/node:10
 
 default config for macOS: &macos_defaults
   <<: *defaults
@@ -158,7 +158,7 @@ jobs:
       - save-cache: *cache_save_yarn
       - restore_cache:
           key: 1-gems-{{ checksum "example/ios/Gemfile.lock" }}
-      - run: 
+      - run:
           name: Install CocoaPods
           command: cd example/ios && bundle check || bundle install --path vendor/bundle
       - save_cache:

.flowconfig

@@ -39,7 +39,7 @@ munge_underscores=true
 server.max_workers=1
 
 # Support the library import in examples
-module.name_mapper='^\@react-native-community/async-storage$' -> '<PROJECT_ROOT>/lib/AsyncStorage.js'
+module.name_mapper='^\@react-native-community/async-storage$' -> '<PROJECT_ROOT>/src/AsyncStorage.js'
 
 module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'

.gitignore

@@ -25,11 +25,11 @@ project.xcworkspace
 
 # Android/IntelliJ
 #
-build/
 .idea
 .gradle
 local.properties
 *.iml
+android/build
 android/gradle/
 android/gradlew
 android/gradlew.bat
@@ -49,3 +49,6 @@ buck-out/
 .vscode
 .expo
 /web-build
+
+# builds by bob
+lib/

.npmignore

@@ -4,24 +4,17 @@ yarn.lock
 
 # Project files
 CONTRIBUTING.md
-CODE_OF_CONDUCT.md
 README.md
 
 # Config files
-.babelrc
 babel.config.js
-.editorconfig
 .eslintrc
 .flowconfig
 .watchmanconfig
-jsconfig.json
 .npmrc
-.gitattributes
 .circleci
 *.coverage.json
 .opensource
-.circleci
-.eslintignore
 codecov.yml
 
 # Scripts
@@ -70,10 +63,8 @@ ios/build/
 # Misc
 .DS_Store
 .DS_Store?
-*.DS_Store
 coverage.android.json
 coverage.ios.json
-coverage
 npm-debug.log
 .github
 ._*
@@ -83,8 +74,5 @@ ehthumbs.db
 Thumbs.dbandroid/gradle
 docs
 .idea
-tests/
 bin/test.js
 codorials
-.vscode
-.nyc_output

README.md

@@ -3,9 +3,14 @@
 An asynchronous, unencrypted, persistent, key-value storage system for React Native.
 
 
-### AsyncStorage v2 is out!
+## Supported platforms
+
+- iOS
+- Android
+- [Web](https://github.com/react-native-community/async-storage/releases/tag/v1.9.0)
+- [MacOS](https://github.com/react-native-community/async-storage/releases/tag/v1.8.1)
+- [Windows](https://github.com/react-native-community/async-storage/releases/tag/v1.10.0)
 
-Release Candidate for AsyncStorage v2 is out. More info [can be found here.](https://git.io/JeSSQ).
 
 ## Getting Started
 
@@ -35,14 +40,15 @@ $ cd ios && pod install
 $ react-native link @react-native-community/async-storage
 ```
 
-See docs for [manual linking guide](docs/Linking.md)
+*Note:* For `macOS` and `Windows` the [manual linking](docs/Linking.md) is currently the only linking option.
+
 
-*Note* For `macOS` the [manual linking](docs/Linking.md) is currently the only linking option.
+See docs for [manual linking guide.](docs/Linking.md)
 
 ### **Upgrading to React Native *0.60+*** 
 
-New React Native comes with `autolinking` feature, which automatically links Native Modules in your project.
-In order to get it to work, make sure you `unlink` `Async Storage` first:
+React Native 0.60+ comes with `autolinking` feature, which automatically links Native Modules in your project.
+In order to get it to work, make sure you `unlink` `Async Storage` first (if you had linked it before):
 
 ```bash
 $ react-native unlink @react-native-community/async-storage

jest/async-storage-mock.js

@@ -1,66 +1,52 @@
 /**
  * @format
- * @flow
  */
 
-type KeysType = Array<string>;
-type KeyValueType = Array<Array<*>>;
-type CallbackType = ((?Error) => void) | void;
-type ItemGetCallbackType = ((?Error, ?string) => void) | void;
-type ResultCallbackType = ((?Error, ?KeyValueType) => void) | void;
-
 const asMock = {
   __INTERNAL_MOCK_STORAGE__: {},
 
-  setItem: jest.fn<[string, string, CallbackType], Promise<*>>(
-    async (key: string, value: string, callback: CallbackType) => {
-      const setResult = await asMock.multiSet([[key, value]], undefined);
+  setItem: jest.fn(async (key, value, callback) => {
+    const setResult = await asMock.multiSet([[key, value]], undefined);
 
-      callback && callback(setResult);
-      return setResult;
-    },
-  ),
-  getItem: jest.fn<[string, ItemGetCallbackType], Promise<*>>(
-    async (key: string, callback: ItemGetCallbackType) => {
-      const getResult = await asMock.multiGet([key], undefined);
+    callback && callback(setResult);
+    return setResult;
+  }),
 
-      const result = getResult[0] ? getResult[0][1] : null;
+  getItem: jest.fn(async (key, callback) => {
+    const getResult = await asMock.multiGet([key], undefined);
 
-      callback && callback(null, result);
-      return result;
-    },
-  ),
-  removeItem: jest.fn<[string, CallbackType], Promise<null>>(
-    (key: string, callback: CallbackType) =>
-      asMock.multiRemove([key], callback),
-  ),
-  mergeItem: jest.fn<[string, string, CallbackType], Promise<*>>(
-    (key: string, value: string, callback: CallbackType) =>
-      asMock.multiMerge([[key, value]], callback),
+    const result = getResult[0] ? getResult[0][1] : null;
+
+    callback && callback(null, result);
+    return result;
+  }),
+
+  removeItem: jest.fn((key, callback) => asMock.multiRemove([key], callback)),
+  mergeItem: jest.fn((key, value, callback) =>
+    asMock.multiMerge([[key, value]], callback),
   ),
 
-  clear: jest.fn<[CallbackType], Promise<*>>(_clear),
-  getAllKeys: jest.fn<[], Promise<string[]>>(_getAllKeys),
-  flushGetRequests: jest.fn<[], void>(),
+  clear: jest.fn(_clear),
+  getAllKeys: jest.fn(_getAllKeys),
+  flushGetRequests: jest.fn(),
 
-  multiGet: jest.fn<[KeysType, ResultCallbackType], Promise<*>>(_multiGet),
-  multiSet: jest.fn<[KeyValueType, CallbackType], Promise<*>>(_multiSet),
-  multiRemove: jest.fn<[KeysType, CallbackType], Promise<*>>(_multiRemove),
-  multiMerge: jest.fn<[KeyValueType, CallbackType], Promise<*>>(_multiMerge),
+  multiGet: jest.fn(_multiGet),
+  multiSet: jest.fn(_multiSet),
+  multiRemove: jest.fn(_multiRemove),
+  multiMerge: jest.fn(_multiMerge),
 };
 
-async function _multiSet(keyValuePairs: KeyValueType, callback: CallbackType) {
+async function _multiSet(keyValuePairs, callback) {
   keyValuePairs.forEach(keyValue => {
     const key = keyValue[0];
-    const value = keyValue[1];
 
-    asMock.__INTERNAL_MOCK_STORAGE__[key] = value;
+    asMock.__INTERNAL_MOCK_STORAGE__[key] = keyValue[1];
   });
   callback && callback(null);
   return null;
 }
 
-async function _multiGet(keys: KeysType, callback: ResultCallbackType) {
+async function _multiGet(keys, callback) {
   const values = keys.map(key => [
     key,
     asMock.__INTERNAL_MOCK_STORAGE__[key] || null,
@@ -70,7 +56,7 @@ async function _multiGet(keys: KeysType, callback: ResultCallbackType) {
   return values;
 }
 
-async function _multiRemove(keys: KeysType, callback: CallbackType) {
+async function _multiRemove(keys, callback) {
   keys.forEach(key => {
     if (asMock.__INTERNAL_MOCK_STORAGE__[key]) {
       delete asMock.__INTERNAL_MOCK_STORAGE__[key];
@@ -81,7 +67,7 @@ async function _multiRemove(keys: KeysType, callback: CallbackType) {
   return null;
 }
 
-async function _clear(callback: CallbackType) {
+async function _clear(callback) {
   asMock.__INTERNAL_MOCK_STORAGE__ = {};
 
   callback && callback(null);
@@ -93,19 +79,16 @@ async function _getAllKeys() {
   return Object.keys(asMock.__INTERNAL_MOCK_STORAGE__);
 }
 
-async function _multiMerge(
-  keyValuePairs: KeyValueType,
-  callback: CallbackType,
-) {
+async function _multiMerge(keyValuePairs, callback) {
   keyValuePairs.forEach(keyValue => {
     const key = keyValue[0];
     const value = JSON.parse(keyValue[1]);
 
     const oldValue = JSON.parse(asMock.__INTERNAL_MOCK_STORAGE__[key]);
 
-    const processedValue = JSON.stringify(_deepMergeInto(oldValue, value));
-
-    asMock.__INTERNAL_MOCK_STORAGE__[key] = processedValue;
+    asMock.__INTERNAL_MOCK_STORAGE__[key] = JSON.stringify(
+      _deepMergeInto(oldValue, value),
+    );
   });
 
   callback && callback(null);
@@ -131,4 +114,4 @@ const _deepMergeInto = (oldObject, newObject) => {
   return mergedObject;
 };
 
-export default asMock;
+module.exports = asMock;

package.json

@@ -2,9 +2,23 @@
   "name": "@react-native-community/async-storage",
   "version": "1.10.0",
   "description": "Asynchronous, persistent, key-value storage system for React Native.",
+  "main": "lib/commonjs/index.js",
+  "module": "lib/module/index.js",
+  "react-native": "src/index.js",
   "types": "./types/index.d.ts",
-  "main": "./lib/index.js",
-  "author": "Krzysztof Borowy <krizzu.dev@gmail.com>",
+  "files": [
+    "lib/",
+    "src/",
+    "jest/",
+    "types/",
+    "android/src",
+    "android/build.gradle",
+    "ios/",
+    "macos/",
+    "window/",
+    "RNCAsyncStorage.podspec"
+  ],
+  "author": "Krzysztof Borowy <hello@krizzu.dev>",
   "contributors": [
     "Evan Bacon <bacon@expo.io> (https://github.com/evanbacon)"
   ],
@@ -22,6 +36,7 @@
     "url": "https://github.com/react-native-community/react-native-async-storage.git"
   },
   "scripts": {
+    "prepare": "bob build",
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "start:android": "react-native run-android --root example/",
     "start:ios": "react-native run-ios --project-path example/ios --scheme AsyncStorageExample",
@@ -33,7 +48,7 @@
     "build:e2e:macos": "scripts/run_macos_e2e.sh 'build'",
     "test": "yarn test:lint && yarn test:flow",
     "test:flow": "flow check",
-    "test:lint": "eslint 'lib/**/*.js' 'example/**/*.js'",
+    "test:lint": "eslint 'src/**/*.js' 'example/**/*.js' 'jest/*.js'",
     "test:e2e:ios": "detox test -c ios",
     "test:e2e:android": "detox test -c android",
     "test:e2e:macos": "scripts/run_macos_e2e.sh 'test'"
@@ -48,6 +63,7 @@
   "devDependencies": {
     "@babel/core": "^7.6.2",
     "@babel/runtime": "^7.6.2",
+    "@react-native-community/bob": "^0.14.0",
     "@react-native-community/cli": "^3.1.0",
     "@react-native-community/cli-platform-android": "^3.1.0",
     "@react-native-community/cli-platform-ios": "^3.1.0",
@@ -92,5 +108,13 @@
         "name": "Emu_E2E"
       }
     }
+  },
+  "@react-native-community/bob": {
+    "source": "src",
+    "output": "lib",
+    "targets": [
+      ["commonjs", {"copyFlow": true}],
+      "module"
+    ]
   }
 }