mirror of
https://github.com/maputnik/editor.git
synced 2026-06-01 21:07:26 +00:00
chore(deps-dev): Bump typescript from 5.8.3 to 5.9.2 (#1301)
Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.8.3 to 5.9.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/microsoft/TypeScript/releases">typescript's releases</a>.</em></p> <blockquote> <h2>TypeScript 5.9</h2> <p>Release notes pending.</p> <!-- raw HTML omitted --> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.1%22+is%3Aclosed+">fixed issues query for Typescript 5.9.1 (RC)</a>.</li> <li>[[No specific changes for TypeScript 5.9.2 (Stable)]]</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> <h2>TypeScript 5.9 RC</h2> <p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-5-9-rc/">release announcement</a></p> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.1%22+is%3Aclosed+">fixed issues query for Typescript 5.9.1 (RC)</a>.</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> <h2>TypeScript 5.9 Beta</h2> <p>For release notes, check out the <a href="https://devblogs.microsoft.com/typescript/announcing-typescript-5-9-beta/">release announcement</a>.</p> <ul> <li><a href="https://github.com/Microsoft/TypeScript/issues?utf8=%E2%9C%93&q=milestone%3A%22TypeScript+5.9.0%22+is%3Aclosed+">fixed issues query for Typescript 5.9.0 (Beta)</a>.</li> </ul> <p>Downloads are available on:</p> <ul> <li><a href="https://www.npmjs.com/package/typescript">npm</a></li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/microsoft/TypeScript/commit/be8678315541e814da14316848a9468e8f90ab11"><code>be86783</code></a> Give more specific errors for <code>verbatimModuleSyntax</code> (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62113">#62113</a>)</li> <li><a href="https://github.com/microsoft/TypeScript/commit/22ef57786f5ca99837c430439bc6003c068fe1d2"><code>22ef577</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250714...</li> <li><a href="https://github.com/microsoft/TypeScript/commit/d5a414cd1dceb209fd2569e89d1096812218e8c5"><code>d5a414c</code></a> Don't use <code>noErrorTruncation</code> when printing types with <code>maximumLength</code> set (#...</li> <li><a href="https://github.com/microsoft/TypeScript/commit/f14b5c8a2f0be503ac455054a91573c63f0e5088"><code>f14b5c8</code></a> Remove unused and confusing dom.iterable.d.ts file (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62037">#62037</a>)</li> <li><a href="https://github.com/microsoft/TypeScript/commit/2778e84ed88894156e2c5a17d74a25c73cc96ffe"><code>2778e84</code></a> Restore AbortSignal.abort (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62086">#62086</a>)</li> <li><a href="https://github.com/microsoft/TypeScript/commit/65cb4bd2d52cd882f2c3a503681479eb2ed291ca"><code>65cb4bd</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250710...</li> <li><a href="https://github.com/microsoft/TypeScript/commit/9e20e032effad965567d4a1e1c30d5433b0a3332"><code>9e20e03</code></a> Clear out checker-level stacks on pop (<a href="https://redirect.github.com/microsoft/TypeScript/issues/62016">#62016</a>)</li> <li><a href="https://github.com/microsoft/TypeScript/commit/87740bc7fe3d8d2af47d767db081491f40b8a90d"><code>87740bc</code></a> Fix for Issue 61081 (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61221">#61221</a>)</li> <li><a href="https://github.com/microsoft/TypeScript/commit/833a8d492c728d606454865e8c0fee84842f9f10"><code>833a8d4</code></a> Fix Symbol completion priority and cursor positioning (<a href="https://redirect.github.com/microsoft/TypeScript/issues/61945">#61945</a>)</li> <li><a href="https://github.com/microsoft/TypeScript/commit/0018c9ff12e657b84997dc1843818fea0a2ce850"><code>0018c9f</code></a> LEGO: Pull request from lego/hb_5378966c-b857-470a-8675-daebef4a6da1_20250702...</li> <li>Additional commits viewable in <a href="https://github.com/microsoft/TypeScript/compare/v5.8.3...v5.9.2">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Harel M <harel.mazor@gmail.com>
This commit is contained in:
+32
-32
@@ -1,11 +1,11 @@
|
||||
import style from '../style'
|
||||
import {format} from '@maplibre/maplibre-gl-style-spec'
|
||||
import ReconnectingWebSocket from 'reconnecting-websocket'
|
||||
import type {IStyleStore, OnStyleChangedCallback, StyleSpecificationWithId} from '../definitions'
|
||||
import style from "../style";
|
||||
import {format} from "@maplibre/maplibre-gl-style-spec";
|
||||
import ReconnectingWebSocket from "reconnecting-websocket";
|
||||
import type {IStyleStore, OnStyleChangedCallback, StyleSpecificationWithId} from "../definitions";
|
||||
|
||||
export type ApiStyleStoreOptions = {
|
||||
onLocalStyleChange?: OnStyleChangedCallback
|
||||
}
|
||||
};
|
||||
|
||||
export class ApiStyleStore implements IStyleStore {
|
||||
|
||||
@@ -15,51 +15,51 @@ export class ApiStyleStore implements IStyleStore {
|
||||
onLocalStyleChange: OnStyleChangedCallback;
|
||||
|
||||
constructor(opts: ApiStyleStoreOptions) {
|
||||
this.onLocalStyleChange = opts.onLocalStyleChange || (() => {})
|
||||
const port = window.location.port
|
||||
const host = 'localhost'
|
||||
this.localUrl = `http://${host}:${port}`
|
||||
this.websocketUrl = `ws://${host}:${port}/ws`
|
||||
this.init = this.init.bind(this)
|
||||
this.onLocalStyleChange = opts.onLocalStyleChange || (() => {});
|
||||
const port = window.location.port;
|
||||
const host = "localhost";
|
||||
this.localUrl = `http://${host}:${port}`;
|
||||
this.websocketUrl = `ws://${host}:${port}/ws`;
|
||||
this.init = this.init.bind(this);
|
||||
}
|
||||
|
||||
async init(): Promise<void> {
|
||||
try {
|
||||
const response = await fetch(this.localUrl + '/styles', {mode: 'cors'});
|
||||
const response = await fetch(this.localUrl + "/styles", {mode: "cors"});
|
||||
const body = await response.json();
|
||||
const styleIds = body;
|
||||
this.latestStyleId = styleIds[0]
|
||||
this.latestStyleId = styleIds[0];
|
||||
this.notifyLocalChanges();
|
||||
} catch {
|
||||
throw new Error('Can not connect to style API');
|
||||
throw new Error("Can not connect to style API");
|
||||
}
|
||||
}
|
||||
|
||||
notifyLocalChanges() {
|
||||
const connection = new ReconnectingWebSocket(this.websocketUrl)
|
||||
const connection = new ReconnectingWebSocket(this.websocketUrl);
|
||||
connection.onmessage = e => {
|
||||
if(!e.data) return
|
||||
console.log('Received style update from API')
|
||||
let parsedStyle = style.emptyStyle
|
||||
if(!e.data) return;
|
||||
console.log("Received style update from API");
|
||||
let parsedStyle = style.emptyStyle;
|
||||
try {
|
||||
parsedStyle = JSON.parse(e.data)
|
||||
parsedStyle = JSON.parse(e.data);
|
||||
} catch(err) {
|
||||
console.error(err)
|
||||
console.error(err);
|
||||
}
|
||||
const updatedStyle = style.ensureStyleValidity(parsedStyle)
|
||||
this.onLocalStyleChange(updatedStyle)
|
||||
}
|
||||
const updatedStyle = style.ensureStyleValidity(parsedStyle);
|
||||
this.onLocalStyleChange(updatedStyle);
|
||||
};
|
||||
}
|
||||
|
||||
async getLatestStyle(): Promise<StyleSpecificationWithId> {
|
||||
if(this.latestStyleId) {
|
||||
const response = await fetch(this.localUrl + '/styles/' + this.latestStyleId, {
|
||||
mode: 'cors',
|
||||
const response = await fetch(this.localUrl + "/styles/" + this.latestStyleId, {
|
||||
mode: "cors",
|
||||
});
|
||||
const body = await response.json();
|
||||
return style.ensureStyleValidity(body);
|
||||
} else {
|
||||
throw new Error('No latest style available. You need to init the api backend first.')
|
||||
throw new Error("No latest style available. You need to init the api backend first.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,18 +71,18 @@ export class ApiStyleStore implements IStyleStore {
|
||||
)
|
||||
);
|
||||
|
||||
const id = mapStyle.id
|
||||
fetch(this.localUrl + '/styles/' + id, {
|
||||
const id = mapStyle.id;
|
||||
fetch(this.localUrl + "/styles/" + id, {
|
||||
method: "PUT",
|
||||
mode: 'cors',
|
||||
mode: "cors",
|
||||
headers: {
|
||||
"Content-Type": "application/json; charset=utf-8",
|
||||
},
|
||||
body: styleJSON
|
||||
})
|
||||
.catch(function(error) {
|
||||
if(error) console.error(error)
|
||||
})
|
||||
return mapStyle
|
||||
if(error) console.error(error);
|
||||
});
|
||||
return mapStyle;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/// <reference types="vite/client" />
|
||||
import { IStyleStore, OnStyleChangedCallback } from "../definitions";
|
||||
import { type IStyleStore, type OnStyleChangedCallback } from "../definitions";
|
||||
import { getStyleUrlFromAddressbarAndRemoveItIfNeeded, loadStyleUrl } from "../urlopen";
|
||||
import { ApiStyleStore } from "./apistore";
|
||||
import { StyleStore } from "./stylestore";
|
||||
@@ -8,7 +8,7 @@ export async function createStyleStore(onStyleChanged: OnStyleChangedCallback):
|
||||
const styleUrl = getStyleUrlFromAddressbarAndRemoveItIfNeeded();
|
||||
const useStyleUrl = styleUrl && window.confirm("Load style from URL: " + styleUrl + " and discard current changes?");
|
||||
let styleStore: IStyleStore;
|
||||
if (import.meta.env.MODE === 'desktop' && !useStyleUrl) {
|
||||
if (import.meta.env.MODE === "desktop" && !useStyleUrl) {
|
||||
const apiStyleStore = new ApiStyleStore({
|
||||
onLocalStyleChange: mapStyle => onStyleChanged(mapStyle, {save: false}),
|
||||
});
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
import style from '../style'
|
||||
import {loadStyleUrl} from '../urlopen'
|
||||
import publicSources from '../../config/styles.json'
|
||||
import type {IStyleStore, StyleSpecificationWithId} from '../definitions'
|
||||
import style from "../style";
|
||||
import {loadStyleUrl} from "../urlopen";
|
||||
import publicSources from "../../config/styles.json";
|
||||
import type {IStyleStore, StyleSpecificationWithId} from "../definitions";
|
||||
|
||||
const storagePrefix = "maputnik"
|
||||
const stylePrefix = 'style'
|
||||
const storagePrefix = "maputnik";
|
||||
const stylePrefix = "style";
|
||||
const storageKeys = {
|
||||
latest: [storagePrefix, 'latest_style'].join(':'),
|
||||
accessToken: [storagePrefix, 'access_token'].join(':')
|
||||
}
|
||||
latest: [storagePrefix, "latest_style"].join(":"),
|
||||
accessToken: [storagePrefix, "access_token"].join(":")
|
||||
};
|
||||
|
||||
const defaultStyleUrl = publicSources[0].url
|
||||
const defaultStyleUrl = publicSources[0].url;
|
||||
|
||||
// Fetch a default style via URL and return it or a fallback style via callback
|
||||
export function loadDefaultStyle(): Promise<StyleSpecificationWithId> {
|
||||
@@ -19,35 +19,35 @@ export function loadDefaultStyle(): Promise<StyleSpecificationWithId> {
|
||||
|
||||
// Return style ids and dates of all styles stored in local storage
|
||||
function loadStoredStyles() {
|
||||
const styles = []
|
||||
const styles = [];
|
||||
for (let i = 0; i < window.localStorage.length; i++) {
|
||||
const key = window.localStorage.key(i)
|
||||
const key = window.localStorage.key(i);
|
||||
if(isStyleKey(key!)) {
|
||||
styles.push(fromKey(key!))
|
||||
styles.push(fromKey(key!));
|
||||
}
|
||||
}
|
||||
return styles
|
||||
return styles;
|
||||
}
|
||||
|
||||
function isStyleKey(key: string) {
|
||||
const parts = key.split(":")
|
||||
return parts.length === 3 && parts[0] === storagePrefix && parts[1] === stylePrefix
|
||||
const parts = key.split(":");
|
||||
return parts.length === 3 && parts[0] === storagePrefix && parts[1] === stylePrefix;
|
||||
}
|
||||
|
||||
// Load style id from key
|
||||
function fromKey(key: string) {
|
||||
if(!isStyleKey(key)) {
|
||||
throw "Key is not a valid style key"
|
||||
throw "Key is not a valid style key";
|
||||
}
|
||||
|
||||
const parts = key.split(":")
|
||||
const styleId = parts[2]
|
||||
return styleId
|
||||
const parts = key.split(":");
|
||||
const styleId = parts[2];
|
||||
return styleId;
|
||||
}
|
||||
|
||||
// Calculate key that identifies the style with a version
|
||||
function styleKey(styleId: string) {
|
||||
return [storagePrefix, stylePrefix, styleId].join(":")
|
||||
return [storagePrefix, stylePrefix, styleId].join(":");
|
||||
}
|
||||
|
||||
// Manages many possible styles that are stored in the local storage
|
||||
@@ -68,7 +68,7 @@ export class StyleStore implements IStyleStore {
|
||||
for (let i = 0; i < window.localStorage.length; i++) {
|
||||
const key = window.localStorage.key(i) as string;
|
||||
if(key.startsWith(storagePrefix)) {
|
||||
window.localStorage.removeItem(key)
|
||||
window.localStorage.removeItem(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -79,7 +79,7 @@ export class StyleStore implements IStyleStore {
|
||||
return loadDefaultStyle();
|
||||
}
|
||||
const styleId = window.localStorage.getItem(storageKeys.latest) as string;
|
||||
const styleItem = window.localStorage.getItem(styleKey(styleId))
|
||||
const styleItem = window.localStorage.getItem(styleKey(styleId));
|
||||
|
||||
if (styleItem) {
|
||||
return JSON.parse(styleItem) as StyleSpecificationWithId;
|
||||
@@ -89,30 +89,30 @@ export class StyleStore implements IStyleStore {
|
||||
|
||||
// Save current style replacing previous version
|
||||
save(mapStyle: StyleSpecificationWithId) {
|
||||
mapStyle = style.ensureStyleValidity(mapStyle)
|
||||
const key = styleKey(mapStyle.id)
|
||||
mapStyle = style.ensureStyleValidity(mapStyle);
|
||||
const key = styleKey(mapStyle.id);
|
||||
|
||||
const saveFn = () => {
|
||||
window.localStorage.setItem(key, JSON.stringify(mapStyle))
|
||||
window.localStorage.setItem(storageKeys.latest, mapStyle.id)
|
||||
}
|
||||
window.localStorage.setItem(key, JSON.stringify(mapStyle));
|
||||
window.localStorage.setItem(storageKeys.latest, mapStyle.id);
|
||||
};
|
||||
|
||||
try {
|
||||
saveFn()
|
||||
saveFn();
|
||||
} catch (e) {
|
||||
// Handle quota exceeded error
|
||||
if (e instanceof DOMException && (
|
||||
e.code === 22 || // Firefox
|
||||
e.code === 1014 || // Firefox
|
||||
e.name === 'QuotaExceededError' ||
|
||||
e.name === 'NS_ERROR_DOM_QUOTA_REACHED'
|
||||
e.name === "QuotaExceededError" ||
|
||||
e.name === "NS_ERROR_DOM_QUOTA_REACHED"
|
||||
)) {
|
||||
this.purge()
|
||||
saveFn() // Retry after clearing
|
||||
this.purge();
|
||||
saveFn(); // Retry after clearing
|
||||
} else {
|
||||
throw e
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
return mapStyle
|
||||
return mapStyle;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user