diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77d5c5a..a66ccfb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,8 @@ on: push: tags: - "*" + branches: + - main pull_request: branches: - main diff --git a/.husky/pre-commit b/.husky/pre-commit old mode 100755 new mode 100644 index 20d0d06..3867a0f --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - npm run lint diff --git a/package-lock.json b/package-lock.json index b9a70dc..b9bf92a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@fontsource/montserrat": "^5.0.18", "@types/jest": "^29.2.5", "concurrently": "^8.0.0", - "husky": "^8.0.3", + "husky": "^9.1.1", "jest": "^29.3.1", "postcss-scss": "^4.0.5", "pug-lint": "^2.6.0", @@ -25,8 +25,7 @@ "typescript": "^5.0.0" }, "engines": { - "node": ">=14.15.3", - "npm": ">=6.14.9" + "node": ">=18.0.0" } }, "node_modules/@ampproject/remapping": { @@ -3132,15 +3131,15 @@ } }, "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.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.1.tgz", + "integrity": "sha512-fCqlqLXcBnXa/TJXmT93/A36tJsjdJkibQ1MuIiFyCCYUlpYpIaj2mv1w+3KR6Rzu1IC3slFTje5f6DUp2A2rg==", "dev": true, "bin": { - "husky": "lib/bin.js" + "husky": "bin.js" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/typicode" @@ -8331,9 +8330,9 @@ "dev": true }, "husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.1.tgz", + "integrity": "sha512-fCqlqLXcBnXa/TJXmT93/A36tJsjdJkibQ1MuIiFyCCYUlpYpIaj2mv1w+3KR6Rzu1IC3slFTje5f6DUp2A2rg==", "dev": true }, "ignore": { diff --git a/package.json b/package.json index 0575b49..729f048 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "pug:lint": "pug-lint src && pug-lint part", "sass:lint": "stylelint \"src/**/*.scss\"", "sass:lint:fix": "stylelint \"src/**/*.scss\" --fix", - "prepare": "husky install", - "build": "tsx build.ts" + "build": "tsx build.ts", + "prepare": "husky" }, "repository": "github:tikui/tikuidoc-tikui", "author": "Anthony Rey", @@ -26,14 +26,13 @@ }, "homepage": "https://github.com/tikui/tikuidoc-tikui#readme", "engines": { - "node": ">=14.15.3", - "npm": ">=6.14.9" + "node": ">=18.0.0" }, "devDependencies": { "@fontsource/montserrat": "^5.0.18", "@types/jest": "^29.2.5", "concurrently": "^8.0.0", - "husky": "^8.0.3", + "husky": "^9.1.1", "jest": "^29.3.1", "postcss-scss": "^4.0.5", "pug-lint": "^2.6.0",