Reorganize

.gitignore

@@ -1,2 +1,3 @@
 
+dist
 bundle.js

build.js

@@ -4,10 +4,15 @@
 const fs = require('fs')
 const path = require('path')
 const cheerio = require('cheerio')
-const geomiconsKeys = require('./server/geomicons-keys')
 
 // Simple Icons
 const simpleDir = path.join(__dirname, 'node_modules', 'simple-icons#gh-pages', 'icons')
+
+if (!fs.existsSync(simpleDir)) {
+  console.log('Could not find simple-icons')
+  return
+}
+
 const simpleFiles = fs.readdirSync(simpleDir)
   .filter(f => /\.svg$/.test(f))
 
@@ -117,10 +122,6 @@ const mdPaths = mdKeys.reduce((a, key) => {
 
 const mdFlattened = Object.keys(mdPaths).reduce((a, key, i) => {
   const paths = Object.keys(mdPaths[key]).reduce((arr, k) => {
-    // Doesn't seem to work
-    if (geomiconsKeys.includes(k)) {
-      k = 'md_' + k
-    }
     arr.push({
       key: k,
       value: mdPaths[key][k]
@@ -135,6 +136,11 @@ const mdFlattened = Object.keys(mdPaths).reduce((a, key, i) => {
 
 const mdJs = `module.exports = ${JSON.stringify(mdFlattened)}`
 
-fs.writeFileSync('server/simple-icons.js', simpleJs)
-fs.writeFileSync('server/material-design-icons.js', mdJs)
+const dist = path.join(__dirname, 'dist')
+if (!fs.existsSync(dist)) {
+  fs.mkdirSync(dist)
+}
+
+fs.writeFileSync('dist/simple-icons.js', simpleJs)
+fs.writeFileSync('dist/material-design-icons.js', mdJs)
 

index.js

@@ -2,11 +2,15 @@
 // todo
 // const { paths: reline } = require('reline')
 const geomicons = require('geomicons-open')
-const material = require('./server/material-design-icons')
-const simple = require('./server/simple-icons')
+const material = require('./dist/material-design-icons')
+const simple = require('./dist/simple-icons')
 const Icon = require('./server/Icon')
 
-module.exports = Object.assign({},
+module.exports = Object.assign({
+  geomicons,
+  material,
+  simple
+},
   Icon,
   geomicons,
   material,

package.json

@@ -4,11 +4,9 @@
   "description": "Icon placeholder microservice and node module",
   "main": "index.js",
   "scripts": {
-    "_build": "npm run _postinstall && npm run icons && npm run webpack",
-    "icons": "node build.js",
+    "build": "node build.js",
     "webpack": "webpack -p",
-    "_postinstall": "napa danleech/simple-icons#gh-pages",
-    "_start": "./node_modules/micro/bin/micro -p 3000 server/index.js",
+    "postinstall": "napa danleech/simple-icons#gh-pages",
     "start": "micro -p 3000 server/index.js",
     "dev": "nodemon --exec 'npm start'"
   },
@@ -43,8 +41,8 @@
   "now": {
     "alias": "icon.now.sh",
     "files": [
-      "server",
-      "server/landing"
+      "dist",
+      "server"
     ]
   }
 }

server/Icon.js

@@ -4,8 +4,8 @@ const { Icon: Reline } = require('reline')
 const Geomicon = require('react-geomicons').default
 const geomiconsKeys = require('./geomicons-keys')
 const relineKeys = require('./reline-keys')
-const simplePaths = require('./simple-icons')
-const mdPaths = require('./material-design-icons')
+const simplePaths = require('../dist/simple-icons')
+const mdPaths = require('../dist/material-design-icons')
 
 const simpleKeys = Object.keys(simplePaths)
 const mdKeys = Object.keys(mdPaths)

server/index.js

@@ -7,8 +7,10 @@ const { renderToStaticMarkup } = require('react-dom/server')
 const Icon = require('./Icon')
 const relineKeys = require('./reline-keys')
 const geomiconsKeys = require('./geomicons-keys')
-const simpleKeys = Object.keys(require('./simple-icons'))
-const mdKeys = Object.keys(require('./material-design-icons'))
+const icons = require('..')
+console.log('icons', icons)
+const simpleKeys = Object.keys(icons.simple)
+const mdKeys = Object.keys(icons.material)
 
 const Root = require('./landing/Root')
 const card = require('./landing/card')

server/landing/Demo.js

@@ -2,8 +2,9 @@
 const { createElement: h } = require('react')
 const relineKeys = require('../reline-keys')
 const geomiconsKeys = require('../geomicons-keys')
-const simpleKeys = Object.keys(require('../simple-icons'))
-const mdKeys = Object.keys(require('../material-design-icons'))
+const icons = require('../..')
+const simpleKeys = Object.keys(icons.simple)
+const mdKeys = Object.keys(icons.material)
 const Pre = require('./Pre')
 
 const keys = [

server/landing/IconList.js

@@ -1,10 +1,11 @@
 
 const { createElement: h } = require('react')
 
+const icons = require('../..')
 const relineKeys = require('../reline-keys')
 const geomiconsKeys = require('../geomicons-keys')
-const simpleKeys = Object.keys(require('../simple-icons'))
-const mdKeys = Object.keys(require('../material-design-icons'))
+const simpleKeys = Object.keys(icons.simple)
+const mdKeys = Object.keys(icons.material)
 const List = require('./List')
 const Panel = require('./Panel')
 const IconCard = require('./IconCard')