From 1188d2732be42eb077d859fe25dbf16d54371013 Mon Sep 17 00:00:00 2001 From: Jon McClure Date: Tue, 21 Jun 2022 17:11:10 +0100 Subject: [PATCH] test lefthook --- .gitignore | 3 +- .lefthook/pre-commit/precheck-file-size.sh | 0 .lefthook/prepare-commit-msg | 42 ---------------------- package.json | 2 +- src/lib/App.svelte | 2 +- yarn.lock | 13 +++++-- 6 files changed, 14 insertions(+), 48 deletions(-) mode change 100644 => 100755 .lefthook/pre-commit/precheck-file-size.sh delete mode 100755 .lefthook/prepare-commit-msg diff --git a/.gitignore b/.gitignore index 5165b73..2540d5f 100644 --- a/.gitignore +++ b/.gitignore @@ -179,4 +179,5 @@ temp/ dist/ graphics-pack/ project-files/docs-ai-ps/ -src/statics/images/docs-ai-ps \ No newline at end of file +src/statics/images/docs-ai-ps +.lefthook-local/ \ No newline at end of file diff --git a/.lefthook/pre-commit/precheck-file-size.sh b/.lefthook/pre-commit/precheck-file-size.sh old mode 100644 new mode 100755 diff --git a/.lefthook/prepare-commit-msg b/.lefthook/prepare-commit-msg deleted file mode 100755 index 0a9d649..0000000 --- a/.lefthook/prepare-commit-msg +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# lefthook_version: 1394d277742ecca749eff87db5035692 - -if [ "$LEFTHOOK" = "0" ]; then - exit 0 -fi - -if [ -t 1 ] ; then - exec < /dev/tty ; # <- enables interactive shell -fi - -dir="$(git rev-parse --show-toplevel)" -osArch=$(echo "$(uname)" | tr '[:upper:]' '[:lower:]') -cpuArch=$(echo "$(uname -m)" | sed 's/aarch64/arm64/') - -call_lefthook() -{ - if lefthook -h >/dev/null 2>&1 - then - eval lefthook $@ - elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook_${osArch}_${cpuArch}/lefthook" - then - eval "$dir/node_modules/@evilmartians/lefthook/bin/lefthook_${osArch}_${cpuArch}/lefthook $@" - elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook_${osArch}_${cpuArch}/lefthook" - then - eval "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook_${osArch}_${cpuArch}/lefthook $@" - elif bundle exec lefthook -h >/dev/null 2>&1 - then - bundle exec lefthook $@ - elif yarn lefthook -h >/dev/null 2>&1 - then - yarn lefthook $@ - elif npx @evilmartians/lefthook -h >/dev/null 2>&1 - then - npx @evilmartians/lefthook $@ - else - echo "Can't find lefthook in PATH" - fi -} - -call_lefthook "run prepare-commit-msg $@" diff --git a/package.json b/package.json index 950a303..b942cf5 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@babel/eslint-parser": "^7.15.4", "@babel/eslint-plugin": "^7.14.5", "@babel/preset-env": "^7.15.6", - "@evilmartians/lefthook": "^1.0.1", + "@evilmartians/lefthook-installer": "^1.0.1", "@reuters-graphics/eslint-config": "^0.0.2", "@reuters-graphics/graphics-bin": "^0.0.26", "@reuters-graphics/graphics-kit-publisher": "^0.2.6", diff --git a/src/lib/App.svelte b/src/lib/App.svelte index 35399c6..994ccf5 100644 --- a/src/lib/App.svelte +++ b/src/lib/App.svelte @@ -14,7 +14,7 @@ Ai2svelte, } from '@reuters-graphics/graphics-svelte-components'; - // Other dependencies you need here + // Other dependencies import { apdate } from 'journalize'; import { marked } from 'marked'; import { truthyString } from '$utils/truthyString'; diff --git a/yarn.lock b/yarn.lock index 055839a..61800f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -941,10 +941,12 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@evilmartians/lefthook@^1.0.1": +"@evilmartians/lefthook-installer@^1.0.1": version "1.0.1" - resolved "https://registry.yarnpkg.com/@evilmartians/lefthook/-/lefthook-1.0.1.tgz#7b09cd1b41820ba8d4ce39fa2b188dd826b46a9a" - integrity sha512-s8yvhcGMvYSYdAGxUZl218gO6A3gVLMYIFHNZEICt0Vn4U66HCp3x+SdPX6YiBEoGbDulh8zRF35eaucHUxYMg== + resolved "https://registry.yarnpkg.com/@evilmartians/lefthook-installer/-/lefthook-installer-1.0.1.tgz#6eef92ed015227b46741ac9628215368a89fb423" + integrity sha512-2JSYdIQ1luWJJNFMkNPQRJ+eY1Bm4xecnR6MaacedizRwOH1/aW2a44Pr3jIdlSUU6Xao4uoVIUoksHmUP7F5A== + dependencies: + node-downloader-helper "^1.0.18" "@fortawesome/fontawesome-common-types@^0.2.36": version "0.2.36" @@ -4839,6 +4841,11 @@ node-addon-api@^3.2.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== +node-downloader-helper@^1.0.18: + version "1.0.19" + resolved "https://registry.yarnpkg.com/node-downloader-helper/-/node-downloader-helper-1.0.19.tgz#f3313543dfaf6fabc58361886f14dca790f0fb6c" + integrity sha512-Bwp8WWDDP5ftg+FmAKU08a9+oiUTPoYzMvXgUqZZPQ7VMo1qKBzW3XdTXHeYnqjGLfkTZ2GPibgAWpApfpeS2g== + node-fetch@^2.3.0, node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.6.7" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"