using emoji from emotikon

yatharthx · Feb 8, 2017 · 02f92cd · 02f92cd
1 parent 711103b
commit 02f92cd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/__tests__/emoji.spec.js b/__tests__/emoji.spec.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 import { Emoji } from '../src'
-import emoji from '../src/emoji/emoji.json'
+import emoji from 'emotikon'
 
 test('Emoji provides `emoji` and `emojify`', t => {
   t.is(typeof Emoji.emoji, 'object')

diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "babel-preset-stage-2": "^6.18.0",
     "babel-register": "^6.22.0",
     "coveralls": "^2.11.15",
+    "emotikon": "^1.0.0",
     "enzyme": "^2.7.1",
     "eslint": "^3.14.0",
     "eslint-config-standard": "^6.2.1",

diff --git a/src/emoji/emoji.js b/src/emoji/emoji.js
@@ -1,4 +1,4 @@
-import emoji from './emoji.json'
+import emoji from 'emotikon'
 
 const tplSplitter = tpl => tpl.split(/:([a-zA-Z0-9_\-+]+):/g)
 const colonTrimmer = emo => emo.replace(/^[:\uFEFF\xA0]+|[:\uFEFF\xA0]+$/g, '')

diff --git a/src/emoji/emoji.json b/src/emoji/emoji.json
diff --git a/yarn.lock b/yarn.lock
@@ -1692,6 +1692,10 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
+emotikon@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/emotikon/-/emotikon-1.0.0.tgz#b988c808127ad5ce95e841b6981d3860bbd681a3"
+
 empower-core@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/empower-core/-/empower-core-0.6.1.tgz#6c187f502fcef7554d57933396aac655483772b1"
@@ -2850,20 +2854,13 @@ js-tokens@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.0.tgz#a2f2a969caae142fb3cd56228358c89366957bd1"
 
-js-yaml@3.6.1:
+js-yaml@3.6.1, js-yaml@^3.5.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-js-yaml@^3.5.1:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
 jsbn@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"
@@ -2987,10 +2984,6 @@ loader-utils@^0.2.11:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
 lodash.assignin@^4.0.9:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"