Fix json embedding in rolledup files

Hopding · Dec 18, 2018 · 08cacef · 08cacef
1 parent cce995c
commit 08cacef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/Makefile.js b/Makefile.js
@@ -22,9 +22,9 @@ target.generateTrieJson = () => {
 
 target.moveTrieJsonToRoot = () => {
  target.generateTrieJson();
- mv('src/opentype/shapers/trie.json', 'trie.json');
- mv('src/opentype/shapers/trieUse.json', 'trieUse.json');
- mv('src/opentype/shapers/trieIndic.json', 'trieIndic.json');
+ // mv('src/opentype/shapers/trie.json', 'trie.json');
+ // mv('src/opentype/shapers/trieUse.json', 'trieUse.json');
+ // mv('src/opentype/shapers/trieIndic.json', 'trieIndic.json');
 };
 
 target.rollupUMD = () => {

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
  "coverage": "cross-env BABEL_ENV=cover nyc mocha",
  "build-bundle": "browserify --insert-globals --standalone fontkit ./index.js | uglifyjs --mangle -c > bundle.js"
  },
- "main": "fonkit.js",
+ "main": "fontkit.js",
  "files": [
  "src",
  "base.js",

diff --git a/src/opentype/shapers/ArabicShaper.js b/src/opentype/shapers/ArabicShaper.js
@@ -4,7 +4,8 @@ import UnicodeTrie from 'unicode-trie';
 
 // Trie is serialized as a Buffer in node, but here
 // we may be running in a browser so we make an Uint8Array
-const trieBuffer = require('./trie.json');
+// const trieBuffer = require('./trie.json');
+import trieBuffer from './trie.json';
 const trieData = new Uint8Array(trieBuffer.data);
 const trie = new UnicodeTrie(trieData);
 // const trie = new UnicodeTrie(require('fs').readFileSync(__dirname + '/data.trie'));

diff --git a/src/opentype/shapers/IndicShaper.js b/src/opentype/shapers/IndicShaper.js
@@ -19,7 +19,8 @@ const {decompositions} = useData;
 
 // Trie is serialized as a Buffer in node, but here
 // we may be running in a browser so we make an Uint8Array
-const trieBuffer = require('./trieIndic.json');
+import trieBuffer from './trieIndic.json';
+// const trieBuffer = require('./trieIndic.json');
 const trieData = new Uint8Array(trieBuffer.data);
 const trie = new UnicodeTrie(trieData);
 // const trie = new UnicodeTrie(require('fs').readFileSync(__dirname + '/indic.trie'));

diff --git a/src/opentype/shapers/UniversalShaper.js b/src/opentype/shapers/UniversalShaper.js
@@ -8,7 +8,8 @@ const {categories, decompositions} = useData;
 
 // Trie is serialized as a Buffer in node, but here
 // we may be running in a browser so we make an Uint8Array
-const trieBuffer = require('./trieUse.json');
+import trieBuffer from './trieUse.json';
+// const trieBuffer = require('./trieUse.json');
 const trieData = new Uint8Array(trieBuffer.data);
 const trie = new UnicodeTrie(trieData);
 // const trie = new UnicodeTrie(require('fs').readFileSync(__dirname + '/use.trie'));