Migrate to new fusion-tokens api

package.json

@@ -38,17 +38,17 @@
     "eslint-plugin-prettier": "2.5.0",
     "eslint-plugin-react": "7.6.1",
     "flow-bin": "0.64.0",
-    "fusion-core": "0.3.0",
-    "fusion-tokens": "0.0.5",
+    "fusion-core": "^0.3.1",
+    "fusion-tokens": "^0.0.6",
     "node-fetch": "1.7.3",
     "nyc": "11.4.1",
     "prettier": "1.10.2",
     "tape-cup": "4.7.1",
     "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"
   },
   "scripts": {
     "clean": "rm -rf dist",
@@ -63,4 +63,4 @@
   "engines": {
     "node": ">= 8.9.0"
   }
-}
+}

src/__tests__/test.node.js

@@ -6,18 +6,18 @@
 
 // @flow
 import tape from 'tape-cup';
-import App from 'fusion-core';
+import App, {createToken} from 'fusion-core';
+import type {Token} from 'fusion-core';
 import {createServer} from 'http';
 import fetch from 'node-fetch';
-import {createToken} from 'fusion-tokens';
 import JWTServer, {
   SessionSecretToken,
   SessionCookieNameToken,
   SessionCookieExpiresToken,
 } from '../index';
 import type {SessionService} from '../jwt-server';
 
-const JWTToken: SessionService = createToken('Session');
+const JWTToken: Token<SessionService> = createToken('Session');
 
 tape('JWTServer', async t => {
   const app = new App('fake-element', el => el);

src/jwt-server.js

@@ -14,7 +14,7 @@ import get from 'just-safe-get';
 import set from 'just-safe-set';
 
 import {createPlugin, memoize} from 'fusion-core';
-import type {Context, FusionPlugin} from 'fusion-core';
+import type {Context} from 'fusion-core';
 
 import {
   SessionSecretToken,
@@ -67,18 +67,17 @@ class JWTSession {
 }
 
 export type SessionService = {from: (ctx: Context) => JWTSession};
-type SessionPluginType = FusionPlugin<JWTConfig, SessionService>;
-const p: SessionPluginType =
+const p =
   // $FlowFixMe
   __NODE__ &&
   createPlugin({
     deps: {
       secret: SessionSecretToken,
       cookieName: SessionCookieNameToken,
-      expires: SessionCookieExpiresToken,
+      expires: SessionCookieExpiresToken.optional,
     },
     provides: deps => {
-      const {secret, cookieName, expires} = deps;
+      const {secret, cookieName, expires = 86400} = deps;
       const service = {
         from: memoize((ctx: Context) => {
           return new JWTSession(ctx, {secret, cookieName, expires});
@@ -87,7 +86,7 @@ const p: SessionPluginType =
       return service;
     },
     middleware: (deps, service) => {
-      const {secret, cookieName, expires} = deps;
+      const {secret, cookieName, expires = 86400} = deps;
       return async function jwtMiddleware(
         ctx: Context,
         next: () => Promise<void>

src/tokens.js

@@ -1,9 +1,11 @@
 // @flow
-import {createToken, createOptionalToken} from 'fusion-tokens';
+import type {Token} from 'fusion-core';
+import {createToken} from 'fusion-core';
 
-export const SessionSecretToken: string = createToken('SessionSecret');
-export const SessionCookieNameToken: string = createToken('SessionCookieName');
-export const SessionCookieExpiresToken: number = createOptionalToken(
-  'SessionCookieExpires',
-  86400
+export const SessionSecretToken: Token<string> = createToken('SessionSecret');
+export const SessionCookieNameToken: Token<string> = createToken(
+  'SessionCookieName'
+);
+export const SessionCookieExpiresToken: Token<number> = createToken(
+  'SessionCookieExpires'
 );

yarn.lock

@@ -702,8 +702,8 @@ acorn-jsx@^3.0.0:
     acorn "^3.0.4"
 
 acorn@>=2.5.2, acorn@^5.0.0, acorn@^5.2.1:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
 acorn@^3.0.4:
   version "3.3.0"
@@ -1680,8 +1680,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.3.30:
-  version "1.3.31"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz#00d832cba9fe2358652b0c48a8816c8e3a037e9f"
+  version "1.3.32"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz#11d0684c0840e003c4be8928f8ac5f35dbc2b4e6"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2257,18 +2257,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:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/fusion-core/-/fusion-core-0.3.0.tgz#0ce2a5b17c2e1948f05fbcdee808c7bcf5d8eadf"
+fusion-core@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/fusion-core/-/fusion-core-0.3.3.tgz#2be141a18afe93963469998c3076ac9ed99f798a"
   dependencies:
     koa "^2.3.0"
     koa-compose "^4.0.0"
     node-mocks-http "^1.6.6"
     toposort "^1.0.6"
 
-fusion-tokens@0.0.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"
@@ -3255,8 +3255,8 @@ mime@^1.3.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
 
 mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
 minimalistic-assert@^1.0.0:
   version "1.0.0"
@@ -4070,8 +4070,8 @@ rollup-pluginutils@^2.0.1:
     micromatch "^2.3.11"
 
 rollup@^0.55.1:
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.55.1.tgz#baf4f23abe3014b29e56dea7d72d9946e56ac7dd"
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.55.3.tgz#0af082a766d51c3058430c8372442ff5207d8736"
 
 run-async@^2.2.0:
   version "2.3.0"