Skip to content

Commit 80908b9

Browse files
authored
Revert "feat: Emoji build (#1766)"
This reverts commit 2bd1171.
1 parent 4e642d9 commit 80908b9

File tree

5 files changed

+1900
-1923
lines changed

5 files changed

+1900
-1923
lines changed

Diff for: build/emoji.js

+17-35
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ const filePaths = {
99
'src',
1010
'core',
1111
'render',
12-
'emoji-data.js'
12+
'emojify-data.js'
1313
),
1414
};
1515

1616
async function getEmojiData() {
1717
const emojiDataURL = 'https://api.github.com/emojis';
18-
19-
console.info(`- Fetching emoji data from ${emojiDataURL}`);
20-
2118
const response = await axios.get(emojiDataURL);
2219
const baseURL = Object.values(response.data)
2320
.find(url => /unicode\//)
@@ -29,18 +26,16 @@ async function getEmojiData() {
2926
([key, value]) => (data[key] = value.replace(baseURL, ''))
3027
);
3128

32-
console.info(`- Retrieved ${Object.keys(data).length} emoji entries`);
33-
3429
return {
3530
baseURL,
3631
data,
3732
};
3833
}
3934

4035
function writeEmojiPage(emojiData) {
41-
const isExistingPage = fs.existsSync(filePaths.emojiMarkdown);
4236
const emojiPage =
43-
(isExistingPage && fs.readFileSync(filePaths.emojiMarkdown, 'utf8')) ||
37+
(fs.existsSync(filePaths.emojiMarkdown) &&
38+
fs.readFileSync(filePaths.emojiMarkdown, 'utf8')) ||
4439
`<!-- START -->\n\n<!-- END -->`;
4540
const emojiRegEx = /(<!--\s*START.*-->\n)([\s\S]*)(\n<!--\s*END.*-->)/;
4641
const emojiMatch = emojiPage.match(emojiRegEx);
@@ -58,52 +53,39 @@ function writeEmojiPage(emojiData) {
5853
if (emojiMarkdown !== newEmojiMarkdown) {
5954
const newEmojiPage = emojiPage.replace(
6055
emojiMatch[0],
61-
`${emojiMarkdownStart}\n\n${newEmojiMarkdown}\n\n${emojiMarkdownEnd}`
56+
`${emojiMarkdownStart}\n${newEmojiMarkdown}\n${emojiMarkdownEnd}`
6257
);
6358

6459
fs.writeFileSync(filePaths.emojiMarkdown, newEmojiPage);
65-
66-
console.info(
67-
`- ${!isExistingPage ? 'Created' : 'Updated'}: ${filePaths.emojiMarkdown}`
68-
);
60+
console.info(`- Created new file: ${filePaths.emojiMarkdown}`);
6961
} else {
70-
console.info(`- No changes: ${filePaths.emojiMarkdown}`);
62+
console.info(`- No changes to file: ${filePaths.emojiMarkdown}`);
7163
}
7264
}
7365

7466
function writeEmojiJS(emojiData) {
75-
const isExistingPage = fs.existsSync(filePaths.emojiJS);
76-
const emojiJS = isExistingPage && fs.readFileSync(filePaths.emojiJS, 'utf8');
77-
const newEmojiJS = [
78-
'/* eslint-disable */\n',
79-
'// =============================================================================',
80-
'// DO NOT EDIT: This file is auto-generated by an /build/emoji.js',
81-
'// =============================================================================\n',
82-
`export default ${JSON.stringify(emojiData, {}, 2)}`,
83-
].join('\n');
67+
const emojiJS =
68+
fs.existsSync(filePaths.emojiJS) &&
69+
fs.readFileSync(filePaths.emojiJS, 'utf8');
70+
const newEmojiJS = `export default ${JSON.stringify(emojiData, {}, 2)}`;
8471

8572
if (!emojiJS || emojiJS !== newEmojiJS) {
8673
fs.writeFileSync(filePaths.emojiJS, newEmojiJS);
87-
88-
console.info(
89-
`- ${!isExistingPage ? 'Created' : 'Updated'}: ${filePaths.emojiJS}`
90-
);
74+
console.info(`- Created new file: ${filePaths.emojiJS}`);
9175
} else {
92-
console.info(`- No changes: ${filePaths.emojiJS}`);
76+
console.info(`- No changes to file: ${filePaths.emojiJS}`);
9377
}
9478
}
9579

9680
(async () => {
97-
console.info('Build emoji');
81+
console.log('Build emoji');
9882

9983
try {
10084
const emojiData = await getEmojiData();
10185

102-
if (emojiData) {
103-
writeEmojiPage(emojiData);
104-
writeEmojiJS(emojiData);
105-
}
106-
} catch (err) {
107-
console.warn(`- Error: ${err.message}`);
86+
writeEmojiPage(emojiData);
87+
writeEmojiJS(emojiData);
88+
} catch (e) {
89+
console.error(e);
10890
}
10991
})();

Diff for: docs/emoji.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Below is a complete list of emoji shorthand codes. Docsify can be configured to
44

55
<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(15em, 1fr));">
66

7-
<!-- START: Auto-generated content (/build/emoji.js) -->
7+
<!-- START: auto-generated emoji markdown (do not edit between these comments) -->
88

99
:100: `:100:`
1010

@@ -3754,6 +3754,6 @@ Below is a complete list of emoji shorthand codes. Docsify can be configured to
37543754

37553755
:zzz: `:zzz:`
37563756

3757-
<!-- END: Auto-generated content (/build/emoji.js) -->
3757+
<!-- END: auto-generated emoji markdown -->
37583758

37593759
</div>

Diff for: index.html

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
</script>
116116
<script src="/lib/docsify.js"></script>
117117
<script src="/lib/plugins/search.js"></script>
118+
<script src="/lib/plugins/emoji.js"></script>
118119
<script src="/lib/plugins/front-matter.js"></script>
119120
<script src="//cdn.jsdelivr.net/npm/prismjs/components/prism-bash.min.js"></script>
120121
<script src="//cdn.jsdelivr.net/npm/prismjs/components/prism-markdown.min.js"></script>

Diff for: package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
"build:cover": "node build/cover.js",
2525
"build:css:min": "mkdirp lib/themes && npm run css -- -o lib/themes && node build/mincss.js",
2626
"build:css": "mkdirp themes && npm run css -- -o themes",
27-
"build:emoji": "node ./build/emoji.js",
27+
"build:emoji": "node ./build/emoji.js && eslint ./src/core/render/emojify-data.js --fix --quiet",
2828
"build:js": "cross-env NODE_ENV=production node build/build.js",
2929
"build:ssr": "node build/ssr.js",
3030
"build:test": "npm run build && npm test",
31-
"build": "rimraf lib themes && run-s build:js build:css build:css:min build:ssr build:cover build:emoji",
31+
"build": "rimraf lib themes && run-s build:js build:css build:css:min build:ssr build:cover",
3232
"css": "node build/css",
3333
"dev:ssr": "run-p serve:ssr watch:*",
3434
"dev": "run-p serve watch:*",

0 commit comments

Comments
 (0)