Skip to content

Commit d80778e

Browse files
authored
Upgrade devdependecies version (#1650)
1 parent a84eb5c commit d80778e

25 files changed

+939
-671
lines changed

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
parser: "@typescript-eslint/parser", // Eslint TypeScript Parser
3-
extends: ["prettier/@typescript-eslint", "plugin:prettier/recommended"],
3+
extends: ["plugin:prettier/recommended"],
44
plugins: ["@typescript-eslint"],
55
parserOptions: {
66
ecmaVersion: 2019,

package.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
"@rollup/plugin-inject": "^4.0.2",
2727
"@rollup/plugin-node-resolve": "^11.0.1",
2828
"@rollup/plugin-replace": "^2.3.4",
29-
"@swc/core": "^1.3.32",
30-
"@swc/helpers": "^0.5",
29+
"@swc/core": "^1.3.49",
30+
"@swc/helpers": "^0.5.1",
3131
"@types/chai": "^4.3.1",
3232
"@types/chai-spies": "^1.0.3",
3333
"@types/mocha": "^8.0.0",
3434
"@types/node": "^18.7.16",
35-
"@types/offscreencanvas": "^2019.6.4",
36-
"@typescript-eslint/eslint-plugin": "^4.12.0",
37-
"@typescript-eslint/parser": "^4.12.0",
35+
"@typescript-eslint/eslint-plugin": "^6.1.0",
36+
"@typescript-eslint/parser": "^6.1.0",
3837
"chai": "^4.3.6",
3938
"chai-spies": "^1.0.0",
4039
"cross-env": "^5.2.0",
4140
"electron": "^13",
42-
"eslint": "^7.17.0",
43-
"eslint-config-prettier": "^7.1.0",
44-
"eslint-plugin-prettier": "^3.1.1",
41+
"eslint": "^8.44.0",
42+
"eslint-config-prettier": "^8.8.0",
43+
"eslint-plugin-prettier": "^5.0.0",
4544
"floss": "^5.0.1",
4645
"husky": "^4.3.7",
4746
"lint-staged": "^10.5.3",
4847
"nyc": "^15.1.0",
49-
"prettier": "^2.2.1",
48+
"prettier": "^3.0.0",
5049
"rollup": "^2.36.1",
5150
"rollup-plugin-glslify": "^1.2.0",
5251
"rollup-plugin-modify": "^3.0.0",
5352
"rollup-plugin-serve": "^1.1.0",
5453
"rollup-plugin-swc3": "^0.8.0",
5554
"ts-node": "^10",
56-
"typescript": "^4.8.4"
55+
"typescript": "^5.1.6"
5756
},
5857
"husky": {
5958
"hooks": {

packages/core/src/mesh/PrimitiveMeshRestorer.ts

+15-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import { PrimitiveMesh } from "./PrimitiveMesh";
77
* @internal
88
*/
99
export class PrimitiveMeshRestorer extends ContentRestorer<ModelMesh> {
10-
constructor(resource: ModelMesh, public primitiveInfo: PrimitiveRestoreInfo) {
10+
constructor(
11+
resource: ModelMesh,
12+
public primitiveInfo: PrimitiveRestoreInfo
13+
) {
1114
super(resource);
1215
}
1316

@@ -122,14 +125,23 @@ enum PrimitiveType {
122125
* @internal
123126
*/
124127
export class PrimitiveRestoreInfo {
125-
constructor(public type: PrimitiveType, public vertexBuffer: Buffer, public noLongerAccessible: boolean) {}
128+
constructor(
129+
public type: PrimitiveType,
130+
public vertexBuffer: Buffer,
131+
public noLongerAccessible: boolean
132+
) {}
126133
}
127134

128135
/**
129136
* @internal
130137
*/
131138
export class SphereRestoreInfo extends PrimitiveRestoreInfo {
132-
constructor(public radius: number, public segments: number, vertexBuffer: Buffer, noLongerAccessible: boolean) {
139+
constructor(
140+
public radius: number,
141+
public segments: number,
142+
vertexBuffer: Buffer,
143+
noLongerAccessible: boolean
144+
) {
133145
super(PrimitiveType.Sphere, vertexBuffer, noLongerAccessible);
134146
}
135147
}

packages/core/src/renderingHardwareInterface/IPlatformTexture2D.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export interface IPlatformTexture2D extends IPlatformTexture {
3333
* @param y - Y coordinate of area start
3434
*/
3535
setImageSource(
36-
imageSource: TexImageSource | OffscreenCanvas,
36+
imageSource: TexImageSource,
3737
mipLevel: number,
3838
flipY: boolean,
3939
premultiplyAlpha: boolean,

packages/core/src/renderingHardwareInterface/IPlatformTexture2DArray.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface IPlatformTexture2DArray extends IPlatformTexture {
3838
*/
3939
setImageSource(
4040
index: number,
41-
imageSource: TexImageSource | OffscreenCanvas,
41+
imageSource: TexImageSource,
4242
mipLevel: number,
4343
flipY: boolean,
4444
premultiplyAlpha: boolean,

packages/core/src/renderingHardwareInterface/IPlatformTextureCube.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface IPlatformTextureCube extends IPlatformTexture {
3838
*/
3939
setImageSource(
4040
face: TextureCubeFace,
41-
imageSource: TexImageSource | OffscreenCanvas,
41+
imageSource: TexImageSource,
4242
mipLevel: number,
4343
flipY: boolean,
4444
premultiplyAlpha: boolean,

packages/core/src/shader/Shader.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,10 @@ export class Shader {
9090
return this._subShaders;
9191
}
9292

93-
private constructor(public readonly name: string, subShaders: SubShader[]) {
93+
private constructor(
94+
public readonly name: string,
95+
subShaders: SubShader[]
96+
) {
9497
this.name = name;
9598
this._subShaders = subShaders;
9699
}

packages/core/src/shader/SubShader.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ export class SubShader extends ShaderPart {
1919
* @param name - Name of the sub shader
2020
* @param passes - Sub shader passes
2121
*/
22-
constructor(public readonly name: string, passes: ShaderPass[], tags?: Record<string, number | string | boolean>) {
22+
constructor(
23+
public readonly name: string,
24+
passes: ShaderPass[],
25+
tags?: Record<string, number | string | boolean>
26+
) {
2327
super();
2428
const passCount = passes.length;
2529
if (passCount < 1) {

packages/core/src/texture/Texture2D.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class Texture2D extends Texture {
8181
* @param y - Y coordinate of area start
8282
*/
8383
setImageSource(
84-
imageSource: TexImageSource | OffscreenCanvas,
84+
imageSource: TexImageSource,
8585
mipLevel: number = 0,
8686
flipY: boolean = false,
8787
premultiplyAlpha: boolean = false,

packages/core/src/texture/Texture2DArray.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export class Texture2DArray extends Texture {
9595
*/
9696
setImageSource(
9797
elementIndex: number,
98-
imageSource: TexImageSource | OffscreenCanvas,
98+
imageSource: TexImageSource,
9999
mipLevel: number = 0,
100100
flipY: boolean = false,
101101
premultiplyAlpha: boolean = false,

packages/core/src/texture/TextureCube.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class TextureCube extends Texture {
6767
*/
6868
setImageSource(
6969
face: TextureCubeFace,
70-
imageSource: TexImageSource | OffscreenCanvas,
70+
imageSource: TexImageSource,
7171
mipLevel: number = 0,
7272
flipY: boolean = false,
7373
premultiplyAlpha: boolean = false,

packages/loader/src/GLTFContentRestorer.ts

+13-3
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,21 @@ export class GLTFContentRestorer extends ContentRestorer<GLTFResource> {
127127
* @internal
128128
*/
129129
export class BufferRequestInfo {
130-
constructor(public url: string, public config: RequestConfig) {}
130+
constructor(
131+
public url: string,
132+
public config: RequestConfig
133+
) {}
131134
}
132135

133136
/**
134137
* @internal
135138
*/
136139
export class BufferTextureRestoreInfo {
137-
constructor(public texture: Texture2D, public bufferView: IBufferView, public mimeType: string) {}
140+
constructor(
141+
public texture: Texture2D,
142+
public bufferView: IBufferView,
143+
public mimeType: string
144+
) {}
138145
}
139146

140147
/**
@@ -151,7 +158,10 @@ export class ModelMeshRestoreInfo {
151158
* @internal
152159
*/
153160
export class BufferRestoreInfo {
154-
constructor(public buffer: Buffer, public data: BufferDataRestoreInfo) {}
161+
constructor(
162+
public buffer: Buffer,
163+
public data: BufferDataRestoreInfo
164+
) {}
155165
}
156166

157167
/**

packages/loader/src/Texture2DContentRestorer.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ import { RequestConfig } from "@galacean/engine-core/types/asset/request";
55
* @internal
66
*/
77
export class Texture2DContentRestorer extends ContentRestorer<Texture2D> {
8-
constructor(resource: Texture2D, public url: string, public requestConfig: RequestConfig) {
8+
constructor(
9+
resource: Texture2D,
10+
public url: string,
11+
public requestConfig: RequestConfig
12+
) {
913
super(resource);
1014
}
1115

packages/loader/src/TextureCubeContentRestorer.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ import { RequestConfig } from "@galacean/engine-core/types/asset/request";
55
* @internal
66
*/
77
export class TextureCubeContentRestorer extends ContentRestorer<TextureCube> {
8-
constructor(resource: TextureCube, public urls: string[], public requestConfig: RequestConfig) {
8+
constructor(
9+
resource: TextureCube,
10+
public urls: string[],
11+
public requestConfig: RequestConfig
12+
) {
913
super(resource);
1014
}
1115

packages/loader/src/gltf/parser/GLTFParserContext.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ export class BufferInfo {
6565

6666
restoreInfo: BufferDataRestoreInfo;
6767

68-
constructor(public data: TypedArray, public interleaved: boolean, public stride: number) {}
68+
constructor(
69+
public data: TypedArray,
70+
public interleaved: boolean,
71+
public stride: number
72+
) {}
6973
}
7074

7175
/**

packages/loader/src/gltf/parser/GLTFTextureParser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class GLTFTextureParser extends GLTFParser {
4747
url: Utils.resolveAbsoluteUrl(url, uri),
4848
type: type
4949
})
50-
.then((texture) => {
50+
.then<Texture2D>((texture) => {
5151
if (!texture.name) {
5252
texture.name = textureName || imageName || `texture_${index}`;
5353
}

packages/loader/src/ktx2/WorkerPool.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ export class WorkerPool<T = any, U = any> {
1212
* @param limitedCount - worker limit count
1313
* @param _workerCreator - creator of worker
1414
*/
15-
constructor(public readonly limitedCount = 4, private readonly _workerCreator: () => Worker | Promise<Worker>) {
15+
constructor(
16+
public readonly limitedCount = 4,
17+
private readonly _workerCreator: () => Worker | Promise<Worker>
18+
) {
1619
this._workerItems = new Array<WorkerItem<U>>(limitedCount);
1720
}
1821

packages/loader/src/ktx2/transcoder/KhronosTranscoder.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ export class KhronosTranscoder extends AbstractTranscoder {
1111
"https://mdn.alipayobjects.com/rms/afts/file/A*0jiKRK6D1-kAAAAAAAAAAAAAARQnAQ/uastc_astc.wasm"
1212
};
1313

14-
constructor(workerLimitCount: number, public readonly type: KTX2TargetFormat) {
14+
constructor(
15+
workerLimitCount: number,
16+
public readonly type: KTX2TargetFormat
17+
) {
1518
super(workerLimitCount);
1619
}
1720

packages/loader/src/resource-deserialize/resources/scene/SceneParserContext.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ export class SceneParserContext {
77
assets: Map<string, any> = new Map();
88
entityConfigMap: Map<string, IEntity> = new Map();
99
rootIds: string[] = [];
10-
constructor(public readonly originalData: IScene, public readonly scene: Scene) {}
10+
constructor(
11+
public readonly originalData: IScene,
12+
public readonly scene: Scene
13+
) {}
1114

1215
destroy() {
1316
this.entityMap.clear();

packages/loader/src/resource-deserialize/utils/BufferReader.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ export class BufferReader {
55
private _offset: number;
66
private _baseOffset: number;
77

8-
constructor(public buffer: ArrayBuffer, byteOffset: number = 0, byteLength?: number, littleEndian: boolean = true) {
8+
constructor(
9+
public buffer: ArrayBuffer,
10+
byteOffset: number = 0,
11+
byteLength?: number,
12+
littleEndian: boolean = true
13+
) {
914
// byteLength = byteLength ?? _buffer.byteLength;
1015
this._dataView = new DataView(buffer);
1116
this._littleEndian = littleEndian;

packages/rhi-webgl/src/GLTexture2DArray.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ export class GLTexture2DArray extends GLTexture implements IPlatformTexture2DArr
9191
x,
9292
y,
9393
elementIndex,
94-
imageSource.width,
95-
imageSource.height,
94+
(<Exclude<TexImageSource, VideoFrame>>imageSource).width ?? (<VideoFrame>imageSource).codedWidth,
95+
(<Exclude<TexImageSource, VideoFrame>>imageSource).height ?? (<VideoFrame>imageSource).codedHeight,
9696
1,
9797
baseFormat,
9898
dataType,

0 commit comments

Comments
 (0)