Merge branch 'dev' into eslint-v9

pixiv · Mar 4, 2025 · 27f28a9 · 27f28a9
2 parents afa2fd1 + e7df10c
commit 27f28a9
Show file tree

Hide file tree

Showing 24 changed files with 401 additions and 553 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -27,7 +27,7 @@
         "format": ["camelCase"]
       },
       {
-        "selector": "variable",
+        "selector": "variableLike",
         "format": ["camelCase", "UPPER_CASE"],
         "leadingUnderscore": "allow"
       },

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -128,18 +128,38 @@ These type definitions are authored manually by referencing the [vrm spec schema
 
 ## How to release
 
-There is a GitHub Actions workflow called "Publish to npmjs".
+### Publish to npm
+
+Run the workflow "Publish to npmjs": https://github.com/pixiv/three-vrm/actions/workflows/publish.yml
+You can trigger the workflow by clicking the "Run workflow" button at the top right of the page.
+
 The workflow is defined in `.github/workflows/publish.yml`.
 
-https://github.com/pixiv/three-vrm/actions/workflows/publish.yml
+### Merge `dev` into `release`
+
+```sh
+# Assuming you are on the `dev` branch
+git pull
+git switch release
+git pull
+git merge dev
+git push
+git switch dev
+```
+
+### Add a release note
+
+Add a release note: https://github.com/pixiv/three-vrm/releases
+
+Copying the release note from the previous release helps you to create a new release note.
+
+### Manage milestones
 
-After the workflow done, don't forget to:
+Manage milestones: https://github.com/pixiv/three-vrm/milestones
 
-- Add a release note: https://github.com/pixiv/three-vrm/releases
-- Manage the milestone: https://github.com/pixiv/three-vrm/milestones
-  - Rename the existing `next` milestone to the version
-  - Close the milestone
-  - Open a new `next` milestone
+- Rename the existing `next` milestone to the version
+- Close the milestone
+- Open a new `next` milestone
 
 ## When you add a new package to the repository
 

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019-2024 pixiv Inc.
+Copyright (c) 2019-2025 pixiv Inc.
 
 MIT License
 

diff --git a/bin/build.mjs b/bin/build.mjs
@@ -28,7 +28,7 @@ async function buildPackage(absWorkingDir) {
 
   // == constants ====================================================================================
   /** copyright text */
-  const copyright = '(c) 2019-2024 pixiv Inc.';
+  const copyright = '(c) 2019-2025 pixiv Inc.';
 
   /** name of the license */
   const licenseName = 'MIT License';

diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "npmClient": "yarn",
   "packages": ["packages/*"],
-  "version": "3.3.2"
+  "version": "3.3.4"
 }
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "@types/jest": "^29.5.12",
     "@types/node": "^22.7.5",
     "cross-env": "^7.0.2",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.25.0",
     "eslint": "^9.17.0",
     "eslint-config-mdcs": "^5.0.0",
     "eslint-plugin-html": "^8.1.2",
@@ -38,7 +38,7 @@
     "rimraf": "^6.0.1",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "typedoc": "^0.26.9",
+    "typedoc": "^0.27.7",
     "typescript": "^5.4.5",
     "typescript-eslint": "^8.18.2"
   },

diff --git a/packages/three-vrm-animation/package.json b/packages/three-vrm-animation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pixiv/three-vrm-animation",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "The implementation of VRM Animation",
   "license": "MIT",
   "author": "pixiv",
