From cb61438d1182f049769b93f546ebf9e7dd387bec Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Wed, 29 Jul 2020 12:27:56 -0400 Subject: [PATCH] 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 --- .github/workflows/ci.yml | 3 --- config.toml | 15 ++++++++++----- go.mod | 5 ----- go.sum | 2 -- netlify.toml | 4 ++-- package.json | 6 ++---- yarn.lock | 33 +++++++++++++++++++-------------- 7 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 go.mod delete mode 100644 go.sum diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ed3672f..8637d1fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,9 +72,6 @@ jobs: - uses: actions/setup-node@v1 with: node-version: 14.x - - uses: actions/setup-go@v2 - with: - go-version: 1.14.x - name: Get Yarn cache location # https://github.com/actions/cache/blob/master/examples.md#node---yarn # https://github.com/actions/cache/issues/60 diff --git a/config.toml b/config.toml index 2e9c5157..5e983c67 100644 --- a/config.toml +++ b/config.toml @@ -57,11 +57,16 @@ disableAliases = true mastodon = "mastodon.social/@jakejarvis" [module] - [[module.imports]] - path = "github.com/twitter/twemoji" - [[module.imports.mounts]] - source = "assets/svg" - target = "static/vendor/emoji/svg" + # we're grabbing Twemoji SVGs from a pseudo NPM package on GitHub: + # https://github.com/jakejarvis/twemoji-svg + [[module.mounts]] + source = "node_modules/twemoji-svg/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] lastmod = ["date", "publishDate", ":default"] diff --git a/go.mod b/go.mod deleted file mode 100644 index aa4f1bd5..00000000 --- a/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/jakejarvis/jarv.is - -go 1.14 - -require github.com/twitter/twemoji v13.0.1+incompatible // indirect diff --git a/go.sum b/go.sum deleted file mode 100644 index 207789cb..00000000 --- a/go.sum +++ /dev/null @@ -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= diff --git a/netlify.toml b/netlify.toml index d88b5f8b..f802a431 100644 --- a/netlify.toml +++ b/netlify.toml @@ -7,7 +7,6 @@ NODE_VERSION = "14" YARN_VERSION = "1.22.4" 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 # the Netlify dashboard. @@ -51,7 +50,8 @@ # package = "netlify-plugin-debug-cache" # 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 [[headers]] diff --git a/package.json b/package.json index e0bfedfa..babe1176 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "url": "git+https://github.com/jakejarvis/jarv.is.git" }, "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:hugo": "hugo --gc --cleanDestinationDir --verbose", "build:functions": "netlify-lambda build functions", @@ -35,7 +35,7 @@ "dependencies": { "normalize.css": "8.0.1", "twemoji": "13.0.1", - "twemoji-parser": "13.0.0" + "twemoji-svg": "jakejarvis/twemoji-svg#13.0.1" }, "devDependencies": { "autoprefixer": "^9.8.5", @@ -71,14 +71,12 @@ "terser": "^4.8.0" }, "optionalDependencies": { - "gifsicle": "jakejarvis/gifsicle-bin#master", "imagemin-gifsicle": "^7.0.0", "imagemin-jpegoptim": "^7.0.0", "imagemin-pngquant": "^9.0.0", "imagemin-svgo": "^8.0.0" }, "resolutions": { - "imagemin-gifsicle/gifsicle": "jakejarvis/gifsicle-bin#master", "postcss-clean/postcss": "^7.x" }, "husky": { diff --git a/yarn.lock b/yarn.lock index 04522c05..ea9310de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -864,9 +864,9 @@ integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= "@types/node@*": - version "14.0.26" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.26.tgz#22a3b8a46510da8944b67bfc27df02c34a35331c" - integrity sha512-W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA== + version "14.0.27" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1" + integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -2677,9 +2677,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.488: - version "1.3.510" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.510.tgz#dee781ff8b595c0deb60172b75d50b6889757eda" - integrity sha512-sLtGB0znXdmo6lM8hy5wTVo+fLqvIuO8hEpgc0DvPmFZqvBu/WB7AarEwhxVKjf3rVbws/rC8Xf+AlsOb36lJQ== + version "1.3.512" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.512.tgz#620e6731c693ddaaf3750f23dde7f7c4347b7327" + integrity sha512-y02hdFg7c4jTfREcXf4fRhHLt7BzofMgd7JAKY+u9i62E0D1eIpLQPFo5/eboZL0bIVY9YHZA53+vCGNFREOXA== elliptic@^6.0.0, elliptic@^6.5.2: 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" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -gifsicle@^5.0.0, gifsicle@jakejarvis/gifsicle-bin#master: +gifsicle@^5.0.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: bin-build "^3.0.0" - bin-wrapper "^4.1.0" + bin-wrapper "^4.0.0" execa "^4.0.0" - logalot "^2.1.0" + logalot "^2.0.0" glob-parent@^3.1.0: version "3.1.0" @@ -4727,9 +4728,9 @@ lint-staged@^10.2.11: stringify-object "^3.3.0" listr2@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.4.0.tgz#aadb094f1f16a96bb9c4dc9b9c3e1d24b1709803" - integrity sha512-Hj2ECZdAxDkuYFtIKE35PgdMSqMp0muIhJRG5EyV5pOWFEUmKUG+fhfFrvIUNGBQvvi7wQ41eKTxDBisfvDjFQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.4.1.tgz#006fc94ae77b3195403cbf3a4a563e2d6366224f" + integrity sha512-8pYsCZCztr5+KAjReLyBeGhLV0vaQ2Du/eMe/ux9QAfQl7efiWejM1IWjALh0zHIRYuIbhQ8N2KztZ4ci56pnQ== dependencies: chalk "^4.1.0" cli-truncate "^2.1.0" @@ -4872,7 +4873,7 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" -logalot@^2.0.0, logalot@^2.1.0: +logalot@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552" 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" 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: version "13.0.1" resolved "https://registry.yarnpkg.com/twemoji/-/twemoji-13.0.1.tgz#57ddc8bd86c8175c11376f5f9ab322a02e739c2d"