fix: import fonts into views

viewstools · May 25, 2019 · 6e861c1 · 6e861c1
1 parent 130f8f5
commit 6e861c1
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 231 deletions.
diff --git a/fonts.js b/fonts.js
@@ -4,6 +4,7 @@ import morphFontAsReactDom from './morph/react-dom/morph-font.js'
 import morphFontAsReactNative from './morph/react-native/morph-fonts.js'
 import path from 'path'
 import sort from 'bubblesort'
+import relativise from './relativise.js'
 
 let morphFont = {
   'react-dom': morphFontAsReactDom,
@@ -44,8 +45,6 @@ export async function morphAllFonts({ as, customFonts, src, viewsToFiles }) {
   let fontsDirectory = path.join(src, 'Fonts')
   let fontsInUse = new Set()
 
-  console.log('fontsDirectory', fontsDirectory)
-
   let mapCustomFont = file => ({
     type: FONT_TYPES[path.extname(file)],
     file: file.replace(fontsDirectory, '.'),
@@ -65,7 +64,6 @@ export async function morphAllFonts({ as, customFonts, src, viewsToFiles }) {
     let customFontSources = []
     if (customFonts.has(font)) {
       customFontSources = [...customFonts.get(font)].map(mapCustomFont)
-      console.log(customFontSources)
     }
 
     let code = morphFont[as](
@@ -96,4 +94,7 @@ let FONT_TYPES = {
   '.woff2': 'woff2',
 }
 
+export let makeGetFontImport = src => (font, view) =>
+  `import "${relativise(view.file, path.join(src, 'Fonts', `${font}.js`))}"`
+
 // let isFont = f => Object.keys(FONT_TYPES).includes(path.extname(f))
diff --git a/maybe-morph.js b/maybe-morph.js
@@ -5,6 +5,7 @@ import prettier from 'prettier'
 
 export default async function maybeMorph({
   as,
+  getFontImport,
   getSystemImport,
   local,
   track,
@@ -15,7 +16,7 @@ export default async function maybeMorph({
 }) {
   try {
     let result = morphers[as]({
-      // getFont,
+      getFontImport,
       getSystemImport,
       // isStory,
       local,

diff --git a/morph-all-views.js b/morph-all-views.js
@@ -2,6 +2,7 @@ import maybeMorph from './maybe-morph.js'
 
 export default async function morphAllViews({
   as,
+  getFontImport,
   getSystemImport,
   local,
   track,
@@ -13,6 +14,7 @@ export default async function morphAllViews({
 
     await maybeMorph({
       as,
+      getFontImport,
       getSystemImport,
       local,
       track,

diff --git a/morph/react-dom.js b/morph/react-dom.js
@@ -17,7 +17,7 @@ let imports = {
 }
 
 export default ({
-  getFont = () => false,
+  getFontImport,
   getSystemImport,
   isStory = () => true,
   local,
@@ -45,7 +45,7 @@ export default ({
     dependencies: new Set(),
     flow: null,
     flowSetState: false,
-    getFont,
+    getFontImport: font => getFontImport(font, view),
     getStyleForProperty,
     getValueForProperty,
     hasRefs: false,

diff --git a/morph/react-native.js b/morph/react-native.js
@@ -17,7 +17,7 @@ let imports = {
 }
 
 export default ({
-  getFont = () => false,
+  getFontImport,
   getImport,
   isStory = () => true,
   local,
@@ -40,7 +40,7 @@ export default ({
     animated: new Set(),
     images: [],
     dependencies: new Set(),
-    getFont,
+    getFontImport: font => getFontImport(font, view),
     getStyleForProperty,
     getValueForProperty,
     hasRefs: false,

diff --git a/morph/react-native/morph-fonts.js b/morph/react-native/morph-fonts.js
@@ -1,6 +1,6 @@
 export default (font, sources) => {
-  return `export default {}`
   // TODO implement
+  return `export default "${font.id}"`
 
   //   let body = `export default {\n`
   //   fonts.forEach(font => {

diff --git a/morph/react/get-dependencies.js b/morph/react/get-dependencies.js
@@ -64,14 +64,12 @@ export default (state, getImport) => {
   })
 
   if (state.isReactNative) {
-    state.getFont(state.fonts)
+    // TODO fonts in RN
+    // state.getFont(state.fonts)
   } else {
-    state.fonts.forEach(usedFont => {
-      let font = state.getFont(usedFont)
-      if (font) {
-        dependencies.push(`import "${font}"`)
-      }
-    })
+    state.fonts.forEach(usedFont =>
+      dependencies.push(state.getFontImport(usedFont.id))
+    )
   }
 
   // TODO we probably want to check that the file exists and do something if it