Update svelte-utils

a-b-street · May 17, 2024 · b3a2f81 · b3a2f81
1 parent 83c146f
commit b3a2f81
Show file tree

Hide file tree

Showing 8 changed files with 780 additions and 24 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@picocss/pico": "^2.0.3",
-    "@turf/along": "^6.5.0",
+    "@turf/along": "^7.0.0-alpha.114",
     "route-snapper-ts": "^0.0.3",
     "svelte-maplibre": "^0.8.3",
     "svelte-utils": "github:a-b-street/svelte-utils"

diff --git a/web/src/App.svelte b/web/src/App.svelte
@@ -9,7 +9,8 @@
   import { init as initRouteSnapper } from "route-snapper-ts";
   import { onMount } from "svelte";
   import { FillLayer, GeoJSON, MapLibre } from "svelte-maplibre";
-  import { notNull, Geocoder } from "svelte-utils";
+  import { notNull } from "svelte-utils";
+  import { Geocoder } from "svelte-utils/map";
   import {
     DisableInteractiveLayers,
     Layout,

diff --git a/web/src/RouteMode.svelte b/web/src/RouteMode.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import BackButton from "./BackButton.svelte";
   import { GeoJSON, LineLayer, Marker } from "svelte-maplibre";
-  import { constructMatchExpression, notNull } from "svelte-utils";
+  import { notNull } from "svelte-utils";
+  import { constructMatchExpression } from "svelte-utils/map";
   import { layerId, Link } from "./common";
   import ModalFilterLayer from "./ModalFilterLayer.svelte";
   import RenderNeighbourhood from "./RenderNeighbourhood.svelte";

diff --git a/web/src/common/snapper/RouteSnapperLayer.svelte b/web/src/common/snapper/RouteSnapperLayer.svelte
@@ -6,7 +6,7 @@
     isLine,
     isPoint,
     isPolygon,
-  } from "svelte-utils";
+  } from "svelte-utils/map";
   import { routeToolGj } from "./stores";
 
   const circleRadiusPixels = 10;

diff --git a/web/src/title/NewProjectMode.svelte b/web/src/title/NewProjectMode.svelte
@@ -3,7 +3,7 @@
   import { onMount } from "svelte";
   import { Loading } from "svelte-utils";
   import { Link } from "../common";
-  import { OverpassSelector } from "svelte-utils";
+  import { OverpassSelector } from "svelte-utils/overpass";
   import { PolygonToolLayer } from "maplibre-draw-polygon";
   import SplitComponent from "../SplitComponent.svelte";
   import {

diff --git a/web/src/title/loader.ts b/web/src/title/loader.ts
@@ -2,7 +2,7 @@ import { get } from "svelte/store";
 import { LngLat } from "maplibre-gl";
 import { LTN } from "backend";
 import type { Feature } from "geojson";
-import { overpassQueryForPolygon } from "svelte-utils";
+import { overpassQueryForPolygon } from "svelte-utils/overpass";
 import { RouteTool } from "route-snapper-ts";
 import { routeToolGj, snapMode, undoLength } from "../common/snapper/stores";
 import {

diff --git a/web/tsconfig.json b/web/tsconfig.json
@@ -5,7 +5,7 @@
     "target": "ESNext",
     "useDefineForClassFields": true,
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     /**
      * Typecheck JS in `.svelte` and `.js` files by default.