Skip to content

Commit 36ea130

Browse files
author
Kai Salmen
committed
Updated dependencies and fix build issues
1 parent fc48dee commit 36ea130

File tree

8 files changed

+261
-416
lines changed

8 files changed

+261
-416
lines changed

.vscode/extensions.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"recommendations": [
33
"editorconfig.editorconfig",
44
"dbaeumer.vscode-eslint",
5-
"davidanson.vscode-markdownlint",
6-
"zixuanchen.vitest-explorer"
5+
"davidanson.vscode-markdownlint"
76
]
87
}

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Changelog
22

33
## 6.2.1 - 2024-04-19
4+
45
- Update three.js from v0.160.0 to v0.163.0
5-
- Update other dependencies
6+
- Update all devDependencies with exception of eslint
67

78
## 6.2.1 - 2024-01-05
89

package-lock.json

Lines changed: 234 additions & 391 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@
3939
"keywords": [],
4040
"homepage": "https://github.com/kaisalmen/WWOBJLoader#README",
4141
"devDependencies": {
42-
"@typescript-eslint/eslint-plugin": "~6.18.0",
43-
"@types/node": "~20.10.6",
42+
"@typescript-eslint/eslint-plugin": "~7.7.0",
43+
"@types/node": "~20.12.7",
4444
"@types/shelljs": "~0.8.15",
4545
"editorconfig": "~2.0.0",
4646
"eslint": "~8.56.0",
4747
"shelljs": "~0.8.5",
4848
"shx": "~0.3.4",
49-
"typedoc": "~0.25.6",
49+
"typedoc": "~0.25.13",
5050
"typedoc-plugin-markdown": "~3.17.1",
51-
"typescript": "~5.3.3",
52-
"vite": "~5.0.11",
53-
"vitest": "~1.1.3"
51+
"typescript": "~5.4.5",
52+
"vite": "~5.2.9",
53+
"vitest": "~1.5.0"
5454
},
5555
"volta": {
56-
"node": "20.10.0",
57-
"npm": "10.2.3"
56+
"node": "20.12.2",
57+
"npm": "10.5.0"
5858
},
5959
"workspaces": [
6060
"packages/objloader2",

packages/examples/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"verify": "http-server --port 20001 ./"
1818
},
1919
"volta": {
20-
"node": "20.10.0",
21-
"npm": "10.2.3"
20+
"node": "20.12.2",
21+
"npm": "10.5.0"
2222
},
2323
"dependencies": {
24-
"@react-three/fiber": "~8.15.13",
24+
"@react-three/fiber": "~8.16.2",
2525
"wtd-core": "~3.0.0",
2626
"wwobjloader2": "~6.2.1",
2727
"lil-gui": "~0.19.1",

packages/examples/src/examples/ExampleCommons.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { AmbientLight, DirectionalLight, GridHelper, PerspectiveCamera, Scene, WebGLRenderer } from 'three';
1+
import { AmbientLight, DirectionalLight, GridHelper, PerspectiveCamera, Scene, Vector3, WebGLRenderer } from 'three';
22
import { TrackballControls } from 'three/examples/jsm/controls/TrackballControls.js';
33
import { OffscreenPayload } from 'wtd-core';
44

55
export type CameraDefaults = {
6-
posCamera: THREE.Vector3;
7-
posCameraTarget: THREE.Vector3;
6+
posCamera: Vector3;
7+
posCameraTarget: Vector3;
88
near: number;
99
far: number;
1010
fov: number;
@@ -56,12 +56,12 @@ export const executeExample = (app: ExampleDefinition) => {
5656
};
5757

5858
export type ThreeDefaultSetup = {
59-
renderer: THREE.WebGLRenderer;
59+
renderer: WebGLRenderer;
6060
canvas: HTMLCanvasElement;
6161
canvasDimensions: CanvasDimensions;
62-
scene: THREE.Scene;
63-
camera: THREE.PerspectiveCamera;
64-
cameraTarget: THREE.Vector3;
62+
scene: Scene;
63+
camera: PerspectiveCamera;
64+
cameraTarget: Vector3;
6565
cameraDefaults: CameraDefaults;
6666
controls?: TrackballControls;
6767
}

packages/objloader2/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# OBJLoader2 & OBJLoader2Parallel for three.js
22

33
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/kaisalmen/WWOBJLoader/blob/dev/LICENSE)
4-
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/kaisalmen/WWOBJLoader)
54
[![WWOBJLoader](https://github.com/kaisalmen/WWOBJLoader/actions/workflows/actions.yml/badge.svg)](https://github.com/kaisalmen/WWOBJLoader/actions/workflows/actions.yml)
5+
[![Github Pages](https://img.shields.io/badge/GitHub-Pages-blue?logo=github)](https://kaisalmen.github.io/WWOBJLoader)
66
[![NPM Version](https://img.shields.io/npm/v/wwobjloader2.svg)](https://www.npmjs.com/package/wwobjloader2)
7-
[![NPM Download](https://img.shields.io/npm/dt/wwobjloader2.svg)](https://www.npmjs.com/package/wwobjloader2)
7+
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/kaisalmen/WWOBJLoader)
88

99
**OBJLoader2** is a loader for the **OBJ** file format. It is an alternative to [OBJLoader](https://github.com/mrdoob/three.js/blob/dev/examples/jsm/loaders/OBJLoader.js) included in [three.js](https://threejs.org). The loader and its parser can be used on Main via **OBJLoader2** or in parallel inside a web worker via **OBJLoader2Parallel**.
1010

@@ -47,6 +47,8 @@ If you want to get started see take a look at the following examples. They get m
4747
* OBJLoader2 in react with a .mtl material: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/obj2_react-mtl.html)] [[tsx](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/ReactExampleMtl.tsx)]
4848
* AssetPipelineLoader basic example: [[html](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/assetpipeline.html)] [[ts](https://github.com/kaisalmen/WWOBJLoader/blob/main/packages/examples/src/examples/AssetPipelineLoaderExample.ts)]
4949

50+
Try out all examples here: <https://kaisalmen.github.io/WWOBJLoader>
51+
5052
### Main Branch
5153

5254
Main development now takes place on branch [main](https://github.com/kaisalmen/WWOBJLoader/tree/main). Tags identify the releases. The stable branch has been retired.

packages/objloader2/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
"build": "npm run clean && npm run compile && npm run build:lib && npm run build:worker"
6565
},
6666
"volta": {
67-
"node": "20.10.0",
68-
"npm": "10.2.3"
67+
"node": "20.12.2",
68+
"npm": "10.5.0"
6969
},
7070
"dependencies": {
7171
"three": "~0.163.0",

0 commit comments

Comments
 (0)