Skip to content

Commit

Permalink
Build fixes; use fork of sveltestrap temporarily
Browse files Browse the repository at this point in the history
Due to this issue bestguy/sveltestrap#356
  • Loading branch information
evrys committed May 22, 2022
1 parent 508c3be commit 2282b0b
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 35 deletions.
40 changes: 19 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -38,7 +38,7 @@
"tough-cookie": "^4.0.0",
"ts-node": "^10.8.0",
"tslib": "^2.4.0",
"typescript": "^4.7.0-dev.20220501",
"typescript": "^4.6.4",
"vite-plugin-iso-import": "^0.1.3",
"vitest": "^0.12.9",
"vitest-svelte-kit": "^0.0.6"
Expand Down Expand Up @@ -68,7 +68,7 @@
"stripe": "^9.2.0",
"svelte-fa": "^2.4.0",
"svelte-markdown": "^0.2.2",
"sveltestrap": "^5.9.0",
"sveltestrap": "github:laxadev/sveltestrap",
"timeago.js": "^4.0.2",
"uuid": "^8.3.2",
"zod": "^3.16.1"
Expand Down
2 changes: 1 addition & 1 deletion src/lib/SpeechSystem.ts
Expand Up @@ -12,7 +12,7 @@ export class SpeechSystem {
return voices

// Voices haven't loaded yet, wait for them
return await new Promise((resolve, reject) => {
return await new Promise((resolve) => {
speechSynthesis.onvoiceschanged = () => {
resolve(speechSynthesis.getVoices())
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/client/SprachyUserSPA.ts
Expand Up @@ -8,7 +8,7 @@ import { sprachdex } from "$lib/sprachdex"
import { time } from "$lib/time"
import { CanvasEffects } from "$lib/client/CanvasEffects"
import { SpeechSystem } from '$lib/SpeechSystem'
import { derived, get, writable, type Writable } from 'svelte/store'
import { derived, writable, type Writable } from 'svelte/store'

export type Review = Exercise & {
pattern: PatternAndProgress
Expand Down
2 changes: 1 addition & 1 deletion src/routes/__layout.svelte
@@ -1,6 +1,6 @@
<script lang="ts" context="module">
import { isAuthedRoute } from "$lib/routing"
import type { Load } from "./__layout"
import type { Load } from "@sveltejs/kit"
export const load: Load = async ({ url, session }) => {
const needsAuth = isAuthedRoute(url.pathname)
Expand Down
3 changes: 1 addition & 2 deletions src/routes/index.svelte
@@ -1,7 +1,6 @@
<script lang="ts" context="module">
export const prerender = true
import type { Load } from "./index"
import type { Load } from "@sveltejs/kit"
export const load: Load = async ({ session }) => {
if (session.userId) {
Expand Down
4 changes: 2 additions & 2 deletions src/routes/pattern/[pattern].svelte
@@ -1,8 +1,8 @@
<script lang="ts" context="module">
import { sprachdex } from "$lib/sprachdex"
import type { Load } from "./[pattern]"
import type { Load } from "@sveltejs/kit"
export const load: Load = async ({ params }) => {
export const load: Load<{ pattern: string }> = async ({ params }) => {
const pattern = sprachdex.patternsIncludingDrafts.find(
(p) => p.slug === params.pattern
)
Expand Down
4 changes: 2 additions & 2 deletions src/routes/story/[story].svelte
@@ -1,8 +1,8 @@
<script lang="ts" context="module">
import { sprachdex } from "$lib/sprachdex"
import type { Load } from "./[story]"
import type { Load } from "@sveltejs/kit"
export const load: Load = async ({ params }) => {
export const load: Load<{ story: string }> = async ({ params }) => {
const pattern = sprachdex.patternsIncludingDrafts.find(
(p) => p.slug === params.story
)
Expand Down
3 changes: 0 additions & 3 deletions tsconfig.json
@@ -1,9 +1,6 @@
{
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"target": "es6",
"module": "esnext",
"moduleResolution": "nodenext",
"plugins": [
{
"name": "vite-plugin-iso-import"
Expand Down

0 comments on commit 2282b0b

Please sign in to comment.