From 21ac9ae51ad69568ff7e87513c0a49a4a7f30dd8 Mon Sep 17 00:00:00 2001 From: pluja Date: Fri, 29 Sep 2023 19:23:15 +0200 Subject: [PATCH] remove unused build args, use env variables (#14) --- docker-compose.dev.yml | 6 +- docker-compose.yml | 6 +- frontend/Dockerfile | 15 ----- frontend/package.json | 1 + .../src/lib/components/EditorSegment.svelte | 10 ++-- .../components/ModalTranslationForm.svelte | 15 +++-- frontend/src/lib/utils.js | 7 ++- frontend/src/routes/+layout.js | 3 +- frontend/src/routes/editor/[id]/+page.js | 3 +- frontend/src/routes/editor/[id]/+page.svelte | 13 +++-- frontend/svelte.config.js | 3 + frontend/yarn.lock | 55 ++++++++++--------- 12 files changed, 63 insertions(+), 74 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index bd10b55..75767a3 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -21,8 +21,4 @@ services: whishper-frontend: build: - context: ./frontend - args: - PUBLIC_API_HOST: ${WHISHPER_HOST} - PUBLIC_TRANSLATION_API_HOST: "" - PUBLIC_INTERNAL_API_HOST: "http://nginx:80" \ No newline at end of file + context: ./frontend \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0b9e8e9..96800ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,9 +90,9 @@ services: - .env restart: unless-stopped environment: - PUBLIC_INTERNAL_API_HOST: "http://nginx:80" - PUBLIC_TRANSLATION_API_HOST: "" - PUBLIC_API_HOST: ${WHISHPER_HOST:-} + INTERNAL_API_HOST: "http://nginx:80" + VITE_TRANSLATION_API_HOST: "" + VITE_API_HOST: ${WHISHPER_HOST:-} depends_on: transcription-api: condition: service_healthy diff --git a/frontend/Dockerfile b/frontend/Dockerfile index c42b0a8..954ec5a 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,13 +1,5 @@ FROM node:alpine as build -ARG PUBLIC_API_HOST -ARG PUBLIC_TRANSLATION_API_HOST -ARG PUBLIC_INTERNAL_API_HOST - -ENV PUBLIC_API_HOST=$PUBLIC_API_HOST -ENV PUBLIC_TRANSLATION_API_HOST=$PUBLIC_TRANSLATION_API_HOST -ENV PUBLIC_INTERNAL_API_HOST=$PUBLIC_INTERNAL_API_HOST - WORKDIR /app COPY . . RUN yarn @@ -17,13 +9,6 @@ RUN ls -al FROM node:alpine as production -ARG PUBLIC_API_HOST -ARG PUBLIC_TRANSLATION_API_HOST -ARG PUBLIC_INTERNAL_API_HOST - -ENV PUBLIC_API_HOST=$PUBLIC_API_HOST -ENV PUBLIC_TRANSLATION_API_HOST=$PUBLIC_TRANSLATION_API_HOST -ENV PUBLIC_INTERNAL_API_HOST=$PUBLIC_INTERNAL_API_HOST ENV BODY_SIZE_LIMIT=0 WORKDIR /app diff --git a/frontend/package.json b/frontend/package.json index 1003ed4..c76c3b7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -27,6 +27,7 @@ }, "type": "module", "dependencies": { + "dotenv": "^16.3.1", "svelte-french-toast": "^1.2.0" } } diff --git a/frontend/src/lib/components/EditorSegment.svelte b/frontend/src/lib/components/EditorSegment.svelte index 0a3808e..bb8961c 100644 --- a/frontend/src/lib/components/EditorSegment.svelte +++ b/frontend/src/lib/components/EditorSegment.svelte @@ -216,21 +216,21 @@
16} contenteditable="true" />
- + 16}> - + CPS: {getCps(segment)} - + Duration: {Math.round((segment.end - segment.start) * 100) / 100}s @@ -238,7 +238,7 @@
diff --git a/frontend/src/lib/components/ModalTranslationForm.svelte b/frontend/src/lib/components/ModalTranslationForm.svelte index 304a406..e997d6b 100644 --- a/frontend/src/lib/components/ModalTranslationForm.svelte +++ b/frontend/src/lib/components/ModalTranslationForm.svelte @@ -1,8 +1,7 @@ -
- + + {#if tr} -

+

Translate

-
+
@@ -75,7 +74,7 @@
- +
{/if} diff --git a/frontend/src/lib/utils.js b/frontend/src/lib/utils.js index 2729401..1483718 100644 --- a/frontend/src/lib/utils.js +++ b/frontend/src/lib/utils.js @@ -1,9 +1,10 @@ import {transcriptions} from './stores'; -import { PUBLIC_API_HOST } from '$env/static/public'; import { dev } from '$app/environment'; +import { browser } from '$app/environment'; -export const CLIENT_API_HOST = `${dev ? PUBLIC_API_HOST : ""}`; -export const CLIENT_WS_HOST = `${dev ? PUBLIC_API_HOST.replace("http://", "").replace("https://", "") : ""}`; +export let CLIENT_API_HOST = browser ? `${dev ? import.meta.env.VITE_API_HOST : ""}` : `${process.env.INTERNAL_API_HOST}`; +export let CLIENT_WS_HOST = browser ? `${dev ? import.meta.env.VITE_API_HOST.replace("http://", "").replace("https://", "") : ""}` : `${dev ? process.env.INTERNAL_API_HOST.replace("http://", "").replace("https://", "") : ""}`; +export let TRANSLATION_API_HOST = browser ? `${dev ? import.meta.env.VITE_TRANSLATION_API_HOST : ""}` : `${dev ? process.env.VITE_TRANSLATION_API_HOST : ""}`; // URL Validator export const validateURL = function (url) { diff --git a/frontend/src/routes/+layout.js b/frontend/src/routes/+layout.js index 61dbae4..edd7745 100644 --- a/frontend/src/routes/+layout.js +++ b/frontend/src/routes/+layout.js @@ -1,12 +1,11 @@ import { transcriptions } from '$lib/stores'; import { browser, dev } from '$app/environment'; -import { PUBLIC_INTERNAL_API_HOST } from '$env/static/public'; import { CLIENT_API_HOST } from '$lib/utils'; /** @type {import('./$types').PageLoad} */ export async function load({ fetch }) { // Use different endpoints for server-side and client-side - const endpoint = browser ? `${CLIENT_API_HOST}/api/transcriptions` : `${PUBLIC_INTERNAL_API_HOST}/api/transcriptions`; + const endpoint = browser ? `${CLIENT_API_HOST}/api/transcriptions` : `${process.env.INTERNAL_API_HOST}/api/transcriptions`; console.log(endpoint); const response = await fetch(endpoint); diff --git a/frontend/src/routes/editor/[id]/+page.js b/frontend/src/routes/editor/[id]/+page.js index 5ff81d1..80c222b 100644 --- a/frontend/src/routes/editor/[id]/+page.js +++ b/frontend/src/routes/editor/[id]/+page.js @@ -1,6 +1,5 @@ /** @type {import('./$types').PageLoad} */ import { currentTranscription } from '$lib/stores'; -import { PUBLIC_INTERNAL_API_HOST } from '$env/static/public'; import { CLIENT_API_HOST } from '$lib/utils'; import { browser } from '$app/environment'; @@ -9,7 +8,7 @@ export async function load({params}) { let id = params.id; // Use different endpoints for server-side and client-side - const endpoint = browser ? `${CLIENT_API_HOST}/api/transcriptions` : `${PUBLIC_INTERNAL_API_HOST}/api/transcriptions`; + const endpoint = browser ? `${CLIENT_API_HOST}/api/transcriptions` : `${process.env.INTERNAL_API_HOST}/api/transcriptions`; const response = await fetch(`${endpoint}/${id}`); const ts = await response.json(); // Set currentTranscription to the fetched transcription diff --git a/frontend/src/routes/editor/[id]/+page.svelte b/frontend/src/routes/editor/[id]/+page.svelte index 44baf50..5d41783 100644 --- a/frontend/src/routes/editor/[id]/+page.svelte +++ b/frontend/src/routes/editor/[id]/+page.svelte @@ -11,28 +11,29 @@ let canPlay = false; $: if(canPlay && video && Math.abs(video.currentTime - $currentVideoPlayerTime) > tolerance) { console.log(video.currentTime, $currentVideoPlayerTime) + // When testing in Chrome, it works, just see https://stackoverflow.com/a/67584611 video.currentTime = $currentVideoPlayerTime; } {#if $currentTranscription} -
-
-
+
+
+
-
+
diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js index 2d79d73..2a23dea 100644 --- a/frontend/svelte.config.js +++ b/frontend/svelte.config.js @@ -1,6 +1,9 @@ //import adapter from '@sveltejs/adapter-auto'; import adapterNode from '@sveltejs/adapter-node'; import { vitePreprocess } from '@sveltejs/kit/vite'; +import dotenv from 'dotenv'; + +dotenv.config(); /** @type {import('@sveltejs/kit').Config} */ const config = { kit: { diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 516f9db..848f3a0 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -241,7 +241,7 @@ "@rollup/plugin-commonjs@^25.0.0": version "25.0.4" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.4.tgz#a7547a0c4ec3fa79818eb313e1de0023e548f4e6" + resolved "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.4.tgz" integrity sha512-L92Vz9WUZXDnlQQl3EwbypJR4+DM2EbsO+/KOcEkP4Mc6Ct453EeDB2uH9lgRwj4w5yflgNpq9pHOiY8aoUXBQ== dependencies: "@rollup/pluginutils" "^5.0.1" @@ -253,14 +253,14 @@ "@rollup/plugin-json@^6.0.0": version "6.0.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-6.0.0.tgz#199fea6670fd4dfb1f4932250569b14719db234a" + resolved "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz" integrity sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w== dependencies: "@rollup/pluginutils" "^5.0.1" "@rollup/plugin-node-resolve@^15.0.1": version "15.2.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.0.tgz#982053b237f81471aace570472e88a456d211621" + resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.0.tgz" integrity sha512-mKur03xNGT8O9ODO6FtT43ITGqHWZbKPdVJHZb+iV9QYcdlhUUB0wgknvA4KCUmC5oHJF6O2W1EgmyOQyVUI4Q== dependencies: "@rollup/pluginutils" "^5.0.1" @@ -272,7 +272,7 @@ "@rollup/pluginutils@^5.0.1": version "5.0.3" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.3.tgz#183126d69aeb1cfa23401d5a71cb4b8c16c4a4e0" + resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.3.tgz" integrity sha512-hfllNN4a80rwNQ9QCxhxuHCGHMAvabXqxNdaChUSSadMre7t4iEUI6fFAhBOn/eIYTgYVhBv7vCLsAJ4u3lf3g== dependencies: "@types/estree" "^1.0.0" @@ -288,7 +288,7 @@ "@sveltejs/adapter-node@^1.3.1": version "1.3.1" - resolved "https://registry.yarnpkg.com/@sveltejs/adapter-node/-/adapter-node-1.3.1.tgz#b3d8dee1ae09d008b2add093e84cf085f3333bbc" + resolved "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-1.3.1.tgz" integrity sha512-A0VgRQDCDPzdLNoiAbcOxGw4zT1Mc+n1LwT1OmO350R7WxrEqdMUChPPOd1iMfIDWlP4ie6E2d/WQf5es2d4Zw== dependencies: "@rollup/plugin-commonjs" "^25.0.0" @@ -346,7 +346,7 @@ "@types/resolve@1.20.2": version "1.20.2" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975" + resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz" integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q== acorn-jsx@^5.3.2: @@ -450,7 +450,7 @@ brace-expansion@^1.1.7: brace-expansion@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz" integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: balanced-match "^1.0.0" @@ -474,7 +474,7 @@ browserslist@^4.21.10: builtin-modules@^3.3.0: version "3.3.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" + resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz" integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== busboy@^1.6.0: @@ -547,7 +547,7 @@ color-name@~1.1.4: colord@^2.9: version "2.9.3" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" + resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz" integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== commander@^4.0.0: @@ -557,7 +557,7 @@ commander@^4.0.0: commondir@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz" integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== concat-map@0.0.1: @@ -581,7 +581,7 @@ cross-spawn@^7.0.2: css-selector-tokenizer@^0.8: version "0.8.0" - resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.8.0.tgz#88267ef6238e64f2215ea2764b3e2cf498b845dd" + resolved "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.8.0.tgz" integrity sha512-Jd6Ig3/pe62/qe5SBPTN8h8LeUg/pT4lLgtavPf7updwwHpvFzxvOQBHYj2LZDMjUnBzgvIUSjRcf6oT5HzHFg== dependencies: cssesc "^3.0.0" @@ -602,7 +602,7 @@ cssesc@^3.0.0: daisyui@^3.5.1: version "3.5.1" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-3.5.1.tgz#7b53668e2b68007b275fec88268f81b4aeaf3781" + resolved "https://registry.npmjs.org/daisyui/-/daisyui-3.5.1.tgz" integrity sha512-7GG+9QXnr2qQMCqnyFU8TxpaOYJigXiEtmzoivmiiZZHvxqIwYdaMAkgivqTVxEgy3Hot3m1suzZjmt1zUrvmA== dependencies: colord "^2.9" @@ -655,6 +655,11 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dotenv@^16.3.1: + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== + electron-to-chromium@^1.4.477: version "1.4.494" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.494.tgz" @@ -811,7 +816,7 @@ estraverse@^5.1.0, estraverse@^5.2.0: estree-walker@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== estree-walker@^3.0.0, estree-walker@^3.0.3: @@ -854,7 +859,7 @@ fast-levenshtein@^2.0.6: fastparse@^1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" + resolved "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz" integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== fastq@^1.6.0: @@ -910,9 +915,9 @@ fs.realpath@^1.0.0: integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== function-bind@^1.1.1: version "1.1.1" @@ -959,7 +964,7 @@ glob@^7.1.3: glob@^8.0.3: version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" @@ -1037,7 +1042,7 @@ is-binary-path@~2.1.0: is-builtin-module@^3.2.1: version "3.2.1" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169" + resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz" integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A== dependencies: builtin-modules "^3.3.0" @@ -1063,7 +1068,7 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: is-module@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz" integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g== is-number@^7.0.0: @@ -1078,7 +1083,7 @@ is-path-inside@^3.0.3: is-reference@1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" + resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz" integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ== dependencies: "@types/estree" "*" @@ -1171,7 +1176,7 @@ lru-cache@^6.0.0: magic-string@^0.27.0: version "0.27.0" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" + resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.27.0.tgz" integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== dependencies: "@jridgewell/sourcemap-codec" "^1.4.13" @@ -1215,7 +1220,7 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: minimatch@^5.0.1: version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz" integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" @@ -1618,7 +1623,7 @@ svelte-eslint-parser@^0.32.2: svelte-french-toast@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/svelte-french-toast/-/svelte-french-toast-1.2.0.tgz#bfe3696ee1e3cbdee2a300e0153dede7d6d802eb" + resolved "https://registry.npmjs.org/svelte-french-toast/-/svelte-french-toast-1.2.0.tgz" integrity sha512-5PW+6RFX3xQPbR44CngYAP1Sd9oCq9P2FOox4FZffzJuZI2mHOB7q5gJBVnOiLF5y3moVGZ7u2bYt7+yPAgcEQ== dependencies: svelte-writable-derived "^3.1.0" @@ -1630,7 +1635,7 @@ svelte-hmr@^0.15.3: svelte-writable-derived@^3.1.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/svelte-writable-derived/-/svelte-writable-derived-3.1.0.tgz#ea114125805a9d18398577f2431d1e8cdd4d8d69" + resolved "https://registry.npmjs.org/svelte-writable-derived/-/svelte-writable-derived-3.1.0.tgz" integrity sha512-cTvaVFNIJ036vSDIyPxJYivKC7ZLtcFOPm1Iq6qWBDo1fOHzfk6ZSbwaKrxhjgy52Rbl5IHzRcWgos6Zqn9/rg== svelte@^4.0.5: