From 8da27cba81b90883e2e0ee325a8e62c95db97b36 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Thu, 1 Jul 2021 09:15:11 -0400 Subject: [PATCH] shoulda been using cross-fetch this whole time, oops --- assets/js/src/counter.js | 2 +- assets/js/src/projects.js | 2 +- gulpfile.js | 2 +- package.json | 9 ++++---- webpack.config.js | 4 ++-- yarn.lock | 44 +++++++++++++++++++-------------------- 6 files changed, 31 insertions(+), 32 deletions(-) diff --git a/assets/js/src/counter.js b/assets/js/src/counter.js index f8eb20ef..2cd484cc 100644 --- a/assets/js/src/counter.js +++ b/assets/js/src/counter.js @@ -1,4 +1,4 @@ -import fetch from "node-fetch"; +import fetch from "cross-fetch"; // don't continue if there isn't a span#meta-hits element on this page const wrapper = document.getElementById("meta-hits"); diff --git a/assets/js/src/projects.js b/assets/js/src/projects.js index 038a30b9..76a8193d 100644 --- a/assets/js/src/projects.js +++ b/assets/js/src/projects.js @@ -1,4 +1,4 @@ -import fetch from "node-fetch"; +import fetch from "cross-fetch"; // don't continue if there isn't a span#meta-hits element on this page const wrapper = document.getElementById("github-cards"); diff --git a/gulpfile.js b/gulpfile.js index c988bf35..2fdd13ab 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -48,7 +48,7 @@ function optimizeHtml() { function optimizeImages() { return gulp - .src(["public/**/*.{gif,jpg,jpeg,png,svg}", "!public/assets/emoji/*"], { base: "./" }) + .src(["public/**/*.{gif,jpg,jpeg,png,svg}", "!public/assets/emoji/**/*"], { base: "./" }) .pipe( imagemin([ imageminMozjpeg({ diff --git a/package.json b/package.json index ca6afe3a..c04e7332 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "@fontsource/roboto-mono": "4.4.5", "@sentry/node": "^6.8.0", "@sentry/tracing": "^6.8.0", + "cross-fetch": "3.1.4", "dotenv": "^10.0.0", "faunadb": "^4.3.0", "graphql": "^15.5.1", @@ -85,7 +86,7 @@ "hugo-extended": "0.84.3", "lint-staged": "^11.0.0", "markdownlint-cli": "~0.27.1", - "mini-css-extract-plugin": "^1.6.2", + "mini-css-extract-plugin": "^2.0.0", "npm-run-all": "^4.1.5", "postcss": "^8.3.5", "postcss-cli": "^8.3.1", @@ -93,7 +94,7 @@ "postcss-combine-duplicated-selectors": "^10.0.3", "postcss-focus": "^5.0.1", "postcss-import": "^14.0.2", - "postcss-loader": "^6.1.0", + "postcss-loader": "^6.1.1", "postcss-normalize-charset": "^5.0.1", "postcss-reporter": "^7.0.2", "postcss-svgo": "^5.0.2", @@ -109,8 +110,8 @@ "stylelint-scss": "~3.19.0", "terser": "^5.7.1", "terser-webpack-plugin": "^5.1.4", - "typescript": "^4.3.4", - "webpack": "^5.41.0", + "typescript": "^4.3.5", + "webpack": "^5.41.1", "webpack-assets-manifest": "^5.0.6", "webpack-cli": "^4.7.2", "webpack-dev-server": "^3.11.2", diff --git a/webpack.config.js b/webpack.config.js index 6af652e6..4b73d3e7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,5 @@ import path from "path"; -import { fileURLToPath } from 'url'; +import { fileURLToPath } from "url"; import WebpackAssetsManifest from "webpack-assets-manifest"; import SriPlugin from "webpack-subresource-integrity"; import CopyPlugin from "copy-webpack-plugin"; @@ -26,7 +26,7 @@ export default { path.resolve(__dirname, "assets/sass/main.scss"), ], mode: isProd ? "production" : "development", - devtool: isProd ? "hidden-nosources-source-map" : "source-map", + devtool: "source-map", output: { filename: isProd ? "js/[name]-[contenthash:6].js" : "js/[name].js", path: path.resolve(__dirname, "static/assets/"), diff --git a/yarn.lock b/yarn.lock index 4a15faa1..d01c37e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2865,7 +2865,7 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" -cross-fetch@^3.0.6: +cross-fetch@3.1.4, cross-fetch@^3.0.6: version "3.1.4" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39" integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ== @@ -3581,9 +3581,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.723: - version "1.3.761" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.761.tgz#6a1748bab8ed94984391ec8be8a7e7ec1fe3d843" - integrity sha512-7a/wV/plM/b95XjTdA2Q4zAxxExTDKkNQpTiaU/nVT8tGCQVtX9NsnTjhALBFICpOB58hU6xg5fFC3CT2Bybpg== + version "1.3.762" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.762.tgz#3fa4e3bcbda539b50e3aa23041627063a5cffe61" + integrity sha512-LehWjRpfPcK8F1Lf/NZoAwWLWnjJVo0SZeQ9j/tvnBWYcT99qDqgo4raAfS2oTKZjPrR/jxruh85DGgDUmywEA== emoji-regex@^7.0.1: version "7.0.3" @@ -6914,14 +6914,12 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" - integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q== +mini-css-extract-plugin@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.0.0.tgz#e3492a2dcd218a6103e4dec5e3a88b55157012ea" + integrity sha512-LzJaninAMkfVAUDldZ4lUidAeS8GD0w8tSUbZLscYXWmdTOjYuEoiIhwKvwHX6+42D2cRAl35pA9DHtvAv71JQ== dependencies: - loader-utils "^2.0.0" schema-utils "^3.0.0" - webpack-sources "^1.1.0" minimalistic-assert@^1.0.0: version "1.0.1" @@ -7995,10 +7993,10 @@ postcss-load-config@^3.0.0: lilconfig "^2.0.3" yaml "^1.10.2" -postcss-loader@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.1.0.tgz#13c800a00b3c7d434a1319a73d85e2df0714cdde" - integrity sha512-yA/cXBfACkthZNA2hQxOnaReVfQ6uLmvbEDQzNafpbK40URZJvP/28dL1DG174Gvz3ptkkHbbwDBCh+gXR94CA== +postcss-loader@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.1.1.tgz#58dd0a3accd9bc87cc52eff75244db578d11301a" + integrity sha512-lBmJMvRh1D40dqpWKr9Rpygwxn8M74U9uaCSeYGNKLGInbk9mXBt1ultHf2dH9Ghk6Ue4UXlXWwGMH9QdUJ5ug== dependencies: cosmiconfig "^7.0.0" klona "^2.0.4" @@ -10239,10 +10237,10 @@ typescript@3.9.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a" integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ== -typescript@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" - integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== +typescript@^4.3.5: + version "4.3.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" + integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" @@ -10694,7 +10692,7 @@ webpack-merge@^5.7.3: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@^1.1.0, webpack-sources@^1.3.0: +webpack-sources@^1.3.0: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -10717,10 +10715,10 @@ webpack-subresource-integrity@^1.5.2: dependencies: webpack-sources "^1.3.0" -webpack@^5.41.0: - version "5.41.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.41.0.tgz#217daa27bdd30287c1d7f9d9e0a2304fe33c5a51" - integrity sha512-pCVO7hVm8XiL6DpPtXrFLS8ktmH/tpvtbEex6hn4RweTFe6z6Cugh5FlQoEPZotb15HiirjM2Kv7THTA7sKLzQ== +webpack@^5.41.1: + version "5.41.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.41.1.tgz#23fa1d82c95c222d3fc3163806b9a833fe52b253" + integrity sha512-AJZIIsqJ/MVTmegEq9Tlw5mk5EHdGiJbDdz9qP15vmUH+oxI1FdWcL0E9EO8K/zKaRPWqEs7G/OPxq1P61u5Ug== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.48"