Skip to content

Commit 3b2e3a3

Browse files
committed
Merge branch 'unhide-build-errors' into tmp-fix-for-windows.
This is a temporary commit until docsifyjs#2288 and docsifyjs#2291 are merged to Docsify develop, so that I can get Lume build working in Windows (which includes Docsify for the docs site)
2 parents f065f98 + 76334a9 commit 3b2e3a3

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

build/emoji.js

+6-9
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ function writeEmojiPage(emojiData) {
4242
const emojiPage =
4343
(isExistingPage && fs.readFileSync(filePaths.emojiMarkdown, 'utf8')) ||
4444
`<!-- START -->\n\n<!-- END -->`;
45-
const emojiRegEx = /(<!--\s*START.*-->\n)([\s\S]*)(\n<!--\s*END.*-->)/;
45+
const emojiRegEx = /(<!--\s*START.*-->\r?\n)([\s\S]*)(\r?\n<!--\s*END.*-->)/;
46+
// ^ Note, we use \r? in case Windows converts to CRLF
4647
const emojiMatch = emojiPage.match(emojiRegEx);
4748
const emojiMarkdownStart = emojiMatch[1].trim();
4849
const emojiMarkdown = emojiMatch[2].trim();
@@ -95,13 +96,9 @@ function writeEmojiJS(emojiData) {
9596

9697
console.info('Build emoji');
9798

98-
try {
99-
const emojiData = await getEmojiData();
99+
const emojiData = await getEmojiData();
100100

101-
if (emojiData) {
102-
writeEmojiPage(emojiData);
103-
writeEmojiJS(emojiData);
104-
}
105-
} catch (err) {
106-
console.warn(`- Error: ${err.message}`);
101+
if (emojiData) {
102+
writeEmojiPage(emojiData);
103+
writeEmojiJS(emojiData);
107104
}

0 commit comments

Comments
 (0)