1
mirror of https://github.com/jakejarvis/jarv.is.git synced 2025-10-27 13:05:48 -04:00

trying to fetch Twemoji SVGs from an NPM package instead of Go module

not actually published on NPM, though: https://github.com/jakejarvis/twemoji-svg
This commit is contained in:
2020-07-29 12:27:56 -04:00
parent d0ff6dd0a9
commit cb61438d11
7 changed files with 33 additions and 35 deletions

View File

@@ -72,9 +72,6 @@ jobs:
- uses: actions/setup-node@v1 - uses: actions/setup-node@v1
with: with:
node-version: 14.x node-version: 14.x
- uses: actions/setup-go@v2
with:
go-version: 1.14.x
- name: Get Yarn cache location - name: Get Yarn cache location
# https://github.com/actions/cache/blob/master/examples.md#node---yarn # https://github.com/actions/cache/blob/master/examples.md#node---yarn
# https://github.com/actions/cache/issues/60 # https://github.com/actions/cache/issues/60

View File

@@ -57,11 +57,16 @@ disableAliases = true
mastodon = "mastodon.social/@jakejarvis" mastodon = "mastodon.social/@jakejarvis"
[module] [module]
[[module.imports]] # we're grabbing Twemoji SVGs from a pseudo NPM package on GitHub:
path = "github.com/twitter/twemoji" # https://github.com/jakejarvis/twemoji-svg
[[module.imports.mounts]] [[module.mounts]]
source = "assets/svg" source = "node_modules/twemoji-svg/svg"
target = "static/vendor/emoji/svg" target = "static/vendor/emoji/svg"
# this is required, or else the Twemoji mount completely takes over /static:
# https://discourse.gohugo.io/t/can-hugo-copy-files-from-one-dir-to-another/24085/4
[[module.mounts]]
source = "static"
target = "static"
[frontmatter] [frontmatter]
lastmod = ["date", "publishDate", ":default"] lastmod = ["date", "publishDate", ":default"]

5
go.mod
View File

@@ -1,5 +0,0 @@
module github.com/jakejarvis/jarv.is
go 1.14
require github.com/twitter/twemoji v13.0.1+incompatible // indirect

2
go.sum
View File

@@ -1,2 +0,0 @@
github.com/twitter/twemoji v13.0.1+incompatible h1:w1epB4MnDMK11c0jBmCNuVQtRJfRddHm2+gx3z7bmGM=
github.com/twitter/twemoji v13.0.1+incompatible/go.mod h1:06L6PdKuWDx/Yh6s4B7yGkAeBmWZzbFZgfNnWlJPPYM=

View File

@@ -7,7 +7,6 @@
NODE_VERSION = "14" NODE_VERSION = "14"
YARN_VERSION = "1.22.4" YARN_VERSION = "1.22.4"
YARN_FLAGS = "--no-ignore-optional --frozen-lockfile" YARN_FLAGS = "--no-ignore-optional --frozen-lockfile"
GO_VERSION = "1.14.6"
# Ensure *only* Pretty URLs are enabled, even though this is already set up in # Ensure *only* Pretty URLs are enabled, even though this is already set up in
# the Netlify dashboard. # the Netlify dashboard.
@@ -51,7 +50,8 @@
# package = "netlify-plugin-debug-cache" # package = "netlify-plugin-debug-cache"
# The most important headers and redirects are specified in the _headers and # The most important headers and redirects are specified in the _headers and
# _redirects files generated by Hugo. These are additional custom rules. # _redirects files generated by Hugo. These are additional custom rules, mostly
# unrelated to the actual website.
# PGP key: open in browser, download correctly # PGP key: open in browser, download correctly
[[headers]] [[headers]]

View File

