fix: setup for npm release

valentine195 · valentine195 · commit f00409ad2d81 · 2023-04-20T15:50:02.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,7 @@ rollup.config-dev.js
 .hotreload
 webpack.dev.js
 
-.env
+.env
+main.js
+styles.css
+main.css
diff --git a/index.ts b/index.ts
@@ -0,0 +1,15 @@
+import { ObsidianAppData } from "types";
+
+export interface LeafletAPI {
+    openInitiativeView(
+        pcs: import("../src/utils/creature").Creature[],
+        npcs: import("../src/utils/creature").Creature[]
+    ): unknown;
+    markerIcons: MarkerIcon[];
+    data: ObsidianAppData;
+}
+
+interface MarkerIcon {
+    html: string;
+    type: string;
+}
diff --git a/src/controls/distance.ts b/src/controls/distance.ts
@@ -1,4 +1,4 @@
-import { BaseMapType, Popup } from "src/@types";
+import { BaseMapType, Popup } from "../types";
 import { popup } from "src/map/popup";
 import { LAT_LONG_DECIMALS } from "src/utils";
 
diff --git a/src/controls/filter.ts b/src/controls/filter.ts
@@ -1,4 +1,4 @@
-import type { BaseMapType } from "src/@types";
+import type { BaseMapType } from "../types";
 import { getId } from "src/utils";
 import { FontAwesomeControl, FontAwesomeControlOptions } from "./controls";
 import { LeafletSymbol } from "src/utils/leaflet-import";
diff --git a/src/controls/gpx.ts b/src/controls/gpx.ts
@@ -1,4 +1,4 @@
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import { GPX } from "src/layer";
 import { FontAwesomeControl, FontAwesomeControlOptions } from "./controls";
 import { LeafletSymbol } from "src/utils/leaflet-import";
diff --git a/src/controls/lock.ts b/src/controls/lock.ts
@@ -1,4 +1,4 @@
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import { FontAwesomeControl, FontAwesomeControlOptions } from "./controls";
 
 export class LockControl extends FontAwesomeControl {
diff --git a/src/controls/mapview.ts b/src/controls/mapview.ts
@@ -1,4 +1,4 @@
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import t from "src/l10n/locale";
 import { EditParametersModal } from "src/modals/mapview";
 import { FontAwesomeControl, FontAwesomeControlOptions } from "./controls";
diff --git a/src/controls/reset.ts b/src/controls/reset.ts
@@ -1,5 +1,5 @@
 import { Map } from "leaflet";
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import t from "src/l10n/locale";
 import { FontAwesomeControl, FontAwesomeControlOptions } from "./controls";
 
diff --git a/src/controls/zoom.ts b/src/controls/zoom.ts
@@ -1,4 +1,4 @@
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import { FontAwesomeControl, FontAwesomeControlOptions } from "./controls";
 
 import { LeafletSymbol } from "src/utils/leaflet-import";
diff --git a/src/draw/controller.ts b/src/draw/controller.ts
@@ -1,4 +1,4 @@
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import { LeafletSymbol } from "src/utils/leaflet-import";
 import { Polygon } from "./polygon";
 import { Polyline, PolylineProperties } from "./polyline";
diff --git a/src/draw/controls.ts b/src/draw/controls.ts
@@ -1,4 +1,4 @@
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import {
     FontAwesomeControl,
     FontAwesomeControlOptions
diff --git a/src/draw/geojson.ts b/src/draw/geojson.ts
@@ -1,5 +1,5 @@
 import t from "src/l10n/locale";
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import { DrawControl } from "./controls";
 import { FontAwesomeControl, FontAwesomeControlOptions } from "src/controls/controls";
 import { LayerGroup, Polyline } from "leaflet";
diff --git a/src/draw/polygon.ts b/src/draw/polygon.ts
@@ -1,4 +1,4 @@
-import { BaseMapType } from "src/@types";
+import { BaseMapType } from "../types";
 import t from "src/l10n/locale";
 import { Marker } from "src/layer";
 import { LeafletSymbol } from "src/utils/leaflet-import";
diff --git a/src/initiative/initiative.ts b/src/initiative/initiative.ts
@@ -4,7 +4,7 @@ import {
     ImageLayerData,
     MarkerDivIconOptions,
     
-} from "src/@types";
+} from "../types";
 import { FontAwesomeControl } from "src/controls/controls";
 import t from "src/l10n/locale";
 import { Marker } from "src/layer";
diff --git a/src/layer/geojson.ts b/src/layer/geojson.ts
@@ -1,4 +1,4 @@
-import type { BaseMapType } from "src/@types";
+import type { BaseMapType } from "../types";
 import type geojson from "geojson";
 
 import { Marker } from "./marker";
diff --git a/src/layer/gpx.ts b/src/layer/gpx.ts
@@ -1,4 +1,4 @@
-import type { BaseMapType } from "src/@types";
+import type { BaseMapType } from "../types";
 import { Layer } from "../layer/layer";
 
 import { LeafletSymbol } from "src/utils/leaflet-import";
@@ -7,13 +7,13 @@ import { gpx as gpxtoGeoJSON } from "@tmcw/togeojson";
 import gpxWorker from "../worker/gpx.worker";
 import type { HotlineOptions } from "leaflet";
 import { popup } from "src/map/popup";
-import { GPXPoint } from "src/@types/layers";
+import { GPXPoint } from "../types/layers";
 
 import { GeoJSON } from "./geojson";
 import { formatLatLng, formatNumber, getIcon, icon } from "src/utils";
 import t from "src/l10n/locale";
 
-import { GPX_Data } from "src/@types/gpx";
+import { GPX_Data } from "../types/gpx";
 import { Position } from "geojson";
 import convert from "convert";
 
diff --git a/src/layer/layer.ts b/src/layer/layer.ts
@@ -1,4 +1,4 @@
-import { BaseMapType, LayerGroup, Popup } from "src/@types";
+import { BaseMapType, LayerGroup, Popup } from "../types";
 
 export abstract class Layer<T extends L.Layer> {
     map: BaseMapType;
diff --git a/src/layer/marker.ts b/src/layer/marker.ts
@@ -7,7 +7,7 @@ import type {
     MarkerProperties,
     SavedMarkerProperties,
     BaseMapType
-} from "src/@types";
+} from "../types";
 import { MarkerContextModal } from "src/modals";
 import { divIconMarker, markerDivIcon } from "src/map";
 import { Layer } from "../layer/layer";
diff --git a/src/layer/overlay.ts b/src/layer/overlay.ts
@@ -1,7 +1,7 @@
 import convert from "convert";
 import { Notice } from "obsidian";
 
-import { BaseMapType, SavedOverlayData } from "src/@types";
+import { BaseMapType, SavedOverlayData } from "../types";
 import t from "src/l10n/locale";
 import { popup } from "src/map/popup";
 import { formatLatLng, formatNumber } from "src/utils";
diff --git a/src/main.ts b/src/main.ts
@@ -48,7 +48,7 @@ import {
     Icon,
     Marker,
     BaseMapType
-} from "./@types";
+} from "../types";
 
 import { LeafletRenderer } from "./renderer/renderer";
 import { markerDivIcon } from "./map/divicon";
