Skip to content

Commit f19abcb

Browse files
authored
chore: trying to update deps (#145)
* chore: trying to update deps * chore: remove post-processing * chore: fix lint * chore: playground working now with cientos
1 parent 8a73538 commit f19abcb

25 files changed

+5611
-8745
lines changed
File renamed without changes.

client/components/Pane.vue renamed to client/components/DevtoolsPane.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ defineProps<{
2626
-top-2
2727
left-2"
2828
>{{ title }}</span>
29-
<slot></slot>
29+
<slot />
3030
</div>
3131
</template>

client/components/ModuleAuthorNote.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
target="_blank"
1818
>
1919
nuxt/devtools
20-
</NLink> repository.<br />
20+
</NLink> repository.<br>
2121
The UI components are coming from <NLink
2222
href="https://github.com/nuxt/devtools/tree/main/packages/devtools-ui-kit"
2323
target="_blank"

client/components/PerformanceMonitor.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ const { fps, memory, renderer } = useDevtoolsHook()
3838
<div class="flex flex-col items-center gap-2">
3939
<div class="flex items-center font-mono gap-2">
4040
{{ renderer.info?.memory?.geometries || 0 }}
41-
<i class="i-iconoir-box-3d-three-points"></i>
41+
<i class="i-iconoir-box-3d-three-points" />
4242
</div>
4343
<span class="text-xs text-gray-500">Geometries</span>
4444
</div>
4545
<div class="flex flex-col items-center gap-2">
4646
<div class="flex items-center font-mono gap-2">
4747
{{ renderer.info?.memory?.textures || 0 }}
48-
<i class="i-iconoir-select-face-3d"></i>
48+
<i class="i-iconoir-select-face-3d" />
4949
</div>
5050
<span class="text-xs text-gray-500">Textures</span>
5151
</div>
@@ -64,28 +64,28 @@ const { fps, memory, renderer } = useDevtoolsHook()
6464
<div class="flex flex-col items-center gap-2 mb4">
6565
<div class="flex items-center font-mono gap-2">
6666
{{ renderer?.info?.render?.calls || 0 }}
67-
<i class="i-iconoir-comp-align-left"></i>
67+
<i class="i-iconoir-comp-align-left" />
6868
</div>
6969
<span class="text-xs text-gray-500">Calls</span>
7070
</div>
7171
<div class="flex flex-col items-center gap-2 mb4">
7272
<div class="flex items-center font-mono gap-2">
7373
{{ renderer?.info?.render?.triangles || 0 }}
74-
<i class="i-iconoir-triangle"></i>
74+
<i class="i-iconoir-triangle" />
7575
</div>
7676
<span class="text-xs text-gray-500">Triangles</span>
7777
</div>
7878
<div class="flex flex-col items-center gap-2 mb4">
7979
<div class="flex items-center font-mono gap-2">
8080
{{ renderer?.info?.render?.points || 0 }}
81-
<i class="i-iconoir-one-point-circle"></i>
81+
<i class="i-iconoir-one-point-circle" />
8282
</div>
8383
<span class="text-xs text-gray-500">Points</span>
8484
</div>
8585
<div class="flex flex-col items-center gap-2 mb4">
8686
<div class="flex items-center font-mono gap-2">
8787
{{ renderer?.info?.render?.lines || 0 }}
88-
<i class="i-iconoir-linear"></i>
88+
<i class="i-iconoir-linear" />
8989
</div>
9090
<span class="text-xs text-gray-500">Lines</span>
9191
</div>

client/components/SceneGraphItem.vue

+9-9
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function roundNumber(num: number) {
2626
<span
2727
v-if="depth > 0"
2828
class="h-1 border-b border-gray-300 w-4"
29-
></span>
29+
/>
3030
<div class="flex gap-2 items-center -mb2.5">
3131
<Icon :name="item.icon" />
3232
<!-- <i :class="item.icon" /> -->{{ item.type }} <UBadge
@@ -43,7 +43,7 @@ function roundNumber(num: number) {
4343
<span
4444
class="w4 h4 rounded-full mr-2 border border-gray-200"
4545
:style="{ backgroundColor: `#${item.color}` }"
46-
></span>
46+
/>
4747
#{{ item.color }}
4848
</UBadge>
4949
<UBadge
@@ -110,7 +110,7 @@ function roundNumber(num: number) {
110110
color="gray"
111111
variant="soft"
112112
>
113-
<i class="i-iconoir-box-3d-three-points mr2"></i>
113+
<i class="i-iconoir-box-3d-three-points mr2" />
114114
<a
115115
:href="`https://threejs.org/docs/#api/en/geometries/${item.geometry.type}`"
116116
target="_blank"
@@ -129,7 +129,7 @@ function roundNumber(num: number) {
129129
color="gray"
130130
variant="soft"
131131
>
132-
<i class="i-iconoir-select-face-3d mr2"></i>
132+
<i class="i-iconoir-select-face-3d mr2" />
133133
<a
134134
:href="`https://threejs.org/docs/#api/en/materials/${item.material.type}`"
135135
target="_blank"
@@ -145,7 +145,7 @@ function roundNumber(num: number) {
145145
<span
146146
class="w4 h4 rounded-full mr-2 border border-gray-200"
147147
:style="{ backgroundColor: `#${item.material.color.getHexString()}` }"
148-
></span>
148+
/>
149149
#{{ item.material.color.getHexString() }}
150150
</UBadge>
151151
</div>
@@ -164,7 +164,7 @@ function roundNumber(num: number) {
164164
<span
165165
class="w4 h4 rounded-full mr-2 border border-gray-200"
166166
:style="{ backgroundColor: `#${item.color}` }"
167-
></span>
167+
/>
168168
#{{ item.color }}
169169
</UBadge>
170170
</UTooltip>
@@ -191,7 +191,7 @@ function roundNumber(num: number) {
191191
>
192192
<i
193193
class="i-iconoir-axes mr1"
194-
></i>
194+
/>
195195
</UTooltip>
196196

197197
<UTooltip
@@ -229,7 +229,7 @@ function roundNumber(num: number) {
229229
<UTooltip
230230
text="Rotation"
231231
>
232-
<i class="i-carbon-rotate-clockwise mr-1"></i>
232+
<i class="i-carbon-rotate-clockwise mr-1" />
233233
</UTooltip>
234234

235235
<UTooltip
@@ -270,7 +270,7 @@ function roundNumber(num: number) {
270270
<UTooltip
271271
text="Scale"
272272
>
273-
<i class="i-iconoir-ellipse-3d-three-points mr-1"></i>
273+
<i class="i-iconoir-ellipse-3d-three-points mr-1" />
274274
</UTooltip>
275275

276276
<UTooltip

client/components/programs-module/item.vue renamed to client/components/programs-module/ProgramsModuleitem.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ const isExpanded = ref(false)
2222
<span
2323
v-if="depth > 0"
2424
class="h-1 border-b border-gray-300 w-4"
25-
></span>
25+
/>
2626
<div class="flex gap-2 items-center -mb2.5">
27-
<i :class="item.icon"></i>
27+
<i :class="item.icon" />
2828
<!-- <Icon :name="item.icon" /> -->
2929
<!-- <i :class="item.icon" /> -->{{ item.type }} <UBadge
3030
v-if="item.name "

client/nuxt.config.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
11
import { resolve } from 'pathe'
22

33
export default defineNuxtConfig({
4-
ssr: false,
4+
55
modules: [
66
'@nuxt/devtools-ui-kit',
77
'@unocss/nuxt',
88
'@nuxt/ui',
99
'@nuxt/icon',
1010
],
11+
ssr: false,
12+
13+
app: {
14+
baseURL: '/__tres_nuxt_devtools',
15+
},
16+
17+
compatibilityDate: '2024-12-19',
18+
1119
nitro: {
1220
output: {
1321
publicDir: resolve(__dirname, '../dist/client'),
1422
},
1523
},
24+
1625
icon: {
1726
size: '24px', // default <Icon> size applied
1827
class: 'icon', // default <Icon> class applied
1928
aliases: {
2029
mesh: 'carbon:cube',
2130
},
2231
},
23-
app: {
24-
baseURL: '/__tres_nuxt_devtools',
25-
},
2632
})

client/pages/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const { scene, memory, fps } = useDevtoolsHook()
1919

2020
src="/logo.svg"
2121
alt="tres logo"
22-
/>
22+
>
2323
<h2 class="opacity-60 font-bold">
2424
TresJS DevTools
2525
</h2>

client/pnpm-lock.yaml

-5
This file was deleted.

client/types/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export interface SceneGraphObject {
2424
material?: Material
2525
geometry?: BufferGeometry
2626
children: SceneGraphObject[]
27-
[key: string]: any
27+
[key: string]: unknown
2828
}
2929

3030
export interface MemoryUsageData {

eslint.config.js

-7
This file was deleted.

eslint.config.mjs

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// @ts-check
2+
import { createConfigForNuxt } from '@nuxt/eslint-config/flat'
3+
4+
// Run `npx @eslint/config-inspector` to inspect the resolved config interactively
5+
export default createConfigForNuxt({
6+
features: {
7+
// Rules for module authors
8+
tooling: true,
9+
// Rules for formatting
10+
stylistic: true,
11+
12+
},
13+
dirs: {
14+
src: [
15+
'./playground',
16+
],
17+
},
18+
}, {
19+
rules: {
20+
'vue/multi-word-component-names': 'off',
21+
},
22+
})
23+
.append(
24+
// your custom flat config here...
25+
)

package.json

+33-34
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@tresjs/nuxt",
33
"type": "module",
44
"version": "3.0.7",
5-
"packageManager": "pnpm@9.12.0",
5+
"packageManager": "pnpm@9.15.0",
66
"description": "TresJS integration for Nuxt.",
77
"author": "Daniel Roe (https://github.com/danielroe/)",
88
"license": "MIT",
@@ -35,7 +35,7 @@
3535
"client:dev": "nuxi dev client --port 3300",
3636
"dev": "nuxi dev playground",
3737
"dev:build": "nuxi build playground",
38-
"dev:prepare": "nuxt-module-build --stub && nuxi prepare playground",
38+
"dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
3939
"release": "release-it",
4040
"lint": "eslint .",
4141
"lint:fix": "eslint . --fix",
@@ -46,41 +46,40 @@
4646
"three": ">=0.133"
4747
},
4848
"dependencies": {
49-
"@nuxt/devtools-kit": "^1.4.1",
50-
"@nuxt/kit": "^3.13.1",
51-
"@nuxt/ui": "^2.18.4",
52-
"@tresjs/core": "4.2.10",
53-
"@tresjs/nuxt": "3.0.7",
54-
"@types/three": "^0.168.0",
55-
"@unocss/nuxt": "^0.62.3",
49+
"@nuxt/kit": "^3.14.1592",
50+
"@nuxt/ui": "^2.20.0",
51+
"@tresjs/core": "4.3.1",
52+
"@unocss/nuxt": "^0.65.2",
5653
"defu": "^6.1.4",
57-
"mlly": "^1.7.1",
58-
"pkg-types": "^1.2.0",
59-
"sirv": "^2.0.4",
60-
"typescript": "^5.5.4",
61-
"vite-plugin-glsl": "^1.3.0"
54+
"mlly": "^1.7.3",
55+
"pkg-types": "^1.2.1",
56+
"sirv": "^3.0.0",
57+
"vite-plugin-glsl": "^1.3.1"
6258
},
6359
"devDependencies": {
64-
"@iconify-json/carbon": "^1.2.1",
65-
"@iconify-json/file-icons": "^1.2.0",
66-
"@iconify-json/iconoir": "^1.2.0",
67-
"@iconify-json/ph": "^1.2.0",
68-
"@nuxt/devtools-ui-kit": "^1.4.1",
69-
"@nuxt/eslint-config": "^0.5.6",
70-
"@nuxt/icon": "^1.5.1",
71-
"@nuxt/module-builder": "^0.8.3",
72-
"@nuxt/schema": "^3.13.1",
73-
"@nuxt/test-utils": "^3.14.1",
74-
"@release-it/conventional-changelog": "^8.0.1",
75-
"@tresjs/eslint-config": "^1.2.0",
76-
"@types/node": "^22.5.4",
77-
"changelogen": "^0.5.5",
78-
"eslint": "^9.9.1",
79-
"nuxt": "^3.13.1",
80-
"playwright": "^1.47.0",
81-
"release-it": "^17.6.0",
82-
"three": "^0.168.0",
83-
"vitest": "^2.0.5"
60+
"@iconify-json/carbon": "^1.2.5",
61+
"@iconify-json/file-icons": "^1.2.1",
62+
"@iconify-json/iconoir": "^1.2.6",
63+
"@iconify-json/ph": "^1.2.2",
64+
"@nuxt/devtools": "^1.6.4",
65+
"@nuxt/devtools-ui-kit": "^1.6.4",
66+
"@nuxt/eslint-config": "^0.7.3",
67+
"@nuxt/icon": "^1.10.2",
68+
"@nuxt/module-builder": "^0.8.4",
69+
"@nuxt/schema": "^3.14.1592",
70+
"@nuxt/test-utils": "^3.15.1",
71+
"@release-it/conventional-changelog": "^9.0.3",
72+
"@tresjs/cientos": "^4.0.3",
73+
"@types/node": "^22.10.2",
74+
"@types/three": "^0.171.0",
75+
"changelogen": "^0.5.7",
76+
"eslint": "^9.17.0",
77+
"nuxt": "^3.14.1592",
78+
"playwright": "^1.49.1",
79+
"release-it": "^17.10.0",
80+
"three": "^0.171.0",
81+
"typescript": "^5.6.3",
82+
"vitest": "^2.1.8"
8483
},
8584
"build": {
8685
"externals": [

playground/components/NuxtStones.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ onLoop(({ elapsed }) => {
3535
})
3636
3737
const ctx = useNuxtApp()
38-
// eslint-disable-next-line no-console
38+
3939
console.log({ ctx, useFetch: await useFetch('api/url') })
4040
</script>
4141

playground/layouts/default.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</a>
2525
</div>
2626
</header>
27-
<slot></slot>
27+
<slot />
2828
</div>
2929
</template>
3030

playground/nuxt.config.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
11
export default defineNuxtConfig({
2-
ssr: true,
32
modules: ['../src/module', '@nuxt/devtools'],
3+
ssr: true,
44

5-
// for testing purposes
6-
// imports: {
7-
// autoImport: false,
8-
// },
9-
tres: {
10-
// for testing purposes, and so we test both deduplication + auto-detection capabilities
11-
modules: ['@tresjs/cientos'],
12-
devtools: true,
13-
glsl: true,
14-
},
5+
compatibilityDate: '2024-07-17',
156

167
// for testing purposes: include some nuxt build tests
178
nitro: {
@@ -21,5 +12,14 @@ export default defineNuxtConfig({
2112
},
2213
},
2314

24-
compatibilityDate: '2024-07-17',
15+
// for testing purposes
16+
// imports: {
17+
// autoImport: false,
18+
// },
19+
tres: {
20+
// for testing purposes, and so we test both deduplication + auto-detection capabilities
21+
// modules: ['@tresjs/cientos'],
22+
devtools: true,
23+
glsl: true,
24+
},
2525
})

0 commit comments

Comments
 (0)