@@ -14,7 +14,7 @@
"url": "git+https://github.com/jakejarvis/jarv.is.git" "url": "git+https://github.com/jakejarvis/jarv.is.git"
}, },
"scripts": { "scripts": {
"clean": "hugo mod clean && rimraf public/ resources/ builds/ _vendor/ .netlify/{cache,functions}/ $TMPDIR/hugo_cache/ || true", "clean": "rimraf public/ resources/ builds/ _vendor/ .netlify/{cache,functions}/ $TMPDIR/hugo_cache/ || true",
"build": "run-s build:hugo build:functions minify", "build": "run-s build:hugo build:functions minify",
"build:hugo": "hugo --gc --cleanDestinationDir --verbose", "build:hugo": "hugo --gc --cleanDestinationDir --verbose",
"build:functions": "netlify-lambda build functions", "build:functions": "netlify-lambda build functions",
@@ -35,7 +35,7 @@
"dependencies": { "dependencies": {
"normalize.css": "8.0.1", "normalize.css": "8.0.1",
"twemoji": "13.0.1", "twemoji": "13.0.1",
"twemoji-parser": "13.0.0" "twemoji-svg": "jakejarvis/twemoji-svg#13.0.1"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^9.8.5", "autoprefixer": "^9.8.5",
@@ -71,14 +71,12 @@
"terser": "^4.8.0" "terser": "^4.8.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"gifsicle": "jakejarvis/gifsicle-bin#master",
"imagemin-gifsicle": "^7.0.0", "imagemin-gifsicle": "^7.0.0",
"imagemin-jpegoptim": "^7.0.0", "imagemin-jpegoptim": "^7.0.0",
"imagemin-pngquant": "^9.0.0", "imagemin-pngquant": "^9.0.0",
"imagemin-svgo": "^8.0.0" "imagemin-svgo": "^8.0.0"
}, },
"resolutions": { "resolutions": {
"imagemin-gifsicle/gifsicle": "jakejarvis/gifsicle-bin#master",
"postcss-clean/postcss": "^7.x" "postcss-clean/postcss": "^7.x"
}, },
"husky": { "husky": {

View File

@@ -864,9 +864,9 @@
integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
"@types/node@*": "@types/node@*":
version "14.0.26" version "14.0.27"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.26.tgz#22a3b8a46510da8944b67bfc27df02c34a35331c" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
integrity sha512-W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA== integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==
"@types/normalize-package-data@^2.4.0": "@types/normalize-package-data@^2.4.0":
version "2.4.0" version "2.4.0"
@@ -2677,9 +2677,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.3.488: electron-to-chromium@^1.3.488:
version "1.3.510" version "1.3.512"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.510.tgz#dee781ff8b595c0deb60172b75d50b6889757eda" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.512.tgz#620e6731c693ddaaf3750f23dde7f7c4347b7327"
integrity sha512-sLtGB0znXdmo6lM8hy5wTVo+fLqvIuO8hEpgc0DvPmFZqvBu/WB7AarEwhxVKjf3rVbws/rC8Xf+AlsOb36lJQ== integrity sha512-y02hdFg7c4jTfREcXf4fRhHLt7BzofMgd7JAKY+u9i62E0D1eIpLQPFo5/eboZL0bIVY9YHZA53+vCGNFREOXA==
elliptic@^6.0.0, elliptic@^6.5.2: elliptic@^6.0.0, elliptic@^6.5.2:
version "6.5.3" version "6.5.3"
@@ -3526,14 +3526,15 @@ get-value@^2.0.3, get-value@^2.0.6:
resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
gifsicle@^5.0.0, gifsicle@jakejarvis/gifsicle-bin#master: gifsicle@^5.0.0:
version "5.1.0" version "5.1.0"
resolved "https://codeload.github.com/jakejarvis/gifsicle-bin/tar.gz/3d01be697c117e653ce5ff66cd4ef29042263fe4" resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-5.1.0.tgz#08f878e9048c70adf046185115a6350516a1fdc0"
integrity sha512-hQsOH7yjC7fMokntysN6f2QuxrnX+zmKKKVy0sC3Vhtnk8WrOxLdfH/Z2PNn7lVVx+1+drzIeAe8ufcmdSC/8g==
dependencies: dependencies:
bin-build "^3.0.0" bin-build "^3.0.0"
bin-wrapper "^4.1.0" bin-wrapper "^4.0.0"
execa "^4.0.0" execa "^4.0.0"
logalot "^2.1.0" logalot "^2.0.0"
glob-parent@^3.1.0: glob-parent@^3.1.0:
version "3.1.0" version "3.1.0"
@@ -4727,9 +4728,9 @@ lint-staged@^10.2.11:
stringify-object "^3.3.0" stringify-object "^3.3.0"
listr2@^2.1.0: listr2@^2.1.0:
version "2.4.0" version "2.4.1"
resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.4.0.tgz#aadb094f1f16a96bb9c4dc9b9c3e1d24b1709803" resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.4.1.tgz#006fc94ae77b3195403cbf3a4a563e2d6366224f"
integrity sha512-Hj2ECZdAxDkuYFtIKE35PgdMSqMp0muIhJRG5EyV5pOWFEUmKUG+fhfFrvIUNGBQvvi7wQ41eKTxDBisfvDjFQ== integrity sha512-8pYsCZCztr5+KAjReLyBeGhLV0vaQ2Du/eMe/ux9QAfQl7efiWejM1IWjALh0zHIRYuIbhQ8N2KztZ4ci56pnQ==
dependencies: dependencies:
chalk "^4.1.0" chalk "^4.1.0"
cli-truncate "^2.1.0" cli-truncate "^2.1.0"
@@ -4872,7 +4873,7 @@ log-update@^4.0.0:
slice-ansi "^4.0.0" slice-ansi "^4.0.0"
wrap-ansi "^6.2.0" wrap-ansi "^6.2.0"
logalot@^2.0.0, logalot@^2.1.0: logalot@^2.0.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552" resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552"
integrity sha1-X46MkNME7fElMJUaVVSruMXj9VI= integrity sha1-X46MkNME7fElMJUaVVSruMXj9VI=
@@ -7856,6 +7857,10 @@ twemoji-parser@13.0.0:
resolved "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-13.0.0.tgz#bd9d1b98474f1651dc174696b45cabefdfa405af" resolved "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-13.0.0.tgz#bd9d1b98474f1651dc174696b45cabefdfa405af"
integrity sha512-zMaGdskpH8yKjT2RSE/HwE340R4Fm+fbie4AaqjDa4H/l07YUmAvxkSfNl6awVWNRRQ0zdzLQ8SAJZuY5MgstQ== integrity sha512-zMaGdskpH8yKjT2RSE/HwE340R4Fm+fbie4AaqjDa4H/l07YUmAvxkSfNl6awVWNRRQ0zdzLQ8SAJZuY5MgstQ==
twemoji-svg@jakejarvis/twemoji-svg#13.0.1:
version "13.0.1"
resolved "https://codeload.github.com/jakejarvis/twemoji-svg/tar.gz/ea1e5fa564c917315ebde20c5a1a3e3b7a4483cd"
twemoji@13.0.1: twemoji@13.0.1:
version "13.0.1" version "13.0.1"
resolved "https://registry.yarnpkg.com/twemoji/-/twemoji-13.0.1.tgz#57ddc8bd86c8175c11376f5f9ab322a02e739c2d" resolved "https://registry.yarnpkg.com/twemoji/-/twemoji-13.0.1.tgz#57ddc8bd86c8175c11376f5f9ab322a02e739c2d"