Merge pull request #17 from valiantlynx/working

Working

.github/extra_workflows/deploy-azure.yml

@@ -1,12 +1,12 @@
 # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 
-name: Build and deploy container app to Azure Web App - svelte-rich-text
+name: Build and deploy container app to Azure Web App - svelte-leaflet
 
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: ["svelte-rich-text"]  # This triggers the deployment after svelte-rich-text workflow completes
+    workflows: ["svelte-leaflet"]  # This triggers the deployment after svelte-leaflet workflow completes
     types:
       - completed
 
@@ -23,7 +23,7 @@ jobs:
       if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'main'
       uses: azure/webapps-deploy@v2
       with:
-        app-name: 'svelte-rich-text'
+        app-name: 'svelte-leaflet'
         slot-name: 'production'
         publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE }}
-        images: 'index.docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/svelte-rich-text:commit-${{ github.sha }}'
+        images: 'index.docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/svelte-leaflet:commit-${{ github.sha }}'

.github/workflows/deploy.yml

@@ -4,7 +4,7 @@ run-name: ${{ github.actor }} is deploying 🚀🚀🚀
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: ["svelte-rich-text"]  # This triggers the deployment after ollama-docker workflow completes
+    workflows: ["svelte-leaflet"]  # This triggers the deployment after ollama-docker workflow completes
     types:
       - completed
 

.github/workflows/svelte-rich-text.yaml → .github/workflows/svelte-leaflet.yaml

@@ -1,6 +1,6 @@
-name: svelte-rich-text
+name: svelte-leaflet
 
-run-name: ${{ github.actor }} is building svelte-rich-text image 📷
+run-name: ${{ github.actor }} is building svelte-leaflet image 📷
 
 on:
   push:
@@ -21,7 +21,7 @@ on:
 
 jobs:
   build-and-push-images:
-    name: Build svelte-rich-text
+    name: Build svelte-leaflet
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -69,8 +69,8 @@ jobs:
       uses: docker/metadata-action@v3
       with:
         images: |
-          ${{ secrets.DOCKER_HUB_USERNAME }}/svelte-rich-text
-          ghcr.io/${{ secrets.DOCKER_HUB_USERNAME }}/svelte-rich-text
+          ${{ secrets.DOCKER_HUB_USERNAME }}/svelte-leaflet
+          ghcr.io/${{ secrets.DOCKER_HUB_USERNAME }}/svelte-leaflet
         flavor: |
           latest=false
         tags: |

package.json

@@ -60,13 +60,16 @@
 	"devDependencies": {
 		"@changesets/cli": "^2.26.2",
 		"@sveltejs/adapter-auto": "^2.0.0",
+		"@sveltejs/adapter-node": "^5.0.1",
 		"@sveltejs/adapter-static": "^2.0.3",
 		"@sveltejs/kit": "^1.20.4",
 		"@sveltejs/package": "^2.0.0",
 		"@valiantlynx/eslint-config-custom": "^0.0.1",
+		"@valiantlynx/svelte-rich-text": "^0.2.3",
 		"@valiantlynx/tailwind-config": "^0.0.9",
 		"@valiantlynx/tsconfig": "^0.0.25",
 		"autoprefixer": "^10.4.16",
+		"dotenv": "^16.4.5",
 		"eslint": "^8.28.0",
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-svelte": "^2.30.0",
@@ -77,18 +80,17 @@
 		"publint": "^0.1.9",
 		"svelte": "^4.0.5",
 		"svelte-check": "^3.4.3",
+		"svelte-french-toast": "^1.2.0",
 		"tailwindcss": "^3.3.5",
 		"tslib": "^2.4.1",
 		"typescript": "^5.0.0",
-		"vite": "^4.4.2",
-		"svelte-french-toast": "^1.2.0"
+		"vite": "^4.4.2"
 	},
 	"svelte": "./dist/index.js",
 	"main": "dist/index.js",
 	"types": "./dist/index.d.ts",
 	"type": "module",
 	"dependencies": {
-		"@valiantlynx/svelte-leaflet": "^0.2.3",
 		"@valiantlynx/svelte-ui": "0.0.23",
 		"leaflet": "^1.9.4",
 		"leaflet.fullscreen": "^3.0.0"

src/lib/site-components/ComponentStructure.svelte

@@ -1,5 +1,5 @@
 <script>
-	import { ValiantRichText, getData } from '@valiantlynx/svelte-leaflet';
+	import { ValiantRichText, getData } from '@valiantlynx/svelte-rich-text';
 	import toast from 'svelte-french-toast';
 	import { enhance } from '$app/forms';
 	import { writable } from 'svelte/store';

svelte.config.js

@@ -1,5 +1,6 @@
 import adapterAuto from '@sveltejs/adapter-auto';
 import adapterNode from '@sveltejs/adapter-node';
+import adapterStatic from '@sveltejs/adapter-static';
 import { vitePreprocess } from '@sveltejs/kit/vite';
 import dotenv from 'dotenv'
 dotenv.config()
@@ -17,7 +18,7 @@ const config = {
 		// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
 		// If your environment is not supported or you settled on a specific environment, switch out the adapter.
 		// See https://kit.svelte.dev/docs/adapters for more information about adapters.
-		adapter: deployTarget === 'auto' ? adapterAuto() : adapterNode()
+		adapter: deployTarget === 'auto' ? adapterAuto() : (deployTarget === 'static' ? adapterStatic() : adapterNode())
 	}
 };