@@ -47,13 +47,13 @@
     ]
   },
   "dependencies": {
-    "@pixiv/three-vrm-core": "3.3.2",
-    "@pixiv/types-vrmc-vrm-1.0": "3.3.2",
-    "@pixiv/types-vrmc-vrm-animation-1.0": "3.3.2"
+    "@pixiv/three-vrm-core": "3.3.4",
+    "@pixiv/types-vrmc-vrm-1.0": "3.3.4",
+    "@pixiv/types-vrmc-vrm-animation-1.0": "3.3.4"
   },
   "devDependencies": {
     "@types/three": "^0.169.0",
-    "lint-staged": "15.2.10",
+    "lint-staged": "15.4.3",
     "three": "^0.169.0"
   },
   "peerDependencies": {

diff --git a/packages/three-vrm-core/package.json b/packages/three-vrm-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pixiv/three-vrm-core",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "The implementation of core features of VRM, for @pixiv/three-vrm",
   "license": "MIT",
   "author": "pixiv",
@@ -51,8 +51,8 @@
     ]
   },
   "dependencies": {
-    "@pixiv/types-vrm-0.0": "3.3.2",
-    "@pixiv/types-vrmc-vrm-1.0": "3.3.2"
+    "@pixiv/types-vrm-0.0": "3.3.4",
+    "@pixiv/types-vrmc-vrm-1.0": "3.3.4"
   },
   "devDependencies": {
     "@types/three": "^0.169.0",

diff --git a/packages/three-vrm-materials-hdr-emissive-multiplier/package.json b/packages/three-vrm-materials-hdr-emissive-multiplier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pixiv/three-vrm-materials-hdr-emissive-multiplier",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "Support VRMC_hdr_emissiveMultiplier for @pixiv/three-vrm",
   "license": "MIT",
   "author": "pixiv",
@@ -50,7 +50,7 @@
     ]
   },
   "dependencies": {
-    "@pixiv/types-vrmc-materials-hdr-emissive-multiplier-1.0": "3.3.2"
+    "@pixiv/types-vrmc-materials-hdr-emissive-multiplier-1.0": "3.3.4"
   },
   "devDependencies": {
     "@types/three": "^0.169.0",

diff --git a/packages/three-vrm-materials-mtoon/package.json b/packages/three-vrm-materials-mtoon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pixiv/three-vrm-materials-mtoon",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "MToon (toon material) module for @pixiv/three-vrm",
   "license": "MIT",
   "author": "pixiv",
@@ -55,8 +55,8 @@
     ]
   },
   "dependencies": {
-    "@pixiv/types-vrm-0.0": "3.3.2",
-    "@pixiv/types-vrmc-materials-mtoon-1.0": "3.3.2"
+    "@pixiv/types-vrm-0.0": "3.3.4",
+    "@pixiv/types-vrmc-materials-mtoon-1.0": "3.3.4"
   },
   "devDependencies": {
     "@types/three": "^0.169.0",

diff --git a/packages/three-vrm-materials-v0compat/package.json b/packages/three-vrm-materials-v0compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pixiv/three-vrm-materials-v0compat",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "VRM0.0 materials compatibility layer plugin for @pixiv/three-vrm",
   "license": "MIT",
   "author": "pixiv",
@@ -46,8 +46,8 @@
     ]
   },
   "dependencies": {
-    "@pixiv/types-vrm-0.0": "3.3.2",
-    "@pixiv/types-vrmc-materials-mtoon-1.0": "3.3.2"
+    "@pixiv/types-vrm-0.0": "3.3.4",
+    "@pixiv/types-vrmc-materials-mtoon-1.0": "3.3.4"
   },
   "devDependencies": {
     "@types/three": "^0.169.0",

diff --git a/packages/three-vrm-node-constraint/package.json b/packages/three-vrm-node-constraint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pixiv/three-vrm-node-constraint",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "Node constraint module for @pixiv/three-vrm",
   "license": "MIT",
   "author": "pixiv",
@@ -51,7 +51,7 @@
     ]
   },
   "dependencies": {
-    "@pixiv/types-vrmc-node-constraint-1.0": "3.3.2"
+    "@pixiv/types-vrmc-node-constraint-1.0": "3.3.4"
   },
   "devDependencies": {
     "@types/three": "^0.169.0",

diff --git a/packages/three-vrm-springbone/package.json b/packages/three-vrm-springbone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pixiv/three-vrm-springbone",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "Spring bone module for @pixiv/three-vrm",
   "license": "MIT",
   "author": "pixiv",
@@ -51,9 +51,9 @@
     ]
   },
   "dependencies": {
-    "@pixiv/types-vrm-0.0": "3.3.2",
-    "@pixiv/types-vrmc-springbone-1.0": "3.3.2",
-    "@pixiv/types-vrmc-springbone-extended-collider-1.0": "3.3.2"
+    "@pixiv/types-vrm-0.0": "3.3.4",
+    "@pixiv/types-vrmc-springbone-1.0": "3.3.4",
+    "@pixiv/types-vrmc-springbone-extended-collider-1.0": "3.3.4"
   },
   "devDependencies": {
     "@types/three": "^0.169.0",

diff --git a/packages/three-vrm/package.json b/packages/three-vrm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pixiv/three-vrm",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "VRM file loader for three.js.",
   "license": "MIT",
   "author": "pixiv",
@@ -56,12 +56,12 @@
     ]
   },
   "dependencies": {
-    "@pixiv/three-vrm-core": "3.3.2",
-    "@pixiv/three-vrm-materials-hdr-emissive-multiplier": "3.3.2",
-    "@pixiv/three-vrm-materials-mtoon": "3.3.2",
-    "@pixiv/three-vrm-materials-v0compat": "3.3.2",
-    "@pixiv/three-vrm-node-constraint": "3.3.2",
-    "@pixiv/three-vrm-springbone": "3.3.2"
+    "@pixiv/three-vrm-core": "3.3.4",
+    "@pixiv/three-vrm-materials-hdr-emissive-multiplier": "3.3.4",
+    "@pixiv/three-vrm-materials-mtoon": "3.3.4",
+    "@pixiv/three-vrm-materials-v0compat": "3.3.4",
+    "@pixiv/three-vrm-node-constraint": "3.3.4",
+    "@pixiv/three-vrm-springbone": "3.3.4"
   },
   "devDependencies": {
     "@types/three": "^0.169.0",