chore: build fixes

Author: ItsMeBrianD

src/lib/deepslate/DeepslateRendererOffloaded.svelte

@@ -26,6 +26,7 @@
 		Plus
 	} from '@steeze-ui/tabler-icons';
 	import { pixelToCoordinate } from './lib';
+	import { assets } from '$app/paths';
 
 	const editor = useEditorContext();
 
@@ -44,7 +45,8 @@
 		send(
 			{
 				kind: 'init',
-				canvas: offscreen
+				canvas: offscreen,
+				assetPath: assets
 			},
 			{ transfer: [offscreen] }
 		);

src/lib/deepslate/proto.ts

@@ -10,7 +10,8 @@ export const CanvasInitMessageSchema = v.object({
 	canvas: v.custom<OffscreenCanvas>((i) => {
 		if (i instanceof OffscreenCanvas) return true;
 		return false;
-	})
+	}),
+	assetPath: v.string()
 });
 
 export const UpdatePreviewMessageSchema = v.object({

src/lib/deepslate/worker/deepslate_render_worker.ts

@@ -3,7 +3,6 @@ import { parse } from 'valibot';
 import { DeepslateRenderWorkerMessageSchema, type Point } from '../proto';
 import { viridis } from '../viridis';
 import { coordinateToPixel, pixelToCoordinate } from '../lib';
-import { asset } from '$app/paths';
 import { loadAssets } from './load_assets';
 
 declare var self: DedicatedWorkerGlobalScope;
@@ -14,6 +13,7 @@ let ctx: OffscreenCanvasRenderingContext2D;
 let seed: [bigint, bigint];
 let random: deepslate.Random;
 let updateFn: (value: object) => void;
+let assetPath: string;
 
 let pointValFn: ((point: Point) => number | string) | undefined;
 // TODO: Memo needs to free up old coordinates after storing some # (maybe 5000?)
@@ -125,8 +125,9 @@ const main = async (e: MessageEvent) => {
 	switch (message.kind) {
 		case 'init': {
 			canvas = message.canvas;
+			assetPath = message.assetPath;
 			updateContext();
-			await loadAssets();
+			await loadAssets(assetPath);
 			break;
 		}
 		case 'injest::noise': {

src/lib/deepslate/worker/load_assets.ts

@@ -1,14 +1,14 @@
 import * as deepslate from 'deepslate';
-import { asset } from '$app/paths';
-export const loadAssets = async () => {
-	const noises = await fetch(asset('/1.21.8.noise.json')).then((r) => r.json());
+
+export const loadAssets = async (assetRoot: string) => {
+	const noises = await fetch(assetRoot + '/1.21.8.noise.json').then((r) => r.json());
 	for (const [name, noiseDef] of Object.entries(noises)) {
 		deepslate.WorldgenRegistries.NOISE.register(
 			deepslate.Identifier.parse(`minecraft:${name}`),
 			noiseDef as deepslate.NoiseParameters
 		);
 	}
-	const densityFunctions = await fetch(asset('/1.21.8.density_functions.json')).then((r) =>
+	const densityFunctions = await fetch(assetRoot + '/1.21.8.density_functions.json').then((r) =>
 		r.json()
 	);
 	for (const [name, densityFn] of Object.entries(densityFunctions)) {
@@ -17,7 +17,7 @@ export const loadAssets = async () => {
 			deepslate.DensityFunction.fromJson(densityFn)
 		);
 	}
-	const biomes = await fetch(asset('/1.21.8.biomes.json')).then((r) => r.json());
+	const biomes = await fetch(assetRoot + '/1.21.8.biomes.json').then((r) => r.json());
 	for (const [name, biome] of Object.entries(biomes)) {
 		deepslate.WorldgenRegistries.BIOME.register(
 			deepslate.Identifier.parse(`minecraft:${name}`),

src/lib/editor/CoreExtensions.ts

@@ -1,45 +1,59 @@
-
-import * as view from '@codemirror/view';
-import * as commands from '@codemirror/commands';
-import * as _state from '@codemirror/state';
-import * as language from '@codemirror/language';
-import * as autocomplete from '@codemirror/autocomplete';
-import * as search from '@codemirror/search';
-import * as lint from '@codemirror/lint';
+import {
+	lineNumbers,
+	highlightActiveLineGutter,
+	highlightSpecialChars,
+	drawSelection,
+	dropCursor,
+	rectangularSelection,
+	crosshairCursor,
+	highlightActiveLine,
+	keymap
+} from '@codemirror/view';
+import { history, defaultKeymap, historyKeymap, indentWithTab } from '@codemirror/commands';
+import {
+	foldGutter,
+	indentOnInput,
+	syntaxHighlighting,
+	defaultHighlightStyle,
+	bracketMatching,
+	foldKeymap
+} from '@codemirror/language';
+import {
+	closeBrackets,
+	autocompletion,
+	closeBracketsKeymap,
+	completionKeymap
+} from '@codemirror/autocomplete';
+import { highlightSelectionMatches, searchKeymap } from '@codemirror/search';
+import { EditorState } from '@codemirror/state';
+import { lintKeymap } from '@codemirror/lint';
 
 export const CoreExtensions = [
-    // view.ViewPlugin.fromClass(
-    //     class {
-    //         update(update: view.ViewUpdate) {
-    //             if (update.docChanged) value = update.state.doc.toString();
-    //         }
-    //     }
-    // ),
-    view.lineNumbers(),
-    view.highlightActiveLineGutter(),
-    view.highlightSpecialChars(),
-    commands.history(),
-    language.foldGutter(),
-    view.drawSelection(),
-    view.dropCursor(),
-    _state.EditorState.allowMultipleSelections.of(true),
-    language.indentOnInput(),
-    language.syntaxHighlighting(language.defaultHighlightStyle, { fallback: true }),
-    language.bracketMatching(),
-    autocomplete.closeBrackets(),
-    autocomplete.autocompletion(),
-    view.rectangularSelection(),
-    view.crosshairCursor(),
-    view.highlightActiveLine(),
-    search.highlightSelectionMatches(),
-    view.keymap.of([
-        ...autocomplete.closeBracketsKeymap,
-        ...commands.defaultKeymap,
-        ...search.searchKeymap,
-        ...commands.historyKeymap,
-        ...language.foldKeymap,
-        ...autocomplete.completionKeymap,
-        ...lint.lintKeymap,
-        commands.indentWithTab
-    ])
-]
+	lineNumbers(),
+	highlightActiveLineGutter(),
+	highlightSpecialChars(),
+	history(),
+	foldGutter(),
+	drawSelection(),
+	dropCursor(),
+	EditorState.allowMultipleSelections.of(true),
+	indentOnInput(),
+	syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
+	bracketMatching(),
+	closeBrackets(),
+	autocompletion(),
+	rectangularSelection(),
+	crosshairCursor(),
+	highlightActiveLine(),
+	highlightSelectionMatches(),
+	keymap.of([
+		...closeBracketsKeymap,
+		...defaultKeymap,
+		...searchKeymap,
+		...historyKeymap,
+		...foldKeymap,
+		...completionKeymap,
+		...lintKeymap,
+		indentWithTab
+	])
+];

src/lib/editor/Mirror.svelte

@@ -12,7 +12,7 @@
 		serverDiagnostics,
 		signatureHelp
 	} from '@codemirror/lsp-client';
-	import { keymap, ViewPlugin, ViewUpdate } from '@codemirror/view';
+	import { keymap, ViewPlugin, type ViewUpdate } from '@codemirror/view';
 	import { StateEffect, StateField } from '@codemirror/state';
 	import type { Action } from 'svelte/action';
 	import { presets } from './presets';