Merge branch 'watergis:main' into main

.eslintignore

@@ -0,0 +1,13 @@
+.DS_Store
+node_modules
+/build
+/.svelte-kit
+/package
+.env
+.env.*
+!.env.example
+
+# Ignore files for PNPM, NPM and YARN
+pnpm-lock.yaml
+package-lock.json
+yarn.lock

.github/workflows/build.yml

@@ -22,13 +22,13 @@ jobs:
       # pnpm setup
       # refer to https://github.com/pnpm/action-setup
       - name: pnpm setup
-        uses: pnpm/action-setup@v2.4.0
+        uses: pnpm/action-setup@v3.0.0
         with:
           version: 8
           run_install: false
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
@@ -38,7 +38,7 @@ jobs:
         run: |
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
@@ -62,7 +62,7 @@ jobs:
           pnpm build
           echo "${CNAME}" >> ./build/CNAME
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         env:
           SKIP_DEPLOY_TO_GHPAGES: ${{secrets.SKIP_DEPLOY_TO_GHPAGES}}
         if: ${{ github.ref == 'refs/heads/main' && env.SKIP_DEPLOY_TO_GHPAGES == '' }}

.prettierrc

@@ -3,5 +3,6 @@
 	"singleQuote": true,
 	"trailingComma": "none",
 	"printWidth": 100,
-	"plugins": ["prettier-plugin-svelte"]
+	"plugins": ["prettier-plugin-svelte"],
+	"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
 }

package.json

@@ -14,45 +14,46 @@
 	},
 	"devDependencies": {
 		"@evilmartians/lefthook": "^1.5.0",
-		"@maplibre/maplibre-gl-geocoder": "github:maplibre/maplibre-gl-geocoder",
+		"@maplibre/maplibre-gl-geocoder": "^1.5.0",
 		"@popperjs/core": "^2.11.8",
-		"@sjmc11/tourguidejs": "^0.0.10",
-		"@sveltejs/adapter-static": "^2.0.3",
-		"@sveltejs/kit": "^1.25.1",
+		"@sjmc11/tourguidejs": "^0.0.16",
+		"@sveltejs/adapter-static": "^3.0.0",
+		"@sveltejs/kit": "^2.0.0",
+		"@sveltejs/vite-plugin-svelte": "^3.0.0",
 		"@types/events": "^3.0.1",
 		"@types/node": "^20.8.0",
-		"@typescript-eslint/eslint-plugin": "^6.7.3",
-		"@typescript-eslint/parser": "^6.7.3",
-		"@watergis/maplibre-center-icon": "^2.0.1",
+		"@typescript-eslint/eslint-plugin": "^7.0.0",
+		"@typescript-eslint/parser": "^7.0.0",
+		"@watergis/maplibre-center-icon": "^3.0.0",
 		"@watergis/maplibre-gl-area-switcher": "^1.0.0",
-		"@watergis/maplibre-gl-tour": "^1.0.2",
-		"@watergis/svelte-collapsible-panel": "^1.0.1",
-		"@watergis/svelte-maplibre-attribute-popup": "^2.0.2",
-		"@watergis/svelte-maplibre-attribute-table": "^1.1.1",
-		"@watergis/svelte-maplibre-export": "^2.0.2",
-		"@watergis/svelte-maplibre-legend": "^2.0.3",
-		"@watergis/svelte-maplibre-measure": "^2.0.1",
-		"@watergis/svelte-maplibre-menu": "^2.1.1",
-		"@watergis/svelte-maplibre-share": "^2.0.2",
-		"@watergis/svelte-maplibre-style-switcher": "^2.0.1",
-		"@watergis/svelte-maplibre-valhalla": "^2.0.1",
+		"@watergis/maplibre-gl-tour": "^1.0.4",
+		"@watergis/svelte-collapsible-panel": "^2.0.0",
+		"@watergis/svelte-maplibre-attribute-popup": "^3.0.0",
+		"@watergis/svelte-maplibre-attribute-table": "^2.0.0",
+		"@watergis/svelte-maplibre-export": "^3.0.0",
+		"@watergis/svelte-maplibre-legend": "^3.0.0",
+		"@watergis/svelte-maplibre-measure": "^3.0.0",
+		"@watergis/svelte-maplibre-menu": "^3.0.0",
+		"@watergis/svelte-maplibre-share": "^3.0.0",
+		"@watergis/svelte-maplibre-style-switcher": "^3.0.2",
+		"@watergis/svelte-maplibre-valhalla": "^3.0.0",
 		"buffer": "^6.0.3",
 		"bulma": "^0.9.4",
 		"eslint": "^8.50.0",
 		"eslint-config-prettier": "^9.0.0",
 		"eslint-plugin-svelte": "^2.33.2",
 		"events": "^3.3.0",
-		"maplibre-gl": "^3.3.1",
-		"pmtiles": "2.11.0",
+		"maplibre-gl": "^4.1.1",
+		"pmtiles": "^3.0.5",
 		"prettier": "^3.0.3",
 		"prettier-plugin-svelte": "^3.0.3",
 		"sass": "^1.68.0",
 		"svelte": "^4.0.5",
 		"svelte-check": "^3.5.2",
 		"svelte-preprocess": "^5.0.4",
 		"tslib": "^2.6.2",
-		"typescript": "~5.2.2",
-		"vite": "^4.4.9"
+		"typescript": "~5.4.0",
+		"vite": "^5.0.0"
 	},
 	"type": "module"
 }