Skip to content

Commit

Permalink
refs #579 Add font-manager and rebuild electron for font-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
h3poteto committed Sep 24, 2018
1 parent a7acab3 commit b55317b
Show file tree
Hide file tree
Showing 3 changed files with 197 additions and 4 deletions.
189 changes: 187 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
"pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
"test": "npm run unit && npm run e2e",
"unit": "karma start test/unit/karma.conf.js",
"postinstall": "npm run lint:fix",
"mocha": "BABEL_ENV=test mocha --require babel-register --recursive ./test/mocha/**/*.js"
"postinstall": "npm run lint:fix && npm run electron-rebuild",
"mocha": "BABEL_ENV=test mocha --require babel-register --recursive ./test/mocha/**/*.js",
"electron-rebuild": "./node_modules/.bin/electron-rebuild"
},
"build": {
"productName": "Whalebird",
Expand Down Expand Up @@ -104,6 +105,7 @@
"electron-window-state": "^4.1.1",
"element-ui": "^2.4.7",
"emojilib": "^2.3.0",
"font-manager": "^0.3.0",
"hawk": "^7.0.7",
"hoek": "^5.0.3",
"i18next": "^11.5.0",
Expand Down Expand Up @@ -153,6 +155,7 @@
"electron-debug": "^1.4.0",
"electron-devtools-installer": "^2.2.4",
"electron-packager": "^12.0.2",
"electron-rebuild": "^1.8.2",
"eslint": "^5.2.0",
"eslint-config-standard": "^12.0.0-alpha.0",
"eslint-friendly-formatter": "^4.0.1",
Expand Down
5 changes: 5 additions & 0 deletions src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import path from 'path'
import ContextMenu from 'electron-context-menu'
import * as Splashscreen from '@trodi/electron-splashscreen'
import openAboutWindow from 'about-window'
import fontManager from 'font-manager'

import Authentication from './auth'
import Account from './account'
Expand All @@ -19,6 +20,10 @@ import Hashtags from './hashtags'
import i18n from '../config/i18n'
import Language from '../constants/language'

fontManager.getAvailableFonts(function (fonts) {
console.log(fonts)
})

/**
* Context menu
*/
Expand Down

0 comments on commit b55317b

Please sign in to comment.