Skip to content

Commit

Permalink
Merge pull request #118 from xpadev-net/develop
Browse files Browse the repository at this point in the history
release: v0.2.73
  • Loading branch information
xpadev-net authored Nov 22, 2024
2 parents f7642ae + 26d3a0f commit 1e5139c
Show file tree
Hide file tree
Showing 16 changed files with 1,649 additions and 1,639 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/playwright-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "20"
node-version: "22"
- name: allow write in work dir
run: sudo chmod -R 777 .
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "20"
node-version: "22"
- name: allow write in work dir
run: sudo chmod -R 777 .
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-test-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "20"
node-version: "22"
- name: allow write in work dir
run: sudo chmod -R 777 .
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-test-playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "20"
node-version: "22"
- name: allow write in work dir
run: sudo chmod -R 777 .
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '22'
registry-url: https://registry.npmjs.org
always-auth: true
scope: '@xpadev-net'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-typedoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: setup Node
uses: actions/setup-node@v3
with:
node-version: 20
node-version: 22
registry-url: "https://registry.npmjs.org"
# Runs a single command using the runners shell
- name: init
Expand Down
57 changes: 57 additions & 0 deletions .husky/_/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#!/bin/sh

if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
set -x
fi

if [ "$LEFTHOOK" = "0" ]; then
exit 0
fi

call_lefthook()
{
if test -n "$LEFTHOOK_BIN"
then
"$LEFTHOOK_BIN" "$@"
elif lefthook -h >/dev/null 2>&1
then
lefthook "$@"
else
dir="$(git rev-parse --show-toplevel)"
osArch=$(uname | tr '[:upper:]' '[:lower:]')
cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
then
"$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
then
"$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
then
"$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
elif test -f "$dir/node_modules/lefthook/bin/index.js"
then
"$dir/node_modules/lefthook/bin/index.js" "$@"

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 pnpm lefthook -h >/dev/null 2>&1
then
pnpm lefthook "$@"
elif swift package plugin lefthook >/dev/null 2>&1
then
swift package --disable-sandbox plugin lefthook "$@"
elif command -v mint >/dev/null 2>&1
then
mint run csjones/lefthook-plugin "$@"
else
echo "Can't find lefthook in PATH"
fi
fi
}

call_lefthook run "pre-commit" "$@"
57 changes: 57 additions & 0 deletions .husky/_/prepare-commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#!/bin/sh

if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
set -x
fi

if [ "$LEFTHOOK" = "0" ]; then
exit 0
fi

call_lefthook()
{
if test -n "$LEFTHOOK_BIN"
then
"$LEFTHOOK_BIN" "$@"
elif lefthook -h >/dev/null 2>&1
then
lefthook "$@"
else
dir="$(git rev-parse --show-toplevel)"
osArch=$(uname | tr '[:upper:]' '[:lower:]')
cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
then
"$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
then
"$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
then
"$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
elif test -f "$dir/node_modules/lefthook/bin/index.js"
then
"$dir/node_modules/lefthook/bin/index.js" "$@"

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 pnpm lefthook -h >/dev/null 2>&1
then
pnpm lefthook "$@"
elif swift package plugin lefthook >/dev/null 2>&1
then
swift package --disable-sandbox plugin lefthook "$@"
elif command -v mint >/dev/null 2>&1
then
mint run csjones/lefthook-plugin "$@"
else
echo "Can't find lefthook in PATH"
fi
fi
}

call_lefthook run "prepare-commit-msg" "$@"
5 changes: 0 additions & 5 deletions .husky/pre-commit

This file was deleted.

6 changes: 6 additions & 0 deletions lefthook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pre-commit:
commands:
check:
glob: "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}"
run: npx @biomejs/biome check --write --no-errors-on-unmatched --files-ignore-unknown=true --colors=off {staged_files}
stage_fixed: true
5 changes: 0 additions & 5 deletions lint-staged.config.mjs

This file was deleted.

40 changes: 18 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@xpadev-net/niconicomments",
"version": "0.2.72",
"version": "0.2.73",
"description": "NiconiComments is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.",
"main": "dist/bundle.js",
"types": "dist/bundle.d.ts",
Expand All @@ -18,7 +18,7 @@
"format:fix": "biome format --write src",
"lint": "biome check src",
"lint:fix": "biome check --apply-unsafe src",
"prepare": "husky install",
"prepare": "lefthook install",
"test": "docker-compose run --rm pw",
"test-server": "http-server"
},
Expand All @@ -38,35 +38,31 @@
"bugs": {
"url": "https://github.com/xpadev-net/niconicomments/issues"
},
"files": [
"dist/bundle.js",
"dist/bundle.d.ts"
],
"files": ["dist/bundle.js", "dist/bundle.d.ts"],
"homepage": "https://xpadev-net.github.io/niconicomments/",
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/preset-env": "^7.24.4",
"@biomejs/biome": "1.7.1",
"@playwright/test": "^1.43.0",
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@biomejs/biome": "^1.9.4",
"@playwright/test": "^1.49.0",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-commonjs": "^28.0.1",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-typescript": "^11.1.6",
"@types/node": "^20.12.7",
"@types/node": "^22.9.0",
"copyfiles": "^2.4.1",
"http-server": "^14.1.1",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"rimraf": "^5.0.5",
"rollup": "^4.14.1",
"rollup-plugin-dts": "^6.1.0",
"lefthook": "^1.8.4",
"rimraf": "^6.0.1",
"rollup": "^4.27.3",
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-typescript-paths": "^1.5.0",
"tslib": "^2.6.2",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.2.0",
"typescript": "^5.4.5",
"tslib": "^2.8.1",
"typedoc": "^0.26.11",
"typedoc-plugin-missing-exports": "^3.0.2",
"typescript": "^5.6.3",
"valibot": "^0.30.0"
}
}
Loading

0 comments on commit 1e5139c

Please sign in to comment.