web: remove sveltekit & convert to svelte 5

CADmium-Co · May 27, 2024 · 25df286 · 25df286
1 parent 238d3e2
commit 25df286
Show file tree

Hide file tree

Showing 74 changed files with 694 additions and 1,256 deletions.
diff --git a/applications/web/.gitignore b/applications/web/.gitignore
@@ -2,8 +2,7 @@
 node_modules
 /build
 /dist
-/.svelte-kit
-/package
+/test-results
 .env
 *.env.*
 vite.config.js.timestamp-*

diff --git a/applications/web/.prettierrc b/applications/web/.prettierrc
@@ -4,7 +4,6 @@
 	"trailingComma": "none",
 	"printWidth": 120,
 	"plugins": ["prettier-plugin-svelte"],
-	"pluginSearchDirs": ["."],
 	"semi": false,
 	"overrides": [
 		{

diff --git a/applications/web/README_svelte.md b/applications/web/README_svelte.md
diff --git a/applications/web/index.html b/applications/web/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<link rel="icon" type="image/svg+xml" href="/vite.svg" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>CADmium</title>
+	</head>
+	<body>
+		<div id="app"></div>
+		<script type="module" src="/src/main.ts"></script>
+	</body>
+</html>
diff --git a/applications/web/package.json b/applications/web/package.json
@@ -5,55 +5,50 @@
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
-		"serve": "pnpm build && serve -p 5174 dist",
-		"clean": "rm -rf .turbo .svelte-kit dist node_modules",
 		"preview": "vite preview",
 		"test": "pnpm test:integration && pnpm test:unit",
-		"lint": "prettier --plugin-search-dir . --check . && eslint .",
-		"format": "prettier --plugin-search-dir . --write .",
-		"svelte-check": "svelte-check",
+		"lint": "prettier --check . && eslint .",
+		"format": "prettier . --write .",
+		"check": "svelte-check --tsconfig ./tsconfig.json",
 		"test:integration": "playwright test",
 		"test:unit": "vitest",
-		"types:guard": "ts-auto-guard --export-all src/types.d.ts",
-		"postinstall": "svelte-kit sync"
+		"types:guard": "ts-auto-guard --export-all src/types.d.ts"
 	},
 	"devDependencies": {
-		"@playwright/test": "^1.42.1",
-		"@sveltejs/adapter-static": "^3.0.1",
-		"@sveltejs/kit": "^2.5.3",
-		"@sveltejs/vite-plugin-svelte": "^3.0.2",
-		"autoprefixer": "^10.4.18",
+		"@playwright/test": "^1.44.1",
+		"@sveltejs/vite-plugin-svelte": "^3.1.0",
+		"@tsconfig/svelte": "^5.0.4",
+		"autoprefixer": "^10.4.19",
 		"eslint": "^8.57.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-svelte": "^2.35.1",
 		"phosphor-svelte": "^1.4.2",
-		"postcss": "^8.4.35",
-		"postcss-load-config": "^5.0.3",
+		"postcss": "^8.4.38",
+		"postcss-load-config": "^5.1.0",
 		"prettier": "^3.2.5",
-		"prettier-plugin-svelte": "^3.2.2",
-		"serve": "^14.2.1",
-		"svelte": "^4.2.12",
-		"svelte-check": "^3.6.6",
-		"tailwindcss": "^3.4.1",
+		"prettier-plugin-svelte": "^3.2.3",
+		"svelte": "5.0.0-next.141",
+		"svelte-check": "^3.7.1",
+		"tailwindcss": "^3.4.3",
 		"ts-auto-guard": "^4.2.0",
-		"vite": "^5.1.5",
-		"vitest": "^1.3.1"
+		"vite": "^5.2.11",
+		"vitest": "^1.6.0",
+		"vite-plugin-top-level-await": "^1.4.1",
+		"vite-plugin-wasm": "^3.3.0"
 	},
 	"type": "module",
 	"dependencies": {
-		"@fontsource-variable/manrope": "^5.0.19",
-		"@threlte/core": "^7.2.1",
-		"@threlte/extras": "^8.10.1",
-		"@types/three": "^0.162.0",
+		"@fontsource-variable/manrope": "^5.0.20",
+		"@threlte/core": "8.0.0-next.4",
+		"@threlte/extras": "9.0.0-next.5",
+		"@types/three": "^0.164.1",
 		"cadmium": "workspace:*",
 		"camera-controls": "^2.8.3",
 		"gsap": "^3.12.5",
 		"js-file-download": "^0.4.12",
 		"nurbs": "^1.1.1",
 		"shared": "workspace:*",
-		"three": "^0.162.0",
-		"troika-three-text": "^0.49.0",
-		"vite-plugin-top-level-await": "^1.4.1",
-		"vite-plugin-wasm": "^3.3.0"
+		"three": "^0.164.1",
+		"troika-three-text": "^0.49.1"
 	}
 }