diff --git a/src/map/divicon.ts b/src/map/divicon.ts
@@ -1,5 +1,5 @@
 import { LeafletSymbol } from "src/utils/leaflet-import";
-import { DivIconMarkerOptions, MarkerDivIconOptions } from "../@types";
+import { DivIconMarkerOptions, MarkerDivIconOptions } from "../../types";
 
 const L = window[LeafletSymbol];
 export class MarkerDivIcon extends L.DivIcon {
diff --git a/src/map/map.ts b/src/map/map.ts
@@ -16,7 +16,7 @@ import {
     ImageLayerData,
     SavedMapData,
     DistanceDisplay
-} from "src/@types";
+} from "../../types";
 
 import { GPX, Marker, GeoJSON, Overlay } from "src/layer";
 
@@ -985,7 +985,7 @@ export abstract class BaseMap extends Events implements BaseMapDefinition {
                                 let newRadius = convert(
                                     Number(overlay.data.radius)
                                 )
-                                    .from(overlay.data.unit ?? "m")
+                                    .from((overlay.data.unit as Length) ?? "m")
                                     .to(this.type == "image" ? this.unit : "m");
 
                                 if (this.type == "image") {
diff --git a/src/map/popup.ts b/src/map/popup.ts
@@ -1,4 +1,4 @@
-import type { BaseMapType, LeafletOverlay, TooltipDisplay } from "src/@types";
+import type { BaseMapType, LeafletOverlay, TooltipDisplay } from "../types";
 import { Marker, Overlay } from "src/layer";
 import { Layer } from "src/layer/layer";
 import { BASE_POPUP_OPTIONS } from "src/utils";
diff --git a/src/map/view.ts b/src/map/view.ts
@@ -1,5 +1,5 @@
 import { ItemView, MarkdownRenderChild, Menu, WorkspaceLeaf } from "obsidian";
-import { BaseMapType,  } from "src/@types";
+import { BaseMapType,  } from "../types";
 import t from "src/l10n/locale";
 import { EditParametersModal } from "src/modals/mapview";
 import { LeafletRenderer } from "src/renderer/renderer";
diff --git a/src/modals/context.ts b/src/modals/context.ts
@@ -5,7 +5,7 @@ import type {
     Marker,
     TooltipDisplay,
     BaseMapType
-} from "src/@types";
+} from "../types";
 
 import { PathSuggestionModal } from "./path";
 import { CommandSuggestionModal } from "./command";
diff --git a/src/modals/settings.ts b/src/modals/settings.ts
@@ -7,7 +7,7 @@ import {
     TextComponent
 } from "obsidian";
 import t from "src/l10n/locale";
-import { Icon } from "../@types";
+import { Icon } from "../../types";
 import type ObsidianLeaflet from "src/main";
 import {
     findIconDefinition,
diff --git a/src/renderer/renderer.ts b/src/renderer/renderer.ts
@@ -19,9 +19,9 @@ import type {
     LeafletMapOptions,
     SavedMarkerProperties,
     SavedOverlayData
-} from "../@types";
+} from "../../types";
 import type ObsidianLeaflet from "src/main";
-import type { BaseMapType, ImageLayerData } from "../@types/map";
+import type { BaseMapType, ImageLayerData } from "../../types/map";
 
 import Watcher from "../utils/watcher";
 import { RealMap, ImageMap } from "../map/map";
diff --git a/src/settings/settings.ts b/src/settings/settings.ts
@@ -28,7 +28,7 @@ import type {
     Icon,
     SavedMarkerProperties,
     TooltipDisplay,
-} from "src/@types";
+} from "../types";
 import { FolderSuggestionModal } from "src/modals/path";
 import type ObsidianLeaflet from "src/main";
 import t from "src/l10n/locale";
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
@@ -3,7 +3,7 @@ import {
     BlockParameters,
     LeafletMapOptions,
     ObsidianAppData
-} from "src/@types";
+} from "../types";
 
 export const OBSIDIAN_LEAFLET_POPOVER_SOURCE = "obsidian-leaflet";
 
