Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Twemoji v12.1.3 #51

Merged
merged 6 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Below are things to do manually whenever you want to produce a new release.
1. Go to the [Twemoji releases](https://github.com/twitter/twemoji/releases) page and find the most recent release.
2. Download the zip or tar.gz file.
3. Unzip/untar it.
4. Re-zip the files in `2/svg` as `twe-svg.zip` but keep the `svg` directory. You can do that by running this command in the `2` directory: `zip -r -9 twe-svg.zip 2/svg`.
4. Re-zip the files in `assets/svg` as `twe-svg.zip` but keep the `svg` directory. You can do that by running this command in the `assets` directory: `zip -r -9 twe-svg.zip svg`.
5. Replace the in-tree `twe-svg.zip` file.
6. Amend the `twe-svg.zip.version.txt` file and paste the URL of the released zip you've downloaded.
7. Amend the version number `package.json`.
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "twemoji-colr",
"description": "Twemoji font in COLR/CPAL layered format.",
"version": "0.4.0",
"version": "0.5.0",
"license": "Apache-2.0",
"author": "Jonathan Kew <jfkthame@gmail.com>",
"contributors": [
Expand All @@ -16,7 +16,6 @@
"url": "git+https://github.com/mozilla/twemoji-colr.git"
},
"dependencies": {
"emojibase-data": "^3.2.1",
"grunt": "^1.0.2",
"grunt-cli": "^1.2.0",
"grunt-webfont": "^1.6.0",
Expand All @@ -34,6 +33,7 @@
],
"homepage": "https://github.com/mozilla/twemoji-colr#readme",
"devDependencies": {
"emojibase-data": "^4.0.0",
"resemblejs": "^2.10.0"
},
"scripts": {
Expand Down
17 changes: 2 additions & 15 deletions tests/reporter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var EmojiInfoService = {
URL: '../node_modules/emojibase-data/en/compact.json',
URL: '../node_modules/emojibase-data/en/data.json',
map: null,

_initPromise: null,
Expand Down Expand Up @@ -56,19 +56,6 @@ var EmojiInfoService = {
hexcode,
});
}
// Fitzpatrick skin tone modifiers
var toneMap = {
'1F3FB': ['Light', '1-2'], '1F3FC': ['Medium-Light', 3],
'1F3FD': ['Medium', 4], '1F3FE': ['Medium-Dark', 5],
'1F3FF': ['Dark', 6],
};
for (var [hexcode, [name, type]] of Object.entries(toneMap)) {
this.map.set(hexcode, {
annotation: `${name} skin tone modifier`,
tags: [name + ' skin tone', 'fitzpatrick', 'type ' + type],
hexcode,
});
}
// Non-standard
this.map.set('E50A', {
annotation: 'shibuya',
Expand Down Expand Up @@ -294,7 +281,7 @@ TestReport.prototype = {
return;
}
infoEl.textContent =
info.annotation + '. tags: ' + info.tags.join(', ') + '.';
info.annotation + '. tags: ' + info.tags.join(', ') + '. version: ' + info.version;
})
.catch(function(e) { console.error(e); });
reportEl.appendChild(infoEl);
Expand Down
Binary file modified twe-svg.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion twe-svg.zip.version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Zipped copy of the 2/svg directory from https://github.com/twitter/twemoji/archive/v11.4.0.zip
Zipped copy of the assets/svg directory from https://github.com/twitter/twemoji/archive/v12.1.3.zip