diff --git a/...ations/web/static/actions/chamfer_min.svg → ...ations/web/public/actions/chamfer_min.svg b/...ations/web/static/actions/chamfer_min.svg → ...ations/web/public/actions/chamfer_min.svg
diff --git a/applications/web/static/actions/circle.svg → applications/web/public/actions/circle.svg b/applications/web/static/actions/circle.svg → applications/web/public/actions/circle.svg
diff --git a/...ications/web/static/actions/draft_min.svg → ...ications/web/public/actions/draft_min.svg b/...ications/web/static/actions/draft_min.svg → ...ications/web/public/actions/draft_min.svg
diff --git a/...ations/web/static/actions/extrude_min.svg → ...ations/web/public/actions/extrude_min.svg b/...ations/web/static/actions/extrude_min.svg → ...ations/web/public/actions/extrude_min.svg
diff --git a/...cations/web/static/actions/fillet_min.svg → ...cations/web/public/actions/fillet_min.svg b/...cations/web/static/actions/fillet_min.svg → ...cations/web/public/actions/fillet_min.svg
diff --git a/applications/web/static/actions/hole_min.svg → applications/web/public/actions/hole_min.svg b/applications/web/static/actions/hole_min.svg → applications/web/public/actions/hole_min.svg
diff --git a/...cations/web/static/actions/horizontal.svg → ...cations/web/public/actions/horizontal.svg b/...cations/web/static/actions/horizontal.svg → ...cations/web/public/actions/horizontal.svg
diff --git a/...tions/web/static/actions/just_a_point.svg → ...tions/web/public/actions/just_a_point.svg b/...tions/web/static/actions/just_a_point.svg → ...tions/web/public/actions/just_a_point.svg
diff --git a/applications/web/static/actions/line.svg → applications/web/public/actions/line.svg b/applications/web/static/actions/line.svg → applications/web/public/actions/line.svg
diff --git a/applications/web/static/actions/part.svg → applications/web/public/actions/part.svg b/applications/web/static/actions/part.svg → applications/web/public/actions/part.svg
diff --git a/...ications/web/static/actions/plane_min.svg → ...ications/web/public/actions/plane_min.svg b/...ications/web/static/actions/plane_min.svg → ...ications/web/public/actions/plane_min.svg
diff --git a/...ications/web/static/actions/point_min.svg → ...ications/web/public/actions/point_min.svg b/...ications/web/static/actions/point_min.svg → ...ications/web/public/actions/point_min.svg
diff --git a/...ons/web/static/actions/point_min_icon.svg → ...ons/web/public/actions/point_min_icon.svg b/...ons/web/static/actions/point_min_icon.svg → ...ons/web/public/actions/point_min_icon.svg
diff --git a/...ions/web/static/actions/point_outline.svg → ...ions/web/public/actions/point_outline.svg b/...ions/web/static/actions/point_outline.svg → ...ions/web/public/actions/point_outline.svg
diff --git a/...ications/web/static/actions/rectangle.svg → ...ications/web/public/actions/rectangle.svg b/...ications/web/static/actions/rectangle.svg → ...ications/web/public/actions/rectangle.svg
diff --git a/...ations/web/static/actions/revolve_min.svg → ...ations/web/public/actions/revolve_min.svg b/...ations/web/static/actions/revolve_min.svg → ...ations/web/public/actions/revolve_min.svg
diff --git a/...s/web/static/actions/simple_point_min.svg → ...s/web/public/actions/simple_point_min.svg b/...s/web/static/actions/simple_point_min.svg → ...s/web/public/actions/simple_point_min.svg
diff --git a/...cations/web/static/actions/sketch_min.svg → ...cations/web/public/actions/sketch_min.svg b/...cations/web/static/actions/sketch_min.svg → ...cations/web/public/actions/sketch_min.svg
diff --git a/...ications/web/static/actions/solve_min.svg → ...ications/web/public/actions/solve_min.svg b/...ications/web/static/actions/solve_min.svg → ...ications/web/public/actions/solve_min.svg
diff --git a/applications/web/static/actions/step_min.svg → applications/web/public/actions/step_min.svg b/applications/web/static/actions/step_min.svg → applications/web/public/actions/step_min.svg
diff --git a/applications/web/static/cadmium_logo_min.svg → applications/web/public/cadmium_logo_min.svg b/applications/web/static/cadmium_logo_min.svg → applications/web/public/cadmium_logo_min.svg
diff --git a/...p/hdr/kloofendal_28d_misty_puresky_1k.hdr → ...p/hdr/kloofendal_28d_misty_puresky_1k.hdr b/...p/hdr/kloofendal_28d_misty_puresky_1k.hdr → ...p/hdr/kloofendal_28d_misty_puresky_1k.hdr
diff --git a/applications/web/static/favicon.png → applications/web/public/favicon.png b/applications/web/static/favicon.png → applications/web/public/favicon.png
diff --git a/applications/web/static/github-mark.svg → applications/web/public/github-mark.svg b/applications/web/static/github-mark.svg → applications/web/public/github-mark.svg
diff --git a/...ons/web/src/routes/(CADmium)/+page.svelte → applications/web/src/App.svelte b/...ons/web/src/routes/(CADmium)/+page.svelte → applications/web/src/App.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-	import { browser } from "$app/environment"
+	// import { browser } from "$app/environment"
 	import { onMount } from "svelte"
 	import { default as init, Project as WasmProject } from "cadmium"