diff --git a/src/utils/icons.ts b/src/utils/icons.ts
@@ -10,7 +10,7 @@ import type {
     IconDefinition,
     IconName
 } from "@fortawesome/fontawesome-svg-core";
-import { Icon } from "src/@types";
+import { Icon } from "../types";
 
 library.add(fas);
 
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -8,7 +8,7 @@ import {
 } from "obsidian";
 import Color from "color";
 
-import { BaseMapType, BlockParameters } from "src/@types";
+import { BaseMapType, BlockParameters } from "../types";
 import { LAT_LONG_DECIMALS } from "./constants";
 import { DESCRIPTION_ICON } from ".";
 import t from "src/l10n/locale";
diff --git a/src/utils/watcher.ts b/src/utils/watcher.ts
@@ -1,4 +1,4 @@
-import type { MarkerIcon, SavedOverlayData } from "src/@types";
+import type { MarkerIcon, SavedOverlayData } from "../types";
 import {
     Component,
     Events,
diff --git a/src/worker/gpx.worker.ts b/src/worker/gpx.worker.ts
@@ -1,4 +1,4 @@
-import { GPX_OPTIONS, GPX_Data, Coordinate } from "src/@types/gpx";
+import { GPX_OPTIONS, GPX_Data, Coordinate } from "../types/gpx";
 import { DOMParser } from "xmldom";
 
 const ctx: Worker = self as any;
diff --git a/src/worker/loader.ts b/src/worker/loader.ts
@@ -1,7 +1,7 @@
 import { App, Events, Notice } from "obsidian";
 
 import { parseLink } from "../utils";
-import { ImageLayerData } from "src/@types";
+import { ImageLayerData } from "../types";
 import t from "src/l10n/locale";
 
 export default class Loader extends Events {
diff --git a/types/controls.d.ts b/types/controls.d.ts
diff --git a/types/gpx.d.ts b/types/gpx.d.ts
diff --git a/types/index.d.ts b/types/index.d.ts
diff --git a/types/layers.d.ts b/types/layers.d.ts
diff --git a/types/main.d.ts b/types/main.d.ts
diff --git a/types/map.d.ts b/types/map.d.ts
diff --git a/types/marker.d.ts b/types/marker.d.ts
diff --git a/types/overlay.d.ts b/types/overlay.d.ts
diff --git a/types/saved.d.ts b/types/saved.d.ts
diff --git a/types/view.d.ts b/types/view.d.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { BaseMapType, Popup } from "src/@types";`
	`1`	`+import { BaseMapType, Popup } from "../types";`
`2`	`2`	`import { popup } from "src/map/popup";`
`3`	`3`	`import { LAT_LONG_DECIMALS } from "src/utils";`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { BaseMapType } from "src/@types";`
	`1`	`+import type { BaseMapType } from "../types";`
`2`	`2`	`import { getId } from "src/utils";`
`3`	`3`	`import { FontAwesomeControl, FontAwesomeControlOptions } from "./controls";`
`4`	`4`	`import { LeafletSymbol } from "src/utils/leaflet-import";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { BaseMapType } from "src/@types";`
	`1`	`+import { BaseMapType } from "../types";`
`2`	`2`	`import { GPX } from "src/layer";`
`3`	`3`	`import { FontAwesomeControl, FontAwesomeControlOptions } from "./controls";`
`4`	`4`	`import { LeafletSymbol } from "src/utils/leaflet-import";`