Upgrade Font Awesome from 5.1.0 to 5.7.2

__mocks__/fs-extra-promise.js

@@ -26,7 +26,7 @@ function rimraf(dirPath) {
 }
 
 /**
- * Iterativelts creates directories to the file or directory
+ * Iteratively creates directories to the file or directory
  * @param pathArg
  */
 function createDir(pathArg) {
@@ -75,6 +75,27 @@ function copyDirSync(src, dest) {
   }
 }
 
+/**
+ * Utility function to copy a directory to a destination recursively for copyAsync
+ */
+function copyDirAsync(src, dest) {
+  if (fs.lstatSync(src).isDirectory()) {
+    const files = fs.readdirSync(src);
+    files.forEach((file) => {
+      const curSource = path.join(src, file);
+      const curDest = path.join(dest, file);
+      if (fs.lstatSync(curSource).isDirectory()) {
+        if (!fs.existsSync(curDest)) {
+          createDir(curDest);
+        }
+        copyDirAsync(curSource, curDest);
+      } else {
+        fs.copyAsync(curSource, curDest);
+      }
+    });
+  }
+}
+
 /**
  * Mocks
  */
@@ -143,7 +164,16 @@ fs.removeAsync = pathArg => new Promise((resolve, reject) => {
  */
 fs.copyAsync = (src, dest) => new Promise((resolve, reject) => {
   try {
-    fs.copySync(src, dest);
+    // copyAsync creates folders to a destination path if they do not exist
+    const dirPath = path.dirname(dest);
+    if (!fs.existsSync(dirPath)) {
+      createDir(dirPath);
+    }
+    if (fs.lstatSync(src).isDirectory()) {
+      copyDirAsync(src, dest);
+    } else {
+      copyFileSync(src, dest);
+    }
     resolve();
   } catch (err) {
     reject(err);

package.json

@@ -17,6 +17,7 @@
   "author": "Jiang Sheng <gisonrg@gmail.com>",
   "license": "MIT",
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.7.2",
     "@sindresorhus/slugify": "^0.8.0",
     "bluebird": "^3.4.7",
     "chalk": "^1.1.3",

src/Site.js

@@ -359,9 +359,10 @@ Site.prototype.createPage = function (config) {
                                   path.join(this.siteAssetsDestPath, 'css', 'bootstrap-vue.min.css')),
       externalScripts: _.union(this.siteConfig.externalScripts, config.externalScripts),
       fontAwesome: path.relative(path.dirname(resultPath),
-                                 path.join(this.siteAssetsDestPath, 'css', 'font-awesome.min.css')),
+                                 path.join(this.siteAssetsDestPath, 'fontawesome', 'css', 'all.min.css')),
       glyphicons: path.relative(path.dirname(resultPath),
-                                path.join(this.siteAssetsDestPath, 'css', 'bootstrap-glyphicons.min.css')),
+                                path.join(this.siteAssetsDestPath, 'glyphicons', 'css',
+                                          'bootstrap-glyphicons.min.css')),
       highlight: path.relative(path.dirname(resultPath),
                                path.join(this.siteAssetsDestPath, 'css', 'github.min.css')),
       markbind: path.relative(path.dirname(resultPath),
@@ -520,6 +521,7 @@ Site.prototype.generate = function (baseUrl) {
       .then(() => this.buildAssets())
       .then(() => this.buildSourceFiles())
       .then(() => this.copyMarkBindAsset())
+      .then(() => this.copyFontAwesomeAsset())
       .then(() => this.copyLayouts())
       .then(() => this.updateSiteData())
       .then(() => {
@@ -811,12 +813,24 @@ Site.prototype.updateSiteData = function (filePaths) {
   this.writeSiteData();
 };
 
+/**
+ * Copies Font Awesome assets to the assets folder
+ */
+Site.prototype.copyFontAwesomeAsset = function () {
+  const faRootSrcPath = path.join(__dirname, '..', 'node_modules', '@fortawesome', 'fontawesome-free');
+  const faCssSrcPath = path.join(faRootSrcPath, 'css', 'all.min.css');
+  const faCssDestPath = path.join(this.siteAssetsDestPath, 'fontawesome', 'css', 'all.min.css');
+  const faFontsSrcPath = path.join(faRootSrcPath, 'webfonts');
+  const faFontsDestPath = path.join(this.siteAssetsDestPath, 'fontawesome', 'webfonts');
+
+  return fs.copyAsync(faCssSrcPath, faCssDestPath).then(fs.copyAsync(faFontsSrcPath, faFontsDestPath));
+};
+
+/**
+ * Copies MarkBind assets to the assets folder
+ */
 Site.prototype.copyMarkBindAsset = function () {
-  return new Promise((resolve, reject) => {
-    fs.copyAsync(this.siteAssetsSrcPath, this.siteAssetsDestPath)
-      .then(resolve)
-      .catch(reject);
-  });
+  return fs.copyAsync(this.siteAssetsSrcPath, this.siteAssetsDestPath);
 };
 
 /**

test/functional/test_site/expected/bugs/index.html

@@ -8,8 +8,8 @@
     <title>Open Bugs</title>
     <link rel="stylesheet" href="../markbind/css/bootstrap.min.css">
     <link rel="stylesheet" href="../markbind/css/bootstrap-vue.min.css">
-    <link rel="stylesheet" href="../markbind/css/font-awesome.min.css" >
-    <link rel="stylesheet" href="../markbind/css/bootstrap-glyphicons.min.css" >
+    <link rel="stylesheet" href="../markbind/fontawesome/css/all.min.css" >
+    <link rel="stylesheet" href="../markbind/glyphicons/css/bootstrap-glyphicons.min.css" >
     <link rel="stylesheet" href="../markbind/css/github.min.css">
     <link rel="stylesheet" href="../markbind/css/markbind.css">
     <link rel="stylesheet" href="STYLESHEET_LINK">

test/functional/test_site/expected/index.html

@@ -13,8 +13,8 @@
     <title>Hello World</title>
     <link rel="stylesheet" href="markbind/css/bootstrap.min.css">
     <link rel="stylesheet" href="markbind/css/bootstrap-vue.min.css">
-    <link rel="stylesheet" href="markbind/css/font-awesome.min.css" >
-    <link rel="stylesheet" href="markbind/css/bootstrap-glyphicons.min.css" >
+    <link rel="stylesheet" href="markbind/fontawesome/css/all.min.css" >
+    <link rel="stylesheet" href="markbind/glyphicons/css/bootstrap-glyphicons.min.css" >
     <link rel="stylesheet" href="markbind/css/github.min.css">
     <link rel="stylesheet" href="markbind/css/markbind.css">
     <link rel="stylesheet" href="STYLESHEET_LINK">