-	import AppBar from "./AppBar.svelte"
-	import BottomBar from "./BottomBar.svelte"
-	import MainDisplay from "./MainDisplay.svelte"
-	import ToolBar from "./ToolBar.svelte"
+	import AppBar from "./components/AppBar.svelte"
+	import BottomBar from "./components/BottomBar.svelte"
+	import MainDisplay from "./components/MainDisplay.svelte"
+	import ToolBar from "./components/ToolBar.svelte"
 	import { workbenchIsStale, wasmProject, project, projectIsStale, featureIndex } from "shared/stores"
 
 	// prettier-ignore
@@ -14,15 +14,15 @@
 	const userName = "mattferraro.dev"
 	let newFileContent: string | null = null
 
-	if (browser) {
-		onMount(() => {
-			init().then(() => {
-				wasmProject.set(new WasmProject("First Project"))
-				// log('made a new project')
-				projectIsStale.set(true)
-			})
+	// if (browser) {
+	onMount(() => {
+		init().then(() => {
+			wasmProject.set(new WasmProject("First Project"))
+			// log('made a new project')
+			projectIsStale.set(true)
 		})
-	}
+	})
+	// }
 
 	// $: $wasmProject, log("[$wasmProject]", $wasmProject)
 	// $: $project, log("[$project]", $project)

diff --git a/applications/web/src/app.html b/applications/web/src/app.html
diff --git a/applications/web/src/base.ts b/applications/web/src/base.ts
@@ -0,0 +1 @@
+export const base = "/CADmium"
diff --git a/...ns/web/src/routes/(CADmium)/AppBar.svelte → ...ications/web/src/components/AppBar.svelte b/...ns/web/src/routes/(CADmium)/AppBar.svelte → ...ications/web/src/components/AppBar.svelte
@@ -7,7 +7,7 @@
 	import Bug from "phosphor-svelte/lib/Bug"
 	import type { WithTarget } from "shared/types"
 	import { isProject } from "shared/typeGuards"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 	import { renameProject } from "shared/projectUtils"
 
 	// prettier-ignore
@@ -50,34 +50,36 @@
 		</div>
 		<div class="select-none">CADmium</div>
 		{#if renaming}
-		<input
-			class="bg-gray-300 text-gray-700 py-2 px-4 font-medium"
-			type="text"
-			bind:value={newProjectName}
-			on:blur={() => {
-				log("Renaming project aborted")
-				renaming = false
-				newProjectName = project.name ?? ""
-			}}
-			on:keydown={(e) => {
-				if (e.key === "Enter") {
-					log("Renaming project")
-					renameProject(newProjectName)
-					project.name = newProjectName
+			<input
+				class="bg-gray-300 text-gray-700 py-2 px-4 font-medium"
+				type="text"
+				bind:value={newProjectName}
+				on:blur={() => {
+					log("Renaming project aborted")
 					renaming = false
-				}
-			}}
-		/>
+					newProjectName = project.name ?? ""
+				}}
+				on:keydown={(e) => {
+					if (e.key === "Enter") {
+						log("Renaming project")
+						renameProject(newProjectName)
+						project.name = newProjectName
+						renaming = false
+					}
+				}}
+			/>
 		{:else}
-		<!-- svelte-ignore a11y-no-static-element-interactions -->
-		<div
-			class="font-medium"
-			on:dblclick={() => {
-				log("Renaming project")
-				renaming = true
-				newProjectName = project.name ?? ""
-			}}
-		>{project.name ?? ""}</div>
+			<!-- svelte-ignore a11y-no-static-element-interactions -->
+			<div
+				class="font-medium"
+				on:dblclick={() => {
+					log("Renaming project")
+					renaming = true
+					newProjectName = project.name ?? ""
+				}}
+			>
+				{project.name ?? ""}
+			</div>
 		{/if}
 		<!-- svelte-ignore a11y-no-static-element-interactions -->
 		<div

diff --git a/...tions/web/src/routes/(CADmium)/Arc.svelte → applications/web/src/components/Arc.svelte b/...tions/web/src/routes/(CADmium)/Arc.svelte → applications/web/src/components/Arc.svelte
diff --git a/...web/src/routes/(CADmium)/BottomBar.svelte → ...tions/web/src/components/BottomBar.svelte b/...web/src/routes/(CADmium)/BottomBar.svelte → ...tions/web/src/components/BottomBar.svelte
diff --git a/...ns/web/src/routes/(CADmium)/Circle.svelte → ...ications/web/src/components/Circle.svelte b/...ns/web/src/routes/(CADmium)/Circle.svelte → ...ications/web/src/components/Circle.svelte
diff --git a/...utes/(CADmium)/CubeGizmo/CubeGizmo.svelte → ...src/components/CubeGizmo/CubeGizmo.svelte b/...utes/(CADmium)/CubeGizmo/CubeGizmo.svelte → ...src/components/CubeGizmo/CubeGizmo.svelte
diff --git a/...s/(CADmium)/CubeGizmo/CubeGizmo.svelte.ts → .../components/CubeGizmo/CubeGizmo.svelte.ts b/...s/(CADmium)/CubeGizmo/CubeGizmo.svelte.ts → .../components/CubeGizmo/CubeGizmo.svelte.ts
diff --git a/...c/routes/(CADmium)/CubeGizmo/CubeGizmo.ts → ...web/src/components/CubeGizmo/CubeGizmo.ts b/...c/routes/(CADmium)/CubeGizmo/CubeGizmo.ts → ...web/src/components/CubeGizmo/CubeGizmo.ts
diff --git a/.../routes/(CADmium)/ExtrusionFeature.svelte → ...eb/src/components/ExtrusionFeature.svelte b/.../routes/(CADmium)/ExtrusionFeature.svelte → ...eb/src/components/ExtrusionFeature.svelte
@@ -5,7 +5,7 @@
 	import { selectingFor, workbenchIsStale, featureIndex, currentlySelected, hiddenSketches } from "shared/stores"
 	import X from "phosphor-svelte/lib/X"
 	import type { ExtrusionData } from "shared/types"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	// prettier-ignore
 	const log = (function () { const context = "[ExtrusionFeature.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})()

diff --git a/...ions/web/src/routes/(CADmium)/Face.svelte → applications/web/src/components/Face.svelte b/...ions/web/src/routes/(CADmium)/Face.svelte → applications/web/src/components/Face.svelte
diff --git a/...rc/routes/(CADmium)/FeatureHistory.svelte → .../web/src/components/FeatureHistory.svelte b/...rc/routes/(CADmium)/FeatureHistory.svelte → .../web/src/components/FeatureHistory.svelte
diff --git a/...ions/web/src/routes/(CADmium)/Line.svelte → applications/web/src/components/Line.svelte b/...ions/web/src/routes/(CADmium)/Line.svelte → applications/web/src/components/Line.svelte
diff --git a/...b/src/routes/(CADmium)/MainDisplay.svelte → ...ons/web/src/components/MainDisplay.svelte b/...b/src/routes/(CADmium)/MainDisplay.svelte → ...ons/web/src/components/MainDisplay.svelte
diff --git a/...src/routes/(CADmium)/NewCircleTool.svelte → ...s/web/src/components/NewCircleTool.svelte b/...src/routes/(CADmium)/NewCircleTool.svelte → ...s/web/src/components/NewCircleTool.svelte
diff --git a/...b/src/routes/(CADmium)/NewLineTool.svelte → ...ons/web/src/components/NewLineTool.svelte b/...b/src/routes/(CADmium)/NewLineTool.svelte → ...ons/web/src/components/NewLineTool.svelte
diff --git a/.../routes/(CADmium)/NewRectangleTool.svelte → ...eb/src/components/NewRectangleTool.svelte b/.../routes/(CADmium)/NewRectangleTool.svelte → ...eb/src/components/NewRectangleTool.svelte
@@ -34,7 +34,8 @@
 			// there WAS an anchor point, so we should create a rectangle!
 
 			// if the anchor point doesn't exist, then we should create a point
-			if (anchorPoint.id === null || anchorPoint.id === undefined) anchorPoint.id = addPointToSketch(sketchIndex, anchorPoint.twoD!, false)
+			if (anchorPoint.id === null || anchorPoint.id === undefined)
+				anchorPoint.id = addPointToSketch(sketchIndex, anchorPoint.twoD!, false)
 
 			// if (point?.id && anchorPoint.id) {
 			// 	// if the point exists, then we should create a circle between the two existing points

diff --git a/...src/routes/(CADmium)/PassiveSketch.svelte → ...s/web/src/components/PassiveSketch.svelte b/...src/routes/(CADmium)/PassiveSketch.svelte → ...s/web/src/components/PassiveSketch.svelte
diff --git a/...ons/web/src/routes/(CADmium)/Plane.svelte → applications/web/src/components/Plane.svelte b/...ons/web/src/routes/(CADmium)/Plane.svelte → applications/web/src/components/Plane.svelte
diff --git a/.../src/routes/(CADmium)/PlaneFeature.svelte → ...ns/web/src/components/PlaneFeature.svelte b/.../src/routes/(CADmium)/PlaneFeature.svelte → ...ns/web/src/components/PlaneFeature.svelte
@@ -5,7 +5,7 @@
 	import { workbenchIsStale, featureIndex } from "shared/stores"
 	import MagnifyingGlass from "phosphor-svelte/lib/MagnifyingGlass"
 	import type { Plane, SetCameraFocus } from "shared/types"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	// prettier-ignore
 	const log = (function () { const context = "[PlaneFeature.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})()

diff --git a/...s/web/src/routes/(CADmium)/Point2D.svelte → ...cations/web/src/components/Point2D.svelte b/...s/web/src/routes/(CADmium)/Point2D.svelte → ...cations/web/src/components/Point2D.svelte
@@ -7,7 +7,7 @@
 	import { flatten, promoteTo3 } from "shared/projectUtils"
 	import { T } from "@threlte/core"
 	import type { EntityType } from "shared/types"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	export let x, y, hidden: boolean, id: string
 	export let isPreview = false

diff --git a/...s/web/src/routes/(CADmium)/Point3D.svelte → ...cations/web/src/components/Point3D.svelte b/...s/web/src/routes/(CADmium)/Point3D.svelte → ...cations/web/src/components/Point3D.svelte
@@ -7,7 +7,7 @@
 	import { flatten, promoteTo3 } from "shared/projectUtils"
 	import { T } from "@threlte/core"
 	import type { EntityType } from "shared/types"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	export let x: number, y: number, z: number, hidden: boolean, id: string
 	export let isPreview = false

diff --git a/.../src/routes/(CADmium)/PointFeature.svelte → ...ns/web/src/components/PointFeature.svelte b/.../src/routes/(CADmium)/PointFeature.svelte → ...ns/web/src/components/PointFeature.svelte
@@ -3,7 +3,7 @@
 	import { quintOut } from "svelte/easing"
 	import { renameStep } from "shared/projectUtils"
 	import { workbenchIsStale, featureIndex } from "shared/stores"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	// prettier-ignore
 	const log = (function () { const context = "[PointFeature.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})()

diff --git a/...ons/web/src/routes/(CADmium)/Scene.svelte → applications/web/src/components/Scene.svelte b/...ons/web/src/routes/(CADmium)/Scene.svelte → applications/web/src/components/Scene.svelte
@@ -12,7 +12,7 @@
 	import Solid from "./Solid.svelte"
 	import Sketch from "./Sketch.svelte"
 	import CubeGizmo from "./CubeGizmo/CubeGizmo.svelte"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	// prettier-ignore
 	const log = (function () { const context = "[Scene.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})()

diff --git a/...eb/src/routes/(CADmium)/SelectTool.svelte → ...ions/web/src/components/SelectTool.svelte b/...eb/src/routes/(CADmium)/SelectTool.svelte → ...ions/web/src/components/SelectTool.svelte
diff --git a/...routes/(CADmium)/SelectableSurface.svelte → ...b/src/components/SelectableSurface.svelte b/...routes/(CADmium)/SelectableSurface.svelte → ...b/src/components/SelectableSurface.svelte
diff --git a/...ns/web/src/routes/(CADmium)/Sketch.svelte → ...ications/web/src/components/Sketch.svelte b/...ns/web/src/routes/(CADmium)/Sketch.svelte → ...ications/web/src/components/Sketch.svelte
diff --git a/...src/routes/(CADmium)/SketchFeature.svelte → ...s/web/src/components/SketchFeature.svelte b/...src/routes/(CADmium)/SketchFeature.svelte → ...s/web/src/components/SketchFeature.svelte
@@ -17,7 +17,7 @@
 	import Eye from "phosphor-svelte/lib/Eye"
 	import X from "phosphor-svelte/lib/X"
 	import type { Entity } from "shared/types"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	// prettier-ignore
 	const log = (function () { const context = "[SketchFeature.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})()

diff --git a/...ons/web/src/routes/(CADmium)/Solid.svelte → applications/web/src/components/Solid.svelte b/...ons/web/src/routes/(CADmium)/Solid.svelte → applications/web/src/components/Solid.svelte
diff --git a/...web/src/routes/(CADmium)/SolidItem.svelte → ...tions/web/src/components/SolidItem.svelte b/...web/src/routes/(CADmium)/SolidItem.svelte → ...tions/web/src/components/SolidItem.svelte
@@ -3,7 +3,7 @@
 	import FileArrowDown from "phosphor-svelte/lib/FileArrowDown"
 	import { getObjectString } from "shared/projectUtils"
 	import type { WithTarget } from "shared/types"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	// prettier-ignore
 	const log = (function () { const context = "[SolidItem.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})()

diff --git a/...s/web/src/routes/(CADmium)/ToolBar.svelte → ...cations/web/src/components/ToolBar.svelte b/...s/web/src/routes/(CADmium)/ToolBar.svelte → ...cations/web/src/components/ToolBar.svelte
@@ -10,7 +10,7 @@
 		hiddenSketches
 	} from "shared/stores"
 	import { newExtrusion, newSketchOnPlane } from "shared/projectUtils"
-	import { base } from "$app/paths"
+	import { base } from "../base"
 
 	// prettier-ignore
 	const log = (function () { const context = "[ToolBar.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})()

diff --git a/applications/web/src/main.ts b/applications/web/src/main.ts
@@ -0,0 +1,8 @@
+import "@fontsource-variable/manrope"
+import "./app.postcss"
+import App from "./App.svelte"
+import { mount } from "svelte"
+
+const app = mount(App, { target: document.getElementById("app") })
+
+export default app
diff --git a/applications/web/src/routes/+layout.svelte b/applications/web/src/routes/+layout.svelte