From 08d4ab70f749958e44b04e8f8283e8b7a0166247 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Dec 2024 15:44:04 +0000 Subject: [PATCH 1/2] chore(deps): update dependency husky to v9 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02fdcec11..3557ea50f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-react": "^7.35.0", "globals": "^15.14.0", - "husky": "8.0.3", + "husky": "9.1.7", "jest": "29.7.0", "json-autotranslate": "1.14.5", "lerna": "6.6.2", @@ -10163,16 +10163,16 @@ } }, "node_modules/husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, "license": "MIT", "bin": { - "husky": "lib/bin.js" + "husky": "bin.js" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/typicode" diff --git a/package.json b/package.json index ff9e48eb5..a0af4d7ac 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-react": "^7.35.0", "globals": "^15.14.0", - "husky": "8.0.3", + "husky": "9.1.7", "jest": "29.7.0", "json-autotranslate": "1.14.5", "lerna": "6.6.2", From 36fc3539c0579da47a6c0dec26e130ce473f5d62 Mon Sep 17 00:00:00 2001 From: Sebastian Rettig Date: Sun, 12 Jan 2025 18:06:29 +0100 Subject: [PATCH 2/2] refactor: updated to husky v9 format --- .gitignore | 1 + .husky/commit-msg | 5 +---- .husky/pre-commit | 6 ++---- .husky/pre-push | 3 --- eslint.config.mjs | 1 + package.json | 2 +- packages/h5p-examples/package.json | 2 +- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 0fe4819c7..4f0448106 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ test/data/hub-content/* test/data/content-type-cache/real-content-types.json test/data/hub-content-extracted/* packages/h5p-html-exporter/test/data/content/* +packages/h5p-examples/public google_translate.json .json-autotranslate-cache diff --git a/.husky/commit-msg b/.husky/commit-msg index 8796e175e..70698824d 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx commitlint --edit $1 \ No newline at end of file +commitlint --edit $1 \ No newline at end of file diff --git a/.husky/pre-commit b/.husky/pre-commit index 9e42d8f06..dfae0534f 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,2 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npm run lint && npm run format:check \ No newline at end of file +npm run lint +npm run format:check \ No newline at end of file diff --git a/.husky/pre-push b/.husky/pre-push index e8a402fa0..aaadc6135 100755 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - npm run test \ No newline at end of file diff --git a/eslint.config.mjs b/eslint.config.mjs index fe9370b15..a32b0867e 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -17,6 +17,7 @@ export default [ '**/test/data/', 'scripts/', 'packages/h5p-examples/h5p/', + 'packages/h5p-examples/public/', 'packages/h5p-rest-example-server/h5p/', '**/node_modules/', '**/*.d.ts', diff --git a/package.json b/package.json index a0af4d7ac..9bd35d121 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "localize": "./localize.sh", "postinstall": "npx lerna bootstrap && concurrently \"npm run build\" \"npm run download:content-type-cache && npm run download:h5p\"", "pre-commit": "concurrently \"npm:lint\" \"npm:format\"", - "prepare": "husky install", + "prepare": "husky", "publish:h5p-express": "cd packages/h5p-express && npm publish", "publish:h5p-html-exporter": "cd packages/h5p-html-exporter && npm publish", "publish:h5p-mongos3": "cd packages/h5p-mongos3 && npm publish", diff --git a/packages/h5p-examples/package.json b/packages/h5p-examples/package.json index bf0e1b143..3550e7c11 100644 --- a/packages/h5p-examples/package.json +++ b/packages/h5p-examples/package.json @@ -8,7 +8,7 @@ "build:client": "npx tsc -p ./tsconfig.client.json", "build:server": "npx tsc -p ./tsconfig.server.json", "build": "npm run build:server && npm run build:client", - "clean": "rm -rf h5p && rm -rf build && rm -rf coverage && rm -rf node_modules", + "clean": "rm -rf h5p && rm -rf build && rm -rf coverage && rm -rf node_modules && rm -rf public", "start": "node build/express.js", "test:e2e:tests": "npx jest --config jest.e2e.config.js --maxWorkers=1", "test:e2e": "start-server-and-test start http://localhost:8080 test:e2e:tests",