diff --git a/package.json b/package.json index 55a25bb..cd4b91e 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@babel/plugin-proposal-class-properties": "^7.5.5", "@babel/polyfill": "^7.6.0", "@babel/preset-typescript": "^7.6.0", - "@fortawesome/fontawesome-pro": "^5.12.0", + "@fortawesome/fontawesome-free": "^5.12.0", "@hot-loader/react-dom": "^16.9.0", "@polkadot/api": "^0.96.1", "@types/jest": "24.0.15", diff --git a/src/index.js b/src/index.js index d1186a7..ea1c425 100644 --- a/src/index.js +++ b/src/index.js @@ -12,7 +12,11 @@ fileOps.fsType = 'electron' import('./scss/fonts/open_sans.css') import('./scss/fonts/hack.css') -import('@fortawesome/fontawesome-pro/js/all') +try { + require('@fortawesome/fontawesome-pro/js/all') +} catch (e) { + require('@fortawesome/fontawesome-free/js/all') +} document.title = process.env.PROJECT_NAME ReactDOM.render(, document.getElementById('root')) diff --git a/yarn.lock b/yarn.lock index 558d6ca..810d272 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2011,10 +2011,10 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== -"@fortawesome/fontawesome-pro@^5.12.0": - version "5.12.0" - resolved "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.12.0/fontawesome-pro-5.12.0.tgz#a9116c8c832ca1d1a9747ca48d3f9c596028fd46" - integrity sha512-EKKR4p0higjsIPKjSSkGqtweUwo/GgR/zKL4rCwzF5Z/BZ/ebJZaS8ZjGE7YUNEN63SYk2WhpJVI+l9dwfU7RQ== +"@fortawesome/fontawesome-free@^5.12.0": + version "5.13.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.1.tgz#c53b4066edae16cd1fd669f687baf031b45fb9d6" + integrity sha512-D819f34FLHeBN/4xvw0HR0u7U2G7RqjPSggXqf7LktsxWQ48VAfGwvMrhcVuaZV2fF069c/619RdgCCms0DHhw== "@hapi/address@2.x.x": version "2.1.4"