Skip to content

Commit f4e914f

Browse files
Merge pull request #57 from Live2D/develop
Update to Cubism 5 SDK for Web R3
2 parents ab36f45 + 878af6a commit f4e914f

8 files changed

Lines changed: 801 additions & 1147 deletions

File tree

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

77

8+
## [5-r.3] - 2025-02-18
9+
10+
### Changed
11+
12+
* Change ESLint version to `9.17.0`.
13+
* With this update, we have added the eslint.confing.mjs required for FlatConfig.
14+
15+
816
## [5-r.2] - 2024-12-19
917

1018
### Added
@@ -275,6 +283,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
275283
* Fix issue with reloading model images in WebKit.
276284

277285

286+
[5-r.3]: https://github.com/Live2D/CubismWebSamples/compare/5-r.2...5-r.3
278287
[5-r.2]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1...5-r.2
279288
[5-r.1]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.4...5-r.1
280289
[5-r.1-beta.4]: https://github.com/Live2D/CubismWebSamples/compare/5-r.1-beta.3...5-r.1-beta.4

README.ja.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
102102

103103
| プラットフォーム | ブラウザ | バージョン |
104104
| --- | --- | --- |
105-
| Android | Google Chrome | 131.0.6778.135 |
105+
| Android | Google Chrome | 133.0.6943.50 |
106106
| Android | Microsoft Edge | 131.0.2903.87 |
107107
| Android | Mozilla Firefox | 133.0.3 |
108108
| iOS / iPadOS | Google Chrome | 131.0.6778.134 |
@@ -114,7 +114,7 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
114114
| macOS | Mozilla Firefox | 133.0.3 |
115115
| macOS | Safari | 18.2 |
116116
| Windows | Google Chrome | 131.0.6778.140 |
117-
| Windows | Microsoft Edge | 131.0.2903.99 |
117+
| Windows | Microsoft Edge | 133.0.3065.69 |
118118
| Windows | Mozilla Firefox | 133.0.3 |
119119

