Merge pull request #793 from KBVE/dev

Staging refs/heads/dev into Main
KBVE · Sep 4, 2023 · 69e695e · 69e695e
2 parents 86ff658 + 80f6225
commit 69e695e
Show file tree

Hide file tree

Showing 28 changed files with 1,443 additions and 934 deletions.
diff --git a/.astro/types.d.ts b/.astro/types.d.ts
@@ -24,25 +24,6 @@ declare module 'astro:content' {
 	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
 	export type CollectionEntry<C extends keyof AnyEntryMap> = Flatten<AnyEntryMap[C]>;
 
-	// TODO: Remove this when having this fallback is no longer relevant. 2.3? 3.0? - erika, 2023-04-04
-	/**
-	 * @deprecated
-	 * `astro:content` no longer provide `image()`.
-	 *
-	 * Please use it through `schema`, like such:
-	 * ```ts
-	 * import { defineCollection, z } from "astro:content";
-	 *
-	 * defineCollection({
-	 *   schema: ({ image }) =>
-	 *     z.object({
-	 *       image: image(),
-	 *     }),
-	 * });
-	 * ```
-	 */
-	export const image: never;
-
 	// This needs to be in sync with ImageMetadata
 	export type ImageFunction = () => import('astro/zod').ZodObject<{
 		src: import('astro/zod').ZodString;
@@ -56,7 +37,7 @@ declare module 'astro:content' {
 				import('astro/zod').ZodLiteral<'tiff'>,
 				import('astro/zod').ZodLiteral<'webp'>,
 				import('astro/zod').ZodLiteral<'gif'>,
-				import('astro/zod').ZodLiteral<'svg'>
+				import('astro/zod').ZodLiteral<'svg'>,
 			]
 		>;
 	}>;
@@ -96,7 +77,7 @@ declare module 'astro:content' {
 
 	export function getEntryBySlug<
 		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {})
+		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(
 		collection: C,
 		// Note that this has to accept a regular string too, for SSR
@@ -121,7 +102,7 @@ declare module 'astro:content' {
 
 	export function getEntry<
 		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {})
+		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(entry: {
 		collection: C;
 		slug: E;
@@ -130,7 +111,7 @@ declare module 'astro:content' {
 		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof DataEntryMap,
-		E extends keyof DataEntryMap[C] | (string & {})
+		E extends keyof DataEntryMap[C] | (string & {}),
 	>(entry: {
 		collection: C;
 		id: E;
@@ -139,7 +120,7 @@ declare module 'astro:content' {
 		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {})
+		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(
 		collection: C,
 		slug: E
@@ -148,7 +129,7 @@ declare module 'astro:content' {
 		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof DataEntryMap,
-		E extends keyof DataEntryMap[C] | (string & {})
+		E extends keyof DataEntryMap[C] | (string & {}),
 	>(
 		collection: C,
 		id: E
@@ -1535,6 +1516,41 @@ declare module 'astro:content' {
   collection: "journal";
   data: InferEntrySchema<"journal">
 } & { render(): Render[".md"] };
+"08-29.md": {
+	id: "08-29.md";
+  slug: "08-29";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
+"08-30.md": {
+	id: "08-30.md";
+  slug: "08-30";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
+"08-31.md": {
+	id: "08-31.md";
+  slug: "08-31";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
+"09-01.md": {
+	id: "09-01.md";
+  slug: "09-01";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
+"09-02.md": {
+	id: "09-02.md";
+  slug: "09-02";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
 "asset.mdx": {
 	id: "asset.mdx";
   slug: "asset";
@@ -1817,6 +1833,13 @@ declare module 'astro:content' {
   collection: "project";
   data: any
 } & { render(): Render[".mdx"] };
+"lofifocus.mdx": {
+	id: "lofifocus.mdx";
+  slug: "lofifocus";
+  body: string;
+  collection: "project";
+  data: any
+} & { render(): Render[".mdx"] };
 "rareicon.mdx": {
 	id: "rareicon.mdx";
   slug: "rareicon";

diff --git a/.github/workflows/auto_pull_dev.yml b/.github/workflows/auto_pull_dev.yml
@@ -2,6 +2,9 @@ name: Release
 
 on:
   workflow_dispatch:
+  # Branches
+  #push:
+  #  branches: ["dev*"]
 
 jobs:
   pull-request:

diff --git a/.svelte-kit/ambient.d.ts b/.svelte-kit/ambient.d.ts
@@ -45,6 +45,7 @@ declare module '$env/static/private' {
 	export const DriverData: string;
 	export const FPS_BROWSER_APP_PROFILE_STRING: string;
 	export const FPS_BROWSER_USER_PROFILE_STRING: string;
+	export const GIT_ASKPASS: string;
 	export const HOMEDRIVE: string;
 	export const HOMEPATH: string;
 	export const INIT_CWD: string;
@@ -120,13 +121,13 @@ declare module '$env/static/private' {
 	export const npm_package_dependencies_tailwindcss: string;
 	export const npm_package_dependencies_tailwindcss_fluid_type: string;
 	export const npm_package_dependencies_three: string;
+	export const npm_package_dependencies_tiny_glob: string;
 	export const npm_package_dependencies_ts_dedent: string;
 	export const npm_package_dependencies_typewriter_effect: string;
 	export const npm_package_dependencies_undici: string;
 	export const npm_package_dependencies_unist_util_visit: string;
 	export const npm_package_dependencies_use_sound: string;
 	export const npm_package_dependencies__astrojs_alpinejs: string;
-	export const npm_package_dependencies__astrojs_image: string;
 	export const npm_package_dependencies__astrojs_markdown_remark: string;
 	export const npm_package_dependencies__astrojs_mdx: string;
 	export const npm_package_dependencies__astrojs_partytown: string;
@@ -275,6 +276,10 @@ declare module '$env/static/private' {
 	export const USERNAME: string;
 	export const USERPROFILE: string;
 	export const VS140COMNTOOLS: string;
+	export const VSCODE_GIT_ASKPASS_EXTRA_ARGS: string;
+	export const VSCODE_GIT_ASKPASS_MAIN: string;
+	export const VSCODE_GIT_ASKPASS_NODE: string;
+	export const VSCODE_GIT_IPC_HANDLE: string;
 	export const VSCODE_INJECTION: string;
 	export const windir: string;
 	export const YARN_WRAP_OUTPUT: string;
@@ -327,6 +332,7 @@ declare module '$env/dynamic/private' {
 		DriverData: string;
 		FPS_BROWSER_APP_PROFILE_STRING: string;
 		FPS_BROWSER_USER_PROFILE_STRING: string;
+		GIT_ASKPASS: string;
 		HOMEDRIVE: string;
 		HOMEPATH: string;
 		INIT_CWD: string;
@@ -402,13 +408,13 @@ declare module '$env/dynamic/private' {
 		npm_package_dependencies_tailwindcss: string;
 		npm_package_dependencies_tailwindcss_fluid_type: string;
 		npm_package_dependencies_three: string;
+		npm_package_dependencies_tiny_glob: string;
 		npm_package_dependencies_ts_dedent: string;
 		npm_package_dependencies_typewriter_effect: string;
 		npm_package_dependencies_undici: string;
 		npm_package_dependencies_unist_util_visit: string;
 		npm_package_dependencies_use_sound: string;
 		npm_package_dependencies__astrojs_alpinejs: string;
-		npm_package_dependencies__astrojs_image: string;
 		npm_package_dependencies__astrojs_markdown_remark: string;
 		npm_package_dependencies__astrojs_mdx: string;
 		npm_package_dependencies__astrojs_partytown: string;
@@ -557,6 +563,10 @@ declare module '$env/dynamic/private' {
 		USERNAME: string;
 		USERPROFILE: string;
 		VS140COMNTOOLS: string;
+		VSCODE_GIT_ASKPASS_EXTRA_ARGS: string;
+		VSCODE_GIT_ASKPASS_MAIN: string;
+		VSCODE_GIT_ASKPASS_NODE: string;
+		VSCODE_GIT_IPC_HANDLE: string;
 		VSCODE_INJECTION: string;
 		windir: string;
 		YARN_WRAP_OUTPUT: string;

diff --git a/.svelte-kit/tsconfig.json b/.svelte-kit/tsconfig.json
@@ -15,8 +15,7 @@
 		],
 		"moduleResolution": "node",
 		"module": "esnext",
-		"target": "esnext",
-		"ignoreDeprecations": "5.0"
+		"target": "esnext"
 	},
 	"include": [
 		"ambient.d.ts",

diff --git a/astro.config.mjs b/astro.config.mjs
@@ -26,7 +26,7 @@ import alpinejs from '@astrojs/alpinejs';
 import partytown from '@astrojs/partytown';
 
 //* Define Config of AstroJS
-import image from '@astrojs/image';
+
 
 //*   [Svelte]:[AstroJS]
 import svelte from '@astrojs/svelte';
@@ -63,9 +63,7 @@ export default defineConfig({
 			},
 		}),
 		// Image Experimental from Astro.
-		image({
-			serviceEntryPoint: '@astrojs/image/sharp',
-		}),
+
 		// Svelte
 		svelte(),
 	],

diff --git a/package.json b/package.json
@@ -31,41 +31,40 @@
     "yarn-upgrade-all": "^0.7.2"
   },
   "dependencies": {
-    "@astrojs/alpinejs": "^0.2.2",
-    "@astrojs/image": "^0.17.3",
-    "@astrojs/markdown-remark": "^2.2.1",
-    "@astrojs/mdx": "^0.19.7",
-    "@astrojs/partytown": "^1.2.3",
-    "@astrojs/preact": "^2.2.2",
-    "@astrojs/prefetch": "^0.3.0",
-    "@astrojs/react": "^2.3.2",
-    "@astrojs/sitemap": "^2.0.2",
-    "@astrojs/svelte": "^3.1.1",
-    "@astrojs/tailwind": "^4.0.0",
+    "@astrojs/alpinejs": "^0.3.0",
+    "@astrojs/markdown-remark": "^3.0.0",
+    "@astrojs/mdx": "^1.0.0",
+    "@astrojs/partytown": "^2.0.0",
+    "@astrojs/preact": "^3.0.0",
+    "@astrojs/prefetch": "^0.4.0",
+    "@astrojs/react": "^3.0.0",
+    "@astrojs/sitemap": "^3.0.0",
+    "@astrojs/svelte": "^4.0.0",
+    "@astrojs/tailwind": "^5.0.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@hcaptcha/react-hcaptcha": "^1.8.1",
     "@lottiefiles/lottie-interactivity": "^1.6.2",
     "@lottiefiles/lottie-player": "^2.0.2",
     "@lottiefiles/react-lottie-player": "^3.5.3",
     "@mdi/js": "^7.2.96",
-    "@mui/icons-material": "^5.14.6",
-    "@mui/material": "^5.14.6",
+    "@mui/icons-material": "^5.14.7",
+    "@mui/material": "^5.14.7",
     "@nanostores/persistent": "^0.9.1",
     "@nanostores/react": "^0.7.1",
     "@react-three/fiber": "^8.13.7",
     "@supabase/supabase-js": "^2.33.1",
-    "@sveltejs/kit": "^1.23.0",
+    "@sveltejs/kit": "^1.24.0",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/forms": "^0.5.6",
     "@tailwindcss/line-clamp": "^0.4.4",
     "@tailwindcss/typography": "^0.5.9",
     "@types/lodash": "^4.14.197",
     "@types/react-router-dom": "^5.3.3",
     "alpinejs": "^3.13.0",
-    "appwrite": "^11.0.1",
-    "astro": "^2.10.14",
-    "astro-compress": "^2.0.14",
+    "appwrite": "^12.0.0",
+    "astro": "^3.0.7",
+    "astro-compress": "^2.0.15",
     "crypto-js": "^4.1.1",
     "dompurify": "^3.0.5",
     "flowbite": "^1.8.1",
@@ -75,9 +74,9 @@
     "lodash": "^4.17.21",
     "mermaid": "^10.4.0",
     "micromodal": "^0.4.10",
-    "million": "^2.6.0-beta.10",
+    "million": "^2.6.0-beta.12",
     "nanostores": "^0.9.3",
-    "openpgp": "^5.9.0",
+    "openpgp": "^5.10.1",
     "react": "^18.2.0",
     "react-cookie": "^6.1.0",
     "react-dom": "^18.2.0",
@@ -87,15 +86,15 @@
     "react-unity-webgl": "^9.4.3",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-external-links": "^2.1.0",
-    "rehype-slug": "^5.1.0",
+    "rehype-slug": "^6.0.0",
     "rehype-stringify": "^10.0.0",
     "rehype-toc": "^3.0.2",
     "remark-toc": "^8.0.1",
     "sharp": "^0.32.5",
     "svelte": "^4.2.0",
     "tailwindcss": "^3.3.3",
     "tailwindcss-fluid-type": "^2.0.3",
-    "three": "^0.155.0",
+    "three": "^0.156.0",
     "ts-dedent": "^2.2.0",
     "typewriter-effect": "^2.20.1",
     "unist-util-visit": "^5.0.0",

diff --git a/public/data/weaviate/docker-compose-stack.yml b/public/data/weaviate/docker-compose-stack.yml
@@ -0,0 +1,44 @@
+# Weaviate Stack
+# NFS - https://stackoverflow.com/questions/47756029/how-does-docker-swarm-implement-volume-sharing
+# sudo apt-get install -y nfs-common
+# 
+version: '3.8'
+
+
+services:
+  weaviate:
+    command:
+    - --host
+    - 0.0.0.0
+    - --port
+    - '8080'
+    - --scheme
+    - http
+    image: semitechnologies/weaviate:1.21.2
+    networks:
+      - galera_network
+    ports:
+    - 8080:8080
+    volumes:
+    - weaviate-data:/var/lib/weaviate
+    restart: on-failure:0
+    environment:
+      # Modules need to be added here.
+      QUERY_DEFAULTS_LIMIT: 25
+      AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: 'true'
+      PERSISTENCE_DATA_PATH: '/var/lib/weaviate'
+      DEFAULT_VECTORIZER_MODULE: 'none'
+      ENABLE_MODULES: ''
+      CLUSTER_HOSTNAME: 'node1'
+
+volumes:
+  weaviate-data:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=[REPLACE_ME_EFS_DNS],nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2
+      #device: [REPLACE_ME_EFS_DNS]:/
+
+networks:
+  galera_network:
+    driver: overlay
diff --git a/sandbox.config.json b/sandbox.config.json
@@ -4,8 +4,8 @@
   "view": "browser",
   "template": "node",
   "container": {
-    "port": 3000,
+    "port": 4321,
     "startScript": "start",
-    "node": "14"
+    "node": "18"
   }
 }