Merge branch 'develop' into feat-target

Author: Koooooo-7

README.md

@@ -29,7 +29,7 @@
 
 ## Links
 
-- [`develop` branch preview](https://docsifyjs.netlify.com/)
+- [`develop` branch preview](https://docsify-preview.vercel.app/)
 - [Documentation](https://docsify.js.org)
 - [CLI](https://github.com/docsifyjs/docsify-cli)
 - CDN: [UNPKG](https://unpkg.com/docsify/) | [jsDelivr](https://cdn.jsdelivr.net/npm/docsify/) | [cdnjs](https://cdnjs.com/libraries/docsify)
@@ -126,4 +126,4 @@ This project exists thanks to all the people who contribute. [[Contribute](CONTR
 
 _Vercel_ has given us a Pro account.
 
-<a href="https://vercel.com/?utm_source=docsifyjsdocs" target="_blank"><img src="docs/_media/vercel_logo.svg" width="100px"></a>
+<a href="https://vercel.com/?utm_source=docsifyjs&utm_campaign=oss" target="_blank"><img src="docs/_media/vercel_logo.svg" width="100px"></a>

build/emoji.js

@@ -9,12 +9,15 @@ const filePaths = {
     'src',
     'core',
     'render',
-    'emojify-data.js'
+    'emoji-data.js'
   ),
 };
 
 async function getEmojiData() {
   const emojiDataURL = 'https://api.github.com/emojis';
+
+  console.info(`- Fetching emoji data from ${emojiDataURL}`);
+
   const response = await axios.get(emojiDataURL);
   const baseURL = Object.values(response.data)
     .find(url => /unicode\//)
@@ -26,16 +29,18 @@ async function getEmojiData() {
     ([key, value]) => (data[key] = value.replace(baseURL, ''))
   );
 
+  console.info(`- Retrieved ${Object.keys(data).length} emoji entries`);
+
   return {
     baseURL,
     data,
   };
 }
 
 function writeEmojiPage(emojiData) {
+  const isExistingPage = fs.existsSync(filePaths.emojiMarkdown);
   const emojiPage =
-    (fs.existsSync(filePaths.emojiMarkdown) &&
-      fs.readFileSync(filePaths.emojiMarkdown, 'utf8')) ||
+    (isExistingPage && fs.readFileSync(filePaths.emojiMarkdown, 'utf8')) ||
     `<!-- START -->\n\n<!-- END -->`;
   const emojiRegEx = /(<!--\s*START.*-->\n)([\s\S]*)(\n<!--\s*END.*-->)/;
   const emojiMatch = emojiPage.match(emojiRegEx);
@@ -53,39 +58,52 @@ function writeEmojiPage(emojiData) {
   if (emojiMarkdown !== newEmojiMarkdown) {
     const newEmojiPage = emojiPage.replace(
       emojiMatch[0],
-      `${emojiMarkdownStart}\n${newEmojiMarkdown}\n${emojiMarkdownEnd}`
+      `${emojiMarkdownStart}\n\n${newEmojiMarkdown}\n\n${emojiMarkdownEnd}`
     );
 
     fs.writeFileSync(filePaths.emojiMarkdown, newEmojiPage);
-    console.info(`- Created new file: ${filePaths.emojiMarkdown}`);
+
+    console.info(
+      `- ${!isExistingPage ? 'Created' : 'Updated'}: ${filePaths.emojiMarkdown}`
+    );
   } else {
-    console.info(`- No changes to file: ${filePaths.emojiMarkdown}`);
+    console.info(`- No changes: ${filePaths.emojiMarkdown}`);
   }
 }
 
 function writeEmojiJS(emojiData) {
-  const emojiJS =
-    fs.existsSync(filePaths.emojiJS) &&
-    fs.readFileSync(filePaths.emojiJS, 'utf8');
-  const newEmojiJS = `export default ${JSON.stringify(emojiData, {}, 2)}`;
+  const isExistingPage = fs.existsSync(filePaths.emojiJS);
+  const emojiJS = isExistingPage && fs.readFileSync(filePaths.emojiJS, 'utf8');
+  const newEmojiJS = [
+    '/* eslint-disable */\n',
+    '// =============================================================================',
+    '// DO NOT EDIT: This file is auto-generated by an /build/emoji.js',
+    '// =============================================================================\n',
+    `export default ${JSON.stringify(emojiData, {}, 2)}`,
+  ].join('\n');
 
   if (!emojiJS || emojiJS !== newEmojiJS) {
     fs.writeFileSync(filePaths.emojiJS, newEmojiJS);
-    console.info(`- Created new file: ${filePaths.emojiJS}`);
+
+    console.info(
+      `- ${!isExistingPage ? 'Created' : 'Updated'}: ${filePaths.emojiJS}`
+    );
   } else {
-    console.info(`- No changes to file: ${filePaths.emojiJS}`);
+    console.info(`- No changes: ${filePaths.emojiJS}`);
   }
 }
 
 (async () => {
-  console.log('Build emoji');
+  console.info('Build emoji');
 
   try {
     const emojiData = await getEmojiData();
 
-    writeEmojiPage(emojiData);
-    writeEmojiJS(emojiData);
-  } catch (e) {
-    console.error(e);
+    if (emojiData) {
+      writeEmojiPage(emojiData);
+      writeEmojiJS(emojiData);
+    }
+  } catch (err) {
+    console.warn(`- Error: ${err.message}`);
   }
 })();

docs/README.md

@@ -35,4 +35,4 @@ Users and the development team are usually in the [Discord server](https://disco
 
 _Vercel_ has given us a Pro account.
 
-<a href="https://vercel.com/?utm_source=docsifyjsdocs" target="_blank"><img src="https://cdn.jsdelivr.net/gh/docsifyjs/docsify/docs/_media/vercel_logo.svg" width="100px"></a>
+<a href="https://vercel.com/?utm_source=docsifyjs&utm_campaign=oss" target="_blank"><img src="https://cdn.jsdelivr.net/gh/docsifyjs/docsify/docs/_media/vercel_logo.svg" width="100px"></a>