120120
Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json``serve` スクリプトを使用して行っています。

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
103103

104104
| Platform | Browser | Version |
105105
| --- | --- | --- |
106-
| Android | Google Chrome | 131.0.6778.135 |
106+
| Android | Google Chrome | 133.0.6943.50 |
107107
| Android | Microsoft Edge | 131.0.2903.87 |
108108
| Android | Mozilla Firefox | 133.0.3 |
109109
| iOS / iPadOS | Google Chrome | 131.0.6778.134 |
@@ -115,7 +115,7 @@ Core : [CHANGELOG.md](Core/CHANGELOG.md)
115115
| macOS | Mozilla Firefox | 133.0.3 |
116116
| macOS | Safari | 18.2 |
117117
| Windows | Google Chrome | 131.0.6778.140 |
118-
| Windows | Microsoft Edge | 131.0.2903.99 |
118+
| Windows | Microsoft Edge | 133.0.3065.69 |
119119
| Windows | Mozilla Firefox | 133.0.3 |
120120

121121
Note: You can start the server for operation check by running the `serve` script of `./Samples/TypeScript/Demo/package.json`.

Samples/TypeScript/Demo/.eslintrc.yml

Lines changed: 0 additions & 115 deletions
This file was deleted.
Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
import eslint from '@eslint/js';
2+
import tseslint from 'typescript-eslint';
3+
import globals from 'globals';
4+
import eslintConfigPrettier from 'eslint-config-prettier';
5+
import eslintPluginPrettier from 'eslint-plugin-prettier';
6+
7+
export default tseslint.config(
8+
eslint.configs.recommended,
9+
tseslint.configs.eslintRecommended,
10+
...tseslint.configs.recommended,
11+
...tseslint.configs.recommendedTypeChecked,
12+
eslintConfigPrettier,
13+
{
14+
languageOptions:
15+
{
16+
parserOptions:
17+
{
18+
sourceType: 'module',
19+
ecmaVersion: 2020,
20+
project: './tsconfig.json',
21+
},
22+
globals:
23+
{
24+
...globals.browser,
25+
},
26+
},
27+
plugins:
28+
{
29+
'prettier': eslintPluginPrettier,
30+
},
31+
rules:
32+
{
33+
'prettier/prettier': [
34+
'error',
35+
{
36+
singleQuote: true,
37+
trailingComma: 'none',
38+
arrowParens: 'avoid',
39+
}
40+
],
41+
camelcase: 'off',
42+
'@typescript-eslint/naming-convention': [
43+
'warn',
44+
{
45+
selector: 'default',
46+
format: ['camelCase'],
47+
},
48+
{
49+
selector: 'import',
50+
format: ['PascalCase'],
51+
},
52+
{
53+
selector: 'variable',
54+
format: [],
55+
custom: {
56+
// 指定の文字列で始まるものと特定の文字を含むものは許容
57+
regex: '^[A-Z]|^csm|^iterator|Shader',
58+
match: true,
59+
},
60+
modifiers: ['exported', 'const'],
61+
},
62+
{
63+
selector: 'variable',
64+
format: ['camelCase'],
65+
},
66+
{
67+
selector: 'variable',
68+
format: [],
69+
custom: {
70+
// 指定の文字列で始まるものは許容
71+
regex: '^[A-Z]|^s_',
72+
match: true,
73+
},
74+
modifiers: ['global']
75+
},
76+
{
77+
selector: 'enum',
78+
format: ['PascalCase'],
79+
},
80+
{
81+
selector: 'enumMember',
82+
format: [],
83+
custom: {
84+
// 大文字から始まること
85+
regex: '^[A-Z]',
86+
match: true,
87+
}
88+
},
89+
{
90+
selector: 'classProperty',
91+
format: ['PascalCase'],
92+
modifiers: ['static', 'readonly']
93+
},
94+
{
95+
selector: 'classProperty',
96+
format: ['camelCase'],
97+
leadingUnderscore: 'allow',
98+
},
99+
{
100+
selector: 'class',
101+
format: [],
102+
custom: {
103+
// 指定の文字列で始まるか、指定の文字列で終わること
104+
regex: '^[A-Z]|^csm|^iterator|_WebGL$',
105+
match: true,
106+
}
107+
},
108+
{
109+
selector: 'interface',
110+
format: ['camelCase', 'PascalCase'],
111+
},
112+
{
113+
selector: 'parameter',
114+
format: ['camelCase'],
115+
},
116+
{
117+
selector: 'classMethod',
118+
format: ['camelCase'],
119+
},
120+
{
121+
selector: 'objectLiteralProperty',
122+
format: ['camelCase', 'PascalCase'],
123+
},
124+
{
125+
selector: 'typeAlias',
126+
format: [],
127+
custom: {
128+
// 指定の文字列で始まるものは許容
129+
regex: '^[A-Z]|^[a-z]|^CSM_|^csm|^iterator',
130+
match: true,
131+
},
132+
modifiers: ['exported']
133+
},
134+
{
135+
selector: 'typeAlias',
136+
format: ['camelCase'],
137+
},
138+
{
139+
selector: 'typeParameter',
140+
format: [],
141+
custom:
142+
{
143+
// 「大文字+アンダースコア以外の文字」、あるいは「大文字1文字」
144+
// あるいは、「`T`+アンダースコア」で始まる場合
145+
regex: '^[A-Z][^_]|^[A-Z]|^T_$',
146+
match: true,
147+
},
148+
leadingUnderscore: 'allow',
149+
},
150+
], // @typescript-eslint/naming-convention
151+
'@typescript-eslint/no-use-before-define': 'off',
152+
'@typescript-eslint/ban-ts-comment': 'off',
153+
'@typescript-eslint/unbound-method': 'off',
154+
'@typescript-eslint/no-unsafe-assignment': 'off',
155+
'@typescript-eslint/no-unsafe-return': 'off',
156+
'@typescript-eslint/no-floating-promises': 'off',
157+
'@typescript-eslint/no-unused-vars': 'off',
158+
'@typescript-eslint/no-explicit-any': 'off',
159+
},
160+
},
161+
{
162+
// ignores property はなぜか単独で指定していないと効果がない。
163+
ignores: [
164+
'**/*.*',
165+
'!src/**/*.ts',
166+
],
167+
},
168+
);

0 commit comments

Comments
 (0)