refs micnews#24 - re-introduce deku as virtual-element was breaking a…

…rticle-json-to-fbia rendering

lib/render-iframe.js

@@ -1,5 +1,5 @@
 /* eslint-disable deku/no-unknown-property */
-import element from 'virtual-element';
+import {element} from 'deku';
 
 export default ({src, width, height, allowFullscreen}) =>
   <iframe

lib/render-text.js

@@ -1,4 +1,4 @@
-import element from 'virtual-element';
+import {element} from 'deku';
 
 export default text =>
   (text || []).map(({content, href}) =>

lib/types/facebook.js

@@ -1,5 +1,5 @@
 const type = 'facebook';
-import element from 'virtual-element';
+import {element} from 'deku';
 import parseText from '../parse-text';
 import renderText from '../render-text';
 import parseInput from '../parse-input';

lib/types/image.js

@@ -1,5 +1,5 @@
 import getDimensions from '../dimensions';
-import element from 'virtual-element';
+import {element} from 'deku';
 
 export const parse = ([elm]) => {
   const tagName = elm.tagName.toLowerCase();

lib/types/instagram/render.js

@@ -1,7 +1,7 @@
 /* eslint-disable deku/no-unknown-property */
 // ^^^ is needed to not get errors around datetime="" below
 
-import element from 'virtual-element';
+import {element} from 'deku';
 
 const renderWithCaption = ({url, text, user, date}) =>
   (<blockquote class='instagram-media' data-instgrm-captioned data-instgrm-version='6' style=' background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:658px; padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100% - 2px);'>

lib/types/twitter.js

@@ -1,6 +1,6 @@
 import find from 'lodash.find';
 import last from 'lodash.last';
-import element from 'virtual-element';
+import {element} from 'deku';
 import parseText from '../parse-text';
 import renderText from '../render-text';
 

lib/types/video.js

@@ -1,6 +1,6 @@
 import getDimensions from '../dimensions';
 import map from 'lodash.map';
-import element from 'virtual-element';
+import {element} from 'deku';
 
 const type = 'video';
 

package.json

@@ -35,7 +35,6 @@
     "babelify": "^7.2.0",
     "brfs": "^1.4.3",
     "browserify": "^13.0.0",
-    "deku": "^1.0.0",
     "electron-prebuilt": "^0.37.7",
     "faucet": "0.0.1",
     "hyperscript": "^1.4.7",
@@ -49,13 +48,13 @@
   },
   "dependencies": {
     "embedly-url": "^1.0.0",
+    "deku": "^2.0.0-rc16",
     "get-youtube-id": "^1.0.0",
     "lodash.find": "^4.2.0",
     "lodash.foreach": "^4.2.0",
     "lodash.last": "^3.0.0",
     "lodash.map": "^4.2.1",
     "lodash.startswith": "^4.0.0",
-    "lodash.values": "^4.1.0",
-    "virtual-element": "^1.2.0"
+    "lodash.values": "^4.1.0"
   }
 }

test/parse-render-test.js

@@ -2,7 +2,7 @@ import test from './tape-wrapper';
 
 import fixtures from './fixtures';
 import {render, parse as _parse} from '../lib';
-import {renderString, tree} from 'deku';
+import {string} from 'deku';
 import queryDom from 'query-dom';
 
 const parse = process.browser
@@ -14,7 +14,7 @@ const parse = process.browser
   : str => _parse(queryDom(str));
 
 const parseAndRender = input =>
-  renderString(tree(render(parse(input))));
+  string.render(render(parse(input)));
 
 test('parse() + render() facebook - post', t => {
   const input = fixtures.facebookPost;

test/render-test.js

@@ -1,11 +1,11 @@
 import test from './tape-wrapper';
 import {render as _render} from '../lib';
 import tsml from 'tsml';
-import {renderString, tree} from 'deku';
+import {string} from 'deku';
 import fixtures from './fixtures';
 import renderText from '../lib/render-text';
 
-const render = opts => renderString(tree(_render(opts)));
+const render = opts => string.render(_render(opts));
 
 test('render() img', t => {
   const actual = render({