chore: re-actualize branch with main

fraxken · fraxken · commit 919ce26003a2 · 2026-02-21T01:36:08.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,12 +21,8 @@
     "packages/fs-tree",
     "packages/fs-tree-backend",
     "packages/editors/voxel-map",
-<<<<<<< HEAD
+    "packages/editors/texture",
     "packages/voxel-renderer"
-=======
-    "packages/editors/model",
-    "packages/editors/texture"
->>>>>>> f56eef5 (feat: add texture update on Three cube)
   ],
   "repository": {
     "type": "git",
diff --git a/packages/editors/texture/index.html b/packages/editors/texture/index.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>UV / Texture Editor</title>
-  <link rel="stylesheet" href="./public/main.css">
+  <link rel="stylesheet" href="./main.css">
 </head>
 <style>
   body, html {
diff --git a/packages/editors/texture/package.json b/packages/editors/texture/package.json
@@ -14,9 +14,10 @@
     "dist"
   ],
   "dependencies": {
-    "@jolly-pixel/engine": "1.0.0",
+    "@jolly-pixel/engine": "2.5.0",
     "@jolly-pixel/fs-tree": "1.0.0",
+    "@jolly-pixel/runtime": "3.2.0",
     "lit": "3.3.1",
-    "three": "^0.179.1"
+    "three": "0.179.1"
   }
 }
diff --git a/packages/editors/texture/src/components/LeftPanel.ts b/packages/editors/texture/src/components/LeftPanel.ts
@@ -3,9 +3,9 @@ import { LitElement, css, html } from "lit";
 import { state, query } from "lit/decorators.js";
 
 // Import Internal Dependencies
-import CanvasManager from "../texture/CanvasManager.js";
-import "./tabs/Paint.js";
-import "./tabs/Build.js";
+import CanvasManager from "../texture/CanvasManager.ts";
+import "./tabs/Paint.ts";
+import "./tabs/Build.ts";
 
 // CONSTANTS
 const kBuildComponentSelector = "jolly-model-editor-build";
diff --git a/packages/editors/texture/src/components/PopupManager.ts b/packages/editors/texture/src/components/PopupManager.ts
@@ -2,7 +2,7 @@
 import { LitElement, css, html } from "lit";
 
 // Import Internal Dependencies
