diff --git a/package.json b/package.json index bba35e5..fcaca29 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "dev": "vite", "build": "run-p type-check \"build-only {@}\" --", + "build-ntc": "run-p \"build-only {@}\" --", "preview": "vite preview", "test:unit": "vitest", "build-only": "vite build", diff --git a/src/components/World.vue b/src/components/World.vue index 2d7a809..c0c25c2 100644 --- a/src/components/World.vue +++ b/src/components/World.vue @@ -34,8 +34,8 @@ let mapData = new Phaser.Tilemaps.MapData({ format: Phaser.Tilemaps.Formats.ARRAY_2D, }); let tileMap = new Phaser.Tilemaps.Tilemap(scene, mapData); -let tileset: (Tileset|null) = tileMap.addTilesetImage('default', 'tiles'); -let layer = tileMap.createBlankLayer('layer', tileset, 0, config.tile_size.y); +let tileset: any = tileMap.addTilesetImage('default', 'tiles'); +let layer: (typeof TilemapLayer|null) = tileMap.createBlankLayer('layer', tileset, 0, config.tile_size.y); // center camera const centerY = (tileMap.height * tileMap.tileHeight) / 2 diff --git a/src/config.ts b/src/config.ts index 5e14188..e6bb5bc 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,6 +1,6 @@ export default { name: 'New Quest', - server_endpoint: 'http://localhost:3000', + server_endpoint: 'https://680760d68d724d.lhr.life', development: true, width: 960, height: 540, @@ -16,4 +16,4 @@ export default { TALK: 110000, TRANSITION: 900000 } -} \ No newline at end of file +} diff --git a/src/engine/Map/Map.ts b/src/engine/Map/Map.ts index e86b648..30193dc 100644 --- a/src/engine/Map/Map.ts +++ b/src/engine/Map/Map.ts @@ -19,6 +19,7 @@ export default class Map implements IMap { } public addPlayer(player: Player) { + // @ts-ignore this.players.push(player); } diff --git a/src/stores/map.ts b/src/stores/map.ts index 60dd069..e46e36e 100644 --- a/src/stores/map.ts +++ b/src/stores/map.ts @@ -3,7 +3,7 @@ import { defineStore } from 'pinia'; export const useMapStore = defineStore('gameMap', { state: () => ({ loaded: false, - tiles: null, + tiles: undefined, players: {} }), getters: { diff --git a/src/stores/socket.ts b/src/stores/socket.ts index c976908..d097f50 100644 --- a/src/stores/socket.ts +++ b/src/stores/socket.ts @@ -5,6 +5,7 @@ * https://pinia.vuejs.org/ */ import { defineStore } from 'pinia'; +import {useMapStore} from '@/stores/map' import { io, Socket } from 'socket.io-client'; import config from '@/config'; import axios from 'axios'; @@ -70,16 +71,5 @@ export const useSocketStore = defineStore('socket', { this.socket = null; } }, - - getMap() { - if (this.socket) { - this.socket.emit('get_map'); - this.socket.on('map', (map) => { - const mapStore = useMapStore(); - // Get map from server - mapStore.setMap(map); - }); - } - } } }); diff --git a/tsconfig.node.json b/tsconfig.node.json index f094063..342ac9a 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -9,7 +9,8 @@ ], "compilerOptions": { "composite": true, - "noEmit": true, + "noEmit": false, + "noEmitOnError": false, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", "module": "ESNext", diff --git a/vite.config.d.ts b/vite.config.d.ts new file mode 100644 index 0000000..340562a --- /dev/null +++ b/vite.config.d.ts @@ -0,0 +1,2 @@ +declare const _default: import("vite").UserConfig; +export default _default; diff --git a/vite.config.js b/vite.config.js new file mode 100644 index 0000000..426b3eb --- /dev/null +++ b/vite.config.js @@ -0,0 +1,16 @@ +import { fileURLToPath, URL } from 'node:url'; +import { defineConfig } from 'vite'; +import vue from '@vitejs/plugin-vue'; +import VueDevTools from 'vite-plugin-vue-devtools'; +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [ + vue(), + VueDevTools(), + ], + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)) + } + } +}); diff --git a/vitest.config.d.ts b/vitest.config.d.ts new file mode 100644 index 0000000..673b931 --- /dev/null +++ b/vitest.config.d.ts @@ -0,0 +1,2 @@ +declare const _default: Record; +export default _default; diff --git a/vitest.config.js b/vitest.config.js new file mode 100644 index 0000000..0f50382 --- /dev/null +++ b/vitest.config.js @@ -0,0 +1,10 @@ +import { fileURLToPath } from 'node:url'; +import { mergeConfig, defineConfig, configDefaults } from 'vitest/config'; +import viteConfig from './vite.config'; +export default mergeConfig(viteConfig, defineConfig({ + test: { + environment: 'jsdom', + exclude: [...configDefaults.exclude, 'e2e/*'], + root: fileURLToPath(new URL('./', import.meta.url)) + } +}));