Migrate to new fusion-tokens api

#62

Author: ganemone

package.json

@@ -36,8 +36,8 @@
     "eslint-plugin-prettier": "2.5.0",
     "eslint-plugin-react": "7.6.1",
     "flow-bin": "0.64.0",
-    "fusion-core": "^0.3.0-4",
-    "fusion-tokens": "0.0.5",
+    "fusion-core": "^0.3.1",
+    "fusion-tokens": "^0.0.6",
     "nyc": "11.4.1",
     "prettier": "1.10.2",
     "react": "16.2.0",
@@ -48,8 +48,8 @@
     "unitest": "2.1.1"
   },
   "peerDependencies": {
-    "fusion-core": "^0.3.0-4",
-    "fusion-tokens": "0.0.5",
+    "fusion-core": "^0.3.1",
+    "fusion-tokens": "^0.0.6",
     "react": "14.x - 16.x",
     "react-redux": ">=5.0.6",
     "redux": ">=3.7.2"

src/browser.js

@@ -18,8 +18,8 @@ export default __BROWSER__ &&
   createPlugin({
     deps: {
       reducer: ReducerToken,
-      preloadedState: PreloadedStateToken,
-      enhancer: EnhancerToken,
+      preloadedState: PreloadedStateToken.optional,
+      enhancer: EnhancerToken.optional,
     },
     provides({reducer, preloadedState, enhancer}) {
       class Redux {

src/server.js

@@ -20,9 +20,9 @@ export default __NODE__ &&
   createPlugin({
     deps: {
       reducer: ReducerToken,
-      preloadedState: PreloadedStateToken,
-      enhancer: EnhancerToken,
-      getInitialState: InitialStateToken,
+      preloadedState: PreloadedStateToken.optional,
+      enhancer: EnhancerToken.optional,
+      getInitialState: InitialStateToken.optional,
     },
     provides({reducer, preloadedState, enhancer, getInitialState}) {
       class Redux {

src/tokens.js

@@ -4,13 +4,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {createToken, createOptionalToken} from 'fusion-tokens';
+import {createToken} from 'fusion-core';
 
 export const ReduxToken = createToken('ReduxToken');
 export const ReducerToken = createToken('ReducerToken');
-export const PreloadedStateToken = createOptionalToken(
-  'PreloadedStateToken',
-  null
-);
-export const EnhancerToken = createOptionalToken('EnhancerToken', null);
-export const InitialStateToken = createOptionalToken('InitialStateToken', null);
+export const PreloadedStateToken = createToken('PreloadedStateToken');
+export const EnhancerToken = createToken('EnhancerToken');
+export const InitialStateToken = createToken('InitialStateToken');

yarn.lock

@@ -660,14 +660,6 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@babel/[email protected]":
-  version "7.0.0-beta.39"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.39.tgz#2ea0d97efe4781688751edc68cde640d6559938c"
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.0.0"
-
 "@rtsao/babel-preset-env@^7.0.0-beta.31":
   version "7.0.0-beta.31"
   resolved "https://registry.yarnpkg.com/@rtsao/babel-preset-env/-/babel-preset-env-7.0.0-beta.31.tgz#ac7e56227a41af3aa3a06d352c9ea6b8fb2f620a"
@@ -2411,18 +2403,18 @@ functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
 
-fusion-core@^0.3.0-4:
-  version "0.3.0-7"
-  resolved "https://registry.yarnpkg.com/fusion-core/-/fusion-core-0.3.0-7.tgz#de5ee13ec30e0f6b4773c484d21d82e8d587ddb9"
+fusion-core@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/fusion-core/-/fusion-core-0.3.1.tgz#2bf90f1b3eb5dbfec8a7659f8a368d3ff9fcd6dd"
   dependencies:
     koa "^2.3.0"
     koa-compose "^4.0.0"
     node-mocks-http "^1.6.6"
     toposort "^1.0.6"
 
-[email protected].5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/fusion-tokens/-/fusion-tokens-0.0.5.tgz#71af057ab696046c43e89ca06dfe47cdbaeac6d8"
+fusion-tokens@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/fusion-tokens/-/fusion-tokens-0.0.6.tgz#71606a0109918dc098eb43cc0a3b877beb111d4d"
 
 gauge@~2.7.3:
   version "2.7.4"