-import type ThreeSceneManager from "../three/ThreeSceneManager.js";
+import type ThreeSceneManager from "../three/ThreeSceneManager.ts";
 
 export class PopupManager extends LitElement {
   private sceneManager: ThreeSceneManager | null = null;
diff --git a/packages/editors/texture/src/components/RightPanel.ts b/packages/editors/texture/src/components/RightPanel.ts
@@ -1,12 +1,12 @@
 // Import Third-party Dependencies
 import { LitElement, css, html } from "lit";
-import { TreeView } from "@jolly-pixel/fs-tree/tree-view";
+import { TreeView } from "@jolly-pixel/fs-tree";
 
 // Import Internal Dependencies
-import type ModelManager from "../three/ModelManager.js";
-import type GroupManager from "../three/GroupManager.js";
-import type { PopupManager } from "./PopupManager.js";
-import { AddMeshPopup } from "./popups/index.js";
+import type ModelManager from "../three/ModelManager.ts";
+import type GroupManager from "../three/GroupManager.ts";
+import type { PopupManager } from "./PopupManager.ts";
+import { AddMeshPopup } from "./popups/index.ts";
 
 export class RightPanel extends LitElement {
   private treeView: TreeView;
diff --git a/packages/editors/texture/src/components/popups/index.ts b/packages/editors/texture/src/components/popups/index.ts
@@ -1 +1 @@
-export { AddMeshPopup } from "./AddMeshPopup.js";
+export { AddMeshPopup } from "./AddMeshPopup.ts";
diff --git a/packages/editors/texture/src/components/tabs/Build.ts b/packages/editors/texture/src/components/tabs/Build.ts
@@ -3,7 +3,7 @@ import { LitElement, css, html } from "lit";
 import { query } from "lit/decorators.js";
 
 // Import Internal Dependencies
-import CanvasManager from "../../texture/CanvasManager.js";
+import CanvasManager from "../../texture/CanvasManager.ts";
 
 export class Build extends LitElement {
   @query("#texturePreview")
diff --git a/packages/editors/texture/src/components/tabs/Paint.ts b/packages/editors/texture/src/components/tabs/Paint.ts
@@ -3,7 +3,7 @@ import { LitElement, css, html } from "lit";
 import { query, state } from "lit/decorators.js";
 
 // Import Internal Dependencies
-import CanvasManager from "../../texture/CanvasManager.js";
+import CanvasManager from "../../texture/CanvasManager.ts";
 
 export class Paint extends LitElement {
   @query("#texturePreview")
diff --git a/packages/editors/texture/src/index.ts b/packages/editors/texture/src/index.ts
@@ -1,10 +1,10 @@
 // Import Internal Dependencies
-import ThreeSceneManager from "./three/ThreeSceneManager.js";
+import ThreeSceneManager from "./three/ThreeSceneManager.ts";
 import "./components/LeftPanel.ts";
-import "./components/RightPanel.js";
-import "./components/PopupManager.js";
-import "./components/popups/index.js";
-import "./components/Resizer.js";
+import "./components/RightPanel.ts";
+import "./components/PopupManager.ts";
+import "./components/popups/index.ts";
+import "./components/Resizer.ts";
 
 const kBody = document.querySelector("body") as HTMLBodyElement;
 const leftPanel = document.querySelector("jolly-model-editor-left-panel") as HTMLElement;
diff --git a/packages/editors/texture/src/texture/BrushManager.ts b/packages/editors/texture/src/texture/BrushManager.ts
@@ -1,5 +1,5 @@
 // Import Internal Dependencies
-import { getColorAsRGBA } from "../utils.js";
+import { getColorAsRGBA } from "../utils.ts";
 
 export interface BrushManagerOptions {
   color?: string;
diff --git a/packages/editors/texture/src/texture/CanvasManager.ts b/packages/editors/texture/src/texture/CanvasManager.ts
@@ -1,7 +1,6 @@
-/* eslint-disable @stylistic/no-mixed-operators */
 // Import Internal Dependencies
-import BrushManager, { type BrushManagerOptions } from "./BrushManager.js";
-import SvgManager, { type SvgManagerOptions } from "./SvgManager.js";
+import BrushManager, { type BrushManagerOptions } from "./BrushManager.ts";
+import SvgManager, { type SvgManagerOptions } from "./SvgManager.ts";
 
 export type Mode = "paint" | "move";
 
diff --git a/packages/editors/texture/src/texture/SvgManager.ts b/packages/editors/texture/src/texture/SvgManager.ts
@@ -1,7 +1,5 @@
-/* eslint-disable @stylistic/no-mixed-operators */
-
 // Import Internal Dependencies
-import CanvasManager from "./CanvasManager.js";
+import CanvasManager from "./CanvasManager.ts";
 
 // CONSTANTS
 const kSvgNs = "http://www.w3.org/2000/svg";
diff --git a/packages/editors/texture/src/three/ModelManager.ts b/packages/editors/texture/src/three/ModelManager.ts
@@ -3,7 +3,7 @@ import * as THREE from "three";
 import { TransformControls } from "three/examples/jsm/Addons.js";
 
 // Import Internal Dependencies
-import GroupManager, { type GroupManagerOptions } from "./GroupManager.js";
+import GroupManager, { type GroupManagerOptions } from "./GroupManager.ts";
 
 export interface ModelManagerOptions {
   scene: THREE.Scene;
diff --git a/packages/editors/texture/src/three/ThreeSceneManager.ts b/packages/editors/texture/src/three/ThreeSceneManager.ts
@@ -6,9 +6,9 @@ import { TransformControls } from "three/examples/jsm/Addons.js";
 import { Input } from "@jolly-pixel/engine";
 
 // Import Internal Dependencies
-import type CanvasManager from "../texture/CanvasManager.js";
-import ModelManager from "./ModelManager.js";
-import type GroupManager from "./GroupManager.js";
+import type CanvasManager from "../texture/CanvasManager.ts";
+import ModelManager from "./ModelManager.ts";
+import type GroupManager from "./GroupManager.ts";
 
 export default class ThreeSceneManager {
   private rootHTMLElement: HTMLDivElement;
diff --git a/packages/editors/texture/vite.config.ts b/packages/editors/texture/vite.config.ts
@@ -1,7 +1,14 @@
 // Import Third-party Dependencies
 import { defineConfig } from "vite";
+import checker from "vite-plugin-checker";
 
 export default defineConfig({
+  plugins: [
+    checker({
+      // Enable TypeScript type checking
+      typescript: false
+    })
+  ],
   esbuild: {
     target: "es2024"
   }
diff --git a/tsconfig.json b/tsconfig.json
@@ -19,6 +19,9 @@
     {
       "path": "./packages/editors/voxel-map"
     },
+    {
+      "path": "./packages/editors/texture"
+    },
     {
       "path": "./packages/voxel-renderer"
     }

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,10 @@`
`14`	`14`	`"dist"`
`15`	`15`	`],`
`16`	`16`	`"dependencies": {`
`17`		`- "@jolly-pixel/engine": "1.0.0",`
	`17`	`+ "@jolly-pixel/engine": "2.5.0",`
`18`	`18`	`"@jolly-pixel/fs-tree": "1.0.0",`
	`19`	`+ "@jolly-pixel/runtime": "3.2.0",`
`19`	`20`	`"lit": "3.3.1",`
`20`		`- "three": "^0.179.1"`
	`21`	`+ "three": "0.179.1"`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { AddMeshPopup } from "./AddMeshPopup.js";`
	`1`	`+export { AddMeshPopup } from "./AddMeshPopup.ts";`