From b4c74291fa55235daa0aa73530d7107e29d43eda Mon Sep 17 00:00:00 2001
From: Marshall Quander <marshall@quander.me>
Date: Mon, 23 Jul 2018 14:11:00 -0700
Subject: [PATCH] Upgrade fontawesome packages
---
package.json | 6 +++---
src/react-components/2d-hud.js | 4 ++--
src/react-components/avatar-selector.js | 6 +++---
src/react-components/footer.js | 18 +++++++++---------
src/react-components/hub-create-panel.js | 6 +++---
src/react-components/profile-info-header.js | 6 +++---
src/react-components/ui-root.js | 4 ++--
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/package.json b/package.json
index 696cffe60..41afb4977 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,9 @@
"lint": "yarn run lint:js && yarn run lint:html"
},
"dependencies": {
- "@fortawesome/fontawesome": "^1.1.5",
- "@fortawesome/fontawesome-free-solid": "^5.0.9",
- "@fortawesome/react-fontawesome": "^0.0.18",
+ "@fortawesome/fontawesome-svg-core": "^1.2.2",
+ "@fortawesome/free-solid-svg-icons": "^5.2.0",
+ "@fortawesome/react-fontawesome": "^0.1.0",
"aframe-billboard-component": "^1.0.0",
"aframe-extras": "https://github.com/MozillaReality/aframe-extras#feature/precompute-nav-mesh",
"aframe-input-mapping-component": "https://github.com/mozillareality/aframe-input-mapping-component#hubs/master",
diff --git a/src/react-components/2d-hud.js b/src/react-components/2d-hud.js
index 93ae3cc44..12e7abc17 100644
--- a/src/react-components/2d-hud.js
+++ b/src/react-components/2d-hud.js
@@ -4,8 +4,8 @@ import cx from "classnames";
import styles from "../assets/stylesheets/2d-hud.scss";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faPlus from "@fortawesome/fontawesome-free-solid/faPlus";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faPlus } from "@fortawesome/free-solid-svg-icons/faPlus";
const qs = new URLSearchParams(location.search);
function qsTruthy(param) {
diff --git a/src/react-components/avatar-selector.js b/src/react-components/avatar-selector.js
index e4b27897e..491520240 100644
--- a/src/react-components/avatar-selector.js
+++ b/src/react-components/avatar-selector.js
@@ -1,9 +1,9 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
import { injectIntl } from "react-intl";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faAngleLeft from "@fortawesome/fontawesome-free-solid/faAngleLeft";
-import faAngleRight from "@fortawesome/fontawesome-free-solid/faAngleRight";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faAngleLeft } from "@fortawesome/free-solid-svg-icons/faAngleLeft";
+import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight";
// TODO: we should make a bundle for avatar picker with it's own geometry, for now just use the indoor part of the meting room
const meetingSpace = "https://asset-bundles-prod.reticulum.io/rooms/meetingroom/MeetingSpace1_mesh-d48250ebc6.gltf";
diff --git a/src/react-components/footer.js b/src/react-components/footer.js
index e155bea12..fbc409887 100644
--- a/src/react-components/footer.js
+++ b/src/react-components/footer.js
@@ -1,14 +1,14 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faUsers from "@fortawesome/fontawesome-free-solid/faUsers";
-import faBars from "@fortawesome/fontawesome-free-solid/faBars";
-import faShareAlt from "@fortawesome/fontawesome-free-solid/faShareAlt";
-import faExclamation from "@fortawesome/fontawesome-free-solid/faExclamation";
-import faTimes from "@fortawesome/fontawesome-free-solid/faTimes";
-import faArrowDown from "@fortawesome/fontawesome-free-solid/faArrowDown";
-import faQuestion from "@fortawesome/fontawesome-free-solid/faQuestion";
-import faNewspaper from "@fortawesome/fontawesome-free-solid/faNewspaper";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faUsers } from "@fortawesome/free-solid-svg-icons/faUsers";
+import { faBars } from "@fortawesome/free-solid-svg-icons/faBars";
+import { faShareAlt } from "@fortawesome/free-solid-svg-icons/faShareAlt";
+import { faExclamation } from "@fortawesome/free-solid-svg-icons/faExclamation";
+import { faTimes } from "@fortawesome/free-solid-svg-icons/faTimes";
+import { faArrowDown } from "@fortawesome/free-solid-svg-icons/faArrowDown";
+import { faQuestion } from "@fortawesome/free-solid-svg-icons/faQuestion";
+import { faNewspaper } from "@fortawesome/free-solid-svg-icons/faNewspaper";
import styles from "../assets/stylesheets/footer.scss";
diff --git a/src/react-components/hub-create-panel.js b/src/react-components/hub-create-panel.js
index 959a4a933..b3aec47ab 100644
--- a/src/react-components/hub-create-panel.js
+++ b/src/react-components/hub-create-panel.js
@@ -3,9 +3,9 @@ import PropTypes from "prop-types";
import { injectIntl, FormattedMessage } from "react-intl";
import { generateHubName } from "../utils/name-generation";
import classNames from "classnames";
-import faAngleLeft from "@fortawesome/fontawesome-free-solid/faAngleLeft";
-import faAngleRight from "@fortawesome/fontawesome-free-solid/faAngleRight";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
+import { faAngleLeft } from "@fortawesome/free-solid-svg-icons/faAngleLeft";
+import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { resolveURL, extractUrlBase } from "../utils/resolveURL";
import default_scene_preview_thumbnail from "../assets/images/default_thumbnail.png";
diff --git a/src/react-components/profile-info-header.js b/src/react-components/profile-info-header.js
index f5c23dd6b..4f0b8e65b 100644
--- a/src/react-components/profile-info-header.js
+++ b/src/react-components/profile-info-header.js
@@ -1,8 +1,8 @@
import React from "react";
import PropTypes from "prop-types";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faQuestion from "@fortawesome/fontawesome-free-solid/faQuestion";
-import faShareAlt from "@fortawesome/fontawesome-free-solid/faShareAlt";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faQuestion } from "@fortawesome/free-solid-svg-icons/faQuestion";
+import { faShareAlt } from "@fortawesome/free-solid-svg-icons/faShareAlt";
export const ProfileInfoHeader = props => (
<div className="profile-info-header">
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index f398c263c..0ab4bf813 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -22,8 +22,8 @@ import InfoDialog from "./info-dialog.js";
import TwoDHUD from "./2d-hud";
import Footer from "./footer";
-import FontAwesomeIcon from "@fortawesome/react-fontawesome";
-import faQuestion from "@fortawesome/fontawesome-free-solid/faQuestion";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faQuestion } from "@fortawesome/free-solid-svg-icons/faQuestion";
addLocaleData([...en]);
--
GitLab