Merge pull request #7769 from martinRenou/upgrade_fontawesome

Upgrade Font Awesome to 5.12

buildutils/src/ensure-repo.ts

@@ -30,7 +30,7 @@ let MISSING: Dict<string[]> = {
 
 let UNUSED: Dict<string[]> = {
   '@jupyterlab/apputils': ['@types/react'],
-  '@jupyterlab/application': ['font-awesome'],
+  '@jupyterlab/application': ['@fortawesome/fontawesome-free'],
   '@jupyterlab/apputils-extension': ['es6-promise'],
   '@jupyterlab/services': ['node-fetch', 'ws'],
   '@jupyterlab/testutils': [

packages/application/package.json

@@ -35,6 +35,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.12.0",
     "@jupyterlab/apputils": "^2.0.0-beta.2",
     "@jupyterlab/coreutils": "^4.0.0-beta.2",
     "@jupyterlab/docregistry": "^2.0.0-beta.2",
@@ -52,8 +53,7 @@
     "@lumino/polling": "^1.0.3",
     "@lumino/properties": "^1.1.6",
     "@lumino/signaling": "^1.3.4",
-    "@lumino/widgets": "^1.9.7",
-    "font-awesome": "~4.7.0"
+    "@lumino/widgets": "^1.9.7"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",
@@ -66,8 +66,9 @@
   "jupyterlab": {
     "coreDependency": true,
     "extraStyles": {
-      "font-awesome": [
-        "css/font-awesome.min.css"
+      "@fortawesome/fontawesome-free": [
+        "css/all.min.css",
+        "css/v4-shims.min.css"
       ]
     }
   }

packages/application/style/index.css

@@ -4,10 +4,11 @@
 |----------------------------------------------------------------------------*/
 
 /* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
+@import url('~@fortawesome/fontawesome-free/css/all.min.css');
+@import url('~@fortawesome/fontawesome-free/css/v4-shims.min.css');
 @import url('~@lumino/widgets/style/index.css');
 @import url('~@jupyterlab/ui-components/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
 @import url('~@jupyterlab/docregistry/style/index.css');
-@import url('~font-awesome/css/font-awesome.min.css');
 
 @import url('./base.css');

yarn.lock

@@ -1144,6 +1144,11 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+"@fortawesome/fontawesome-free@^5.12.0":
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.0.tgz#8ceb9f09edfb85ea18a6c7bf098f6f5dd5ffd62b"
+  integrity sha512-vKDJUuE2GAdBERaQWmmtsciAMzjwNrROXA5KTGSZvayAsmuTGjam5z6QNqNPCwDfVljLWuov1nEC3mEQf/n6fQ==
+
 "@jest/console@^24.7.1", "@jest/console@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
@@ -7429,11 +7434,6 @@ follow-redirects@^1.0.0:
   dependencies:
     debug "^3.0.0"
 
-font-awesome@~4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"