diff --git a/apps/content/package.json b/apps/content/package.json index 40d4942..5e21431 100644 --- a/apps/content/package.json +++ b/apps/content/package.json @@ -26,7 +26,7 @@ "svelte-preprocess": "^5.1.3", "svelte-sequential-preprocessor": "^2.0.1", "ts-loader": "^9.5.1", - "typescript": "^5.3.3", + "typescript": "^5.4.5", "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-dev-server": "^4.15.1", diff --git a/apps/extensions/lib/ext-browser.json b/apps/extensions/lib/ext-browser.json index e9ebae6..c216f04 100644 --- a/apps/extensions/lib/ext-browser.json +++ b/apps/extensions/lib/ext-browser.json @@ -1,4 +1,10 @@ { + "browserAction": { + "url": "chrome://bextensions/content/parent/ext-browserAction.js", + "schema": "chrome://bextensions/content/schemas/browser_action.json", + "scopes": ["addon_parent"], + "manifest": ["browser_action"] + }, "pageAction": { "url": "chrome://bextensions/content/parent/ext-pageAction.js", "schema": "chrome://extensions/content/schemas/page_action.json", diff --git a/apps/extensions/lib/parent/ext-browser.js b/apps/extensions/lib/parent/ext-browser.js index 5f2a7b2..da609c5 100644 --- a/apps/extensions/lib/parent/ext-browser.js +++ b/apps/extensions/lib/parent/ext-browser.js @@ -13,6 +13,7 @@ const { lazyESModuleGetters } = typedImportUtils const lazy = lazyESModuleGetters({ WindowTracker: 'resource://app/modules/BrowserWindowTracker.sys.mjs', + EBrowserActions: 'resource://app/modules/EBrowserActions.sys.mjs', EPageActions: 'resource://app/modules/EPageActions.sys.mjs', ExtensionParent: 'resource://gre/modules/ExtensionParent.sys.mjs', }) @@ -36,8 +37,10 @@ class TabTracker extends TabTrackerBase { } /** + * @template {import('@browser/tabs').WindowTab | null} T * @param {number} tabId - * @param {import('@browser/tabs').WindowTab} default_ + * @param {T} default_ + * @returns {T} */ getTab(tabId, default_) { const { tab } = lazy.WindowTracker.getWindowWithBrowserId(tabId) || { diff --git a/apps/extensions/lib/parent/ext-browserAction.js b/apps/extensions/lib/parent/ext-browserAction.js new file mode 100644 index 0000000..e3138c2 --- /dev/null +++ b/apps/extensions/lib/parent/ext-browserAction.js @@ -0,0 +1,38 @@ +// @ts-check +/// +/// +/// + +this.browserAction = class extends ExtensionAPIPersistent { + /** @type {import("resource://app/modules/EBrowserActions.sys.mjs").IBrowserAction | undefined} */ + browserAction + + async onManifestEntry() { + const { extension } = this + /** @type {browser_action__manifest.WebExtensionManifest__extended['browser_action']} */ + const options = extension.manifest.browser_action + + if (!options) { + return + } + + this.browserAction = lazy.EBrowserActions.BrowserAction(extension.id, { + icons: lazy.ExtensionParent.IconDetails.normalize( + { + path: options.default_icon || extension.manifest.icons, + iconType: 'browserAction', + themeIcon: options.theme_icons, + }, + extension, + ), + title: options.default_title || extension.id, + popupUrl: options.default_popup, + }) + + lazy.EBrowserActions.actions.addKey(extension.id, this.browserAction) + } + + onShutdown() { + lazy.EBrowserActions.actions.removeKey(this.extension.id) + } +} diff --git a/apps/extensions/lib/parent/ext-pageAction.js b/apps/extensions/lib/parent/ext-pageAction.js index 5339ca1..9dd939e 100644 --- a/apps/extensions/lib/parent/ext-pageAction.js +++ b/apps/extensions/lib/parent/ext-pageAction.js @@ -14,6 +14,10 @@ this.pageAction = class extends ExtensionAPIPersistent { const { extension } = this const options = extension.manifest.page_action + if (!options) { + return + } + this.pageAction = new lazy.EPageActions.PageAction({ extensionId: extension.id, tooltip: options.default_title, @@ -27,7 +31,7 @@ this.pageAction = class extends ExtensionAPIPersistent { { path: options.default_icon || extension.manifest.icons, iconType: 'browserAction', - themeIcon: options.theme_icons || extension.theme_icons, + themeIcon: options.theme_icons, }, extension, ), diff --git a/apps/extensions/lib/parent/ext-tabs.js b/apps/extensions/lib/parent/ext-tabs.js index a2d209e..d91a4ff 100644 --- a/apps/extensions/lib/parent/ext-tabs.js +++ b/apps/extensions/lib/parent/ext-tabs.js @@ -5,7 +5,7 @@ // @ts-check /// /// -/// +/// /** * @param {tabs__tabs.QueryInfo} queryInfo diff --git a/apps/extensions/lib/schemas/browser_action.json b/apps/extensions/lib/schemas/browser_action.json new file mode 100644 index 0000000..684d8e2 --- /dev/null +++ b/apps/extensions/lib/schemas/browser_action.json @@ -0,0 +1,43 @@ +[ + { + "namespace": "manifest", + "types": [ + { + "$extend": "WebExtensionManifest", + "properties": { + "browser_action": { + "type": "object", + "optional": true, + "properties": { + "default_icon": { + "optional": true, + "$ref": "IconPath" + }, + "default_popup": { + "optional": true, + "type": "string" + }, + "default_title": { + "optional": true, + "type": "string" + }, + "theme_icons": { + "optional": true, + "type": "array", + "items": { "$ref": "ThemeIcons" } + }, + "browser_style": { + "optional": true, + "type": "boolean" + }, + "default_area": { + "optional": true, + "type": "string" + } + } + } + } + } + ] + } +] diff --git a/apps/extensions/lib/schemas/tabs.json b/apps/extensions/lib/schemas/tabs.json index 40b0ef7..064190b 100644 --- a/apps/extensions/lib/schemas/tabs.json +++ b/apps/extensions/lib/schemas/tabs.json @@ -8,7 +8,6 @@ "types": [ { "$extend": "OptionalPermission", - "id": "ExtraPerms1", "choices": [ { "type": "string", diff --git a/apps/extensions/lib/types/utils.d.ts b/apps/extensions/lib/types/utils.d.ts index 67febf3..15d7e8b 100644 --- a/apps/extensions/lib/types/utils.d.ts +++ b/apps/extensions/lib/types/utils.d.ts @@ -155,6 +155,14 @@ declare global { [LISTENERS]: Map; [ONCE_MAP]: WeakMap } + + class ExtensionData { + id: string + + manifest: browser._manifest.WebExtensionManifest & + browser_action__manifest.WebExtensionManifest__extended + } + /** * Base class for WebExtension APIs. Each API creates a new class * that inherits from this class, the derived class is instantiated @@ -162,7 +170,7 @@ declare global { */ class ExtensionAPI extends EventEmitter { constructor(extension: any) - extension: any + extension: ExtensionData destroy(): void onManifestEntry(entry: any): void getAPI(context: any): void diff --git a/apps/extensions/package.json b/apps/extensions/package.json index b49203b..2cd0d68 100644 --- a/apps/extensions/package.json +++ b/apps/extensions/package.json @@ -1,10 +1,10 @@ { - "name": "extensions", + "name": "@browser/extensions", "type": "module", "version": "1.0.0", "scripts": { "build": "node ./scripts/buildTypes.js", - "dev": "watch 'pnpm build' ./lib/schemas/" + "dev": "watch 'pnpm build' ./lib/schemas/ ./scripts/" }, "dependencies": { "@browser/link": "workspace:*" diff --git a/apps/extensions/scripts/buildTypes.js b/apps/extensions/scripts/buildTypes.js index 1f2a339..9550e75 100644 --- a/apps/extensions/scripts/buildTypes.js +++ b/apps/extensions/scripts/buildTypes.js @@ -54,7 +54,7 @@ const { /** * @typedef {object} StringType * @property {'string'} type - * @property {{ name: string }[]} [enum] + * @property {({ name: string } | string)[]} [enum] */ /** @@ -78,7 +78,12 @@ const { */ const schemaFolder = path.join(process.cwd(), 'lib', 'schemas') -const outFolder = path.join(process.cwd(), 'lib', 'schemaTypes') +const outFolder = path.join( + process.cwd(), + '../..', + 'libs/link/types', + 'schemaTypes', +) const printer = createPrinter({ newLine: NewLineKind.LineFeed, @@ -87,8 +92,10 @@ const printer = createPrinter({ const QUESTION_TOKEN = factory.createToken(SyntaxKind.QuestionToken) +const modules = [] for (const file of fs.readdirSync(schemaFolder)) { const fileName = file.replace('.json', '') + modules.push(fileName) let text = fs.readFileSync(path.join(schemaFolder, file), 'utf8') const sourceFile = createSourceFile(file, text, ScriptTarget.Latest) @@ -132,6 +139,12 @@ for (const file of fs.readdirSync(schemaFolder)) { ) } +fs.writeFileSync( + path.join(outFolder, 'index.d.ts'), + '// @not-mpl \n' + + modules.map((m) => `/// `).join('\n'), +) + /** * @param {Type[]} types * @returns {import('typescript').TypeAliasDeclaration[]} @@ -139,7 +152,10 @@ for (const file of fs.readdirSync(schemaFolder)) { function generateTypes(types) { return types .map((type) => { - if (type.$extend) return null + if (type.$extend) { + type.id = `${type.$extend}__extended` + type.type = 'object' + } return factory.createTypeAliasDeclaration( undefined, @@ -256,7 +272,9 @@ function generateTypeNode(type) { if (type.enum) { return factory.createUnionTypeNode( type.enum.map((e) => - factory.createLiteralTypeNode(factory.createStringLiteral(e.name)), + factory.createLiteralTypeNode( + factory.createStringLiteral(typeof e === 'string' ? e : e.name), + ), ), ) } diff --git a/apps/modules/lib/EBrowserActions.sys.mjs b/apps/modules/lib/EBrowserActions.sys.mjs new file mode 100644 index 0000000..61117bf --- /dev/null +++ b/apps/modules/lib/EBrowserActions.sys.mjs @@ -0,0 +1,98 @@ +// @ts-check +/// +import { map, writable } from 'resource://app/modules/SvelteStore.sys.mjs' +import mitt from 'resource://app/modules/mitt.sys.mjs' + +import { derived } from './SvelteStore.sys.mjs' + +/** @typedef {import('resource://app/modules/EBrowserActions.sys.mjs').IBrowserAction} IBrowserAction */ +/** @implements {IBrowserAction} */ +class BrowserAction { + id + /** @type {ReturnType} */ + emmiter = mitt() + + /** @type{import('resource://app/modules/SvelteStore.sys.mjs').IWritable>} */ + icons = writable({}) + /** @type {import('resource://app/modules/SvelteStore.sys.mjs').IWritable} */ + title = writable('') + /** @type {import('resource://app/modules/SvelteStore.sys.mjs').IWritable} */ + popupUrl = writable(undefined) + + /** + * @param {string} id + */ + constructor(id) { + this.id = id + } + + getEmmiter() { + return this.emmiter + } + + getExtensionId() { + return this.id + } + + /** + * @param {Record} icons + */ + setIcons(icons) { + this.icons.set(icons) + } + getIcons() { + return this.icons + } + /** @param {number} preferredSize */ + getIcon(preferredSize) { + return derived([this.icons], (icon) => { + let bestSize + + if (icon[preferredSize]) { + bestSize = preferredSize + } else if (icon[preferredSize * 2]) { + bestSize = preferredSize * 2 + } else { + const sizes = Object.keys(icon) + .map((key) => parseInt(key, 10)) + .sort((a, b) => a - b) + bestSize = + sizes.find((candidate) => candidate > preferredSize) || + sizes.pop() || + 0 + } + + return icon[bestSize] + }) + } + + setTitle(title) { + this.title.set(title) + } + getTitle() { + return this.title + } + + setPopupUrl(url) { + this.popupUrl.set(url) + } + getPopupUrl() { + return this.popupUrl + } +} + +/** @type {typeof import('resource://app/modules/EBrowserActions.sys.mjs').EBrowserActions} */ +export const EBrowserActions = { + BrowserAction: (id, options) => { + const action = new BrowserAction(id) + + action.setIcons(options.icons) + action.setTitle(options.title) + action.setPopupUrl(options.popupUrl) + + return action + }, + actions: map({}), +} + +EBrowserActions.actions.subscribe((a) => console.log(JSON.stringify(a))) diff --git a/apps/modules/lib/SvelteStore.sys.mjs b/apps/modules/lib/SvelteStore.sys.mjs new file mode 100644 index 0000000..4cac276 --- /dev/null +++ b/apps/modules/lib/SvelteStore.sys.mjs @@ -0,0 +1,116 @@ +// @ts-check +/// + +/** @type {import('resource://app/modules/SvelteStore.sys.mjs').ReadableFn} */ +export function readable(initial, update) { + let value = initial + + let nextSubscription = 0 + let subscriptions = {} + + const init = !update + ? () => {} + : () => + update((v) => { + value = v + for (const id in subscriptions) { + subscriptions[id](value) + } + }) + + return { + subscribe(cb) { + if (nextSubscription === 0) init() + + const id = nextSubscription++ + subscriptions[id] = cb + cb(value) + return () => delete subscriptions[id] + }, + get: () => value, + } +} + +/** @type {import('resource://app/modules/SvelteStore.sys.mjs').WritableFn} */ +export function writable(initial) { + let value = initial + + let nextSubscription = 0 + let subscriptions = {} + + /** @param {typeof value} v */ + function set(v) { + value = v + for (const id in subscriptions) { + subscriptions[id](value) + } + } + + return { + set, + + subscribe(cb) { + const id = nextSubscription++ + subscriptions[id] = cb + cb(value) + return () => delete subscriptions[id] + }, + update: (cb) => set(cb(value)), + get: () => value, + } +} + +/** @type {import('resource://app/modules/SvelteStore.sys.mjs').MapFn} */ +export function map(initial) { + let value = initial + + let nextGlobalSubscription = 0 + let globalSubscriptions = {} + + function triggerGlobalUpdate() { + for (const id in globalSubscriptions) { + globalSubscriptions[id](value) + } + } + + return { + get: () => ({ ...value }), + /** @param {(value: typeof initial) => void} cb */ + subscribe(cb) { + const id = nextGlobalSubscription++ + globalSubscriptions[id] = cb + cb(value) + return () => delete globalSubscriptions[id] + }, + + /** @param {keyof typeof initial} k */ + key: (k) => value[k], + /** + * @param {keyof typeof initial} key + * @param {typeof initial[keyof typeof initial]} v + */ + addKey(key, v) { + value[key] = v + triggerGlobalUpdate() + return v + }, + /** @param {keyof typeof initial} key */ + removeKey(key) { + const v = value[key] + delete value[key] + triggerGlobalUpdate() + return v + }, + } +} + +/** @type {import('resource://app/modules/SvelteStore.sys.mjs').DerivedFn} */ +export function derived(stores, update) { + return readable(update(...stores.map((store) => store.get())), (set) => { + const performUpdate = () => + set(update(...stores.map((store) => store.get()))) + for (const store of stores) { + store.subscribe(performUpdate) + } + }) +} diff --git a/libs/link/package.json b/libs/link/package.json index b8f5316..51a31c8 100644 --- a/libs/link/package.json +++ b/libs/link/package.json @@ -1,8 +1,9 @@ { + "$schema": "https://json.schemastore.org/package.json", "name": "@browser/link", "version": "1.0.0", "description": "", - "types": "./types/_link.d.ts", + "types": "./types", "keywords": [], "author": "", "license": "ISC", diff --git a/libs/link/types/_link.d.ts b/libs/link/types/_link.d.ts index a0cf9a9..bb3820a 100644 --- a/libs/link/types/_link.d.ts +++ b/libs/link/types/_link.d.ts @@ -8,6 +8,8 @@ /// /// +/// + /// /// /// @@ -21,10 +23,12 @@ /// /// +/// /// /// /// /// +/// /// /// /// diff --git a/libs/link/types/index.d.ts b/libs/link/types/index.d.ts new file mode 100644 index 0000000..d2485d7 --- /dev/null +++ b/libs/link/types/index.d.ts @@ -0,0 +1 @@ +/// diff --git a/libs/link/types/modules/EBrowserActions.d.ts b/libs/link/types/modules/EBrowserActions.d.ts new file mode 100644 index 0000000..8aae7b0 --- /dev/null +++ b/libs/link/types/modules/EBrowserActions.d.ts @@ -0,0 +1,49 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +declare module 'resource://app/modules/EBrowserActions.sys.mjs' { + import type { Emitter } from 'mitt' + import type { + IMapStore, + IReadable, + } from 'resource://app/modules/SvelteStore.sys.mjs' + + export interface IBrowserAction { + getEmmiter(): Emitter<{ + click: { clickData: { modifiers: string[]; button: number } } + }> + + getExtensionId(): string + + setIcons(icons: Record): void + getIcons(): IReadable> + getIcon(resolution: number): IReadable + + setTitle(title: string): void + getTitle(): IReadable + + setPopupUrl(url: string): void + getPopupUrl(): IReadable + } + + export const EBrowserActions: { + BrowserAction: ( + id: string, + options: { + title: string + icons: Record + popupUrl?: string + }, + ) => IBrowserAction + actions: IMapStore + } +} + +declare interface MozESMExportFile { + EBrowserActions: 'resource://app/modules/EBrowserActions.sys.mjs' +} + +declare interface MozESMExportType { + EBrowserActions: typeof import('resource://app/modules/EBrowserActions.sys.mjs').EBrowserActions +} diff --git a/libs/link/types/modules/SvelteStore.d.ts b/libs/link/types/modules/SvelteStore.d.ts new file mode 100644 index 0000000..0169004 --- /dev/null +++ b/libs/link/types/modules/SvelteStore.d.ts @@ -0,0 +1,58 @@ +declare module 'resource://app/modules/SvelteStore.sys.mjs' { + export interface BasicStore { + /** + * Svelte will assume that the store is undefined until update is called. + * A sane implementaiton would call it once on subscribe + * + * @returns A method for unsubscribing from the store + */ + subscribe(update: (value: T) => void): () => void + } + + export interface BasicWritableStore extends BasicStore { + set(value: T): void + } + + export interface IReadable extends BasicStore { + get(): T + } + + export interface IWritable extends IReadable, BasicWritableStore { + update(call: (value: T) => T): void + } + + /** + * Get notified when keys are added or removed, but not changed. For changes, + * you should make the values stores + */ + export interface IMapStore + extends IReadable> { + addKey(key: K, value: V): V + removeKey(key: K): V + key(key: K): V | undefined + } + + export type ReadableFn = ( + value: T, + update?: (set: (value: T) => void) => void, + ) => IReadable + export const readable: ReadableFn + + export type WritableFn = (value: T) => IWritable + export const writable: WritableFn + + export type MapFn = ( + value: Record, + ) => IMapStore + export const map: MapFn + + export type StoreValues = T extends IReadable + ? U + : { [K in keyof T]: T[K] extends IReadable ? U : never } + + export type DerivedFn = >, V>( + stores: Stores, + update: (...values: StoreValues) => V, + ) => IReadable + export const derived: DerivedFn +} diff --git a/libs/link/types/schemaTypes/browser_action.d.ts b/libs/link/types/schemaTypes/browser_action.d.ts new file mode 100644 index 0000000..c13cf83 --- /dev/null +++ b/libs/link/types/schemaTypes/browser_action.d.ts @@ -0,0 +1,21 @@ +// @not-mpl +// This file is generated from '../schemas/browser_action.json'. This file inherits its license +// Please check that file's license +// +// DO NOT MODIFY MANUALLY + +declare module browser_action__manifest { + type WebExtensionManifest__extended = { + browser_action?: { + default_icon?: IconPath + default_popup?: string + default_title?: string + theme_icons?: ThemeIcons[] + browser_style?: boolean + default_area?: string + } + } + type ApiGetterReturn = { + manifest: {} + } +} diff --git a/libs/link/types/schemaTypes/index.d.ts b/libs/link/types/schemaTypes/index.d.ts new file mode 100644 index 0000000..6dfd373 --- /dev/null +++ b/libs/link/types/schemaTypes/index.d.ts @@ -0,0 +1,3 @@ +// @not-mpl +/// +/// \ No newline at end of file diff --git a/apps/extensions/lib/schemaTypes/tabs.d.ts b/libs/link/types/schemaTypes/tabs.d.ts similarity index 95% rename from apps/extensions/lib/schemaTypes/tabs.d.ts rename to libs/link/types/schemaTypes/tabs.d.ts index 1d13734..8e196c1 100644 --- a/apps/extensions/lib/schemaTypes/tabs.d.ts +++ b/libs/link/types/schemaTypes/tabs.d.ts @@ -5,6 +5,7 @@ // DO NOT MODIFY MANUALLY declare module tabs__manifest { + type OptionalPermission__extended = 'tabs' | 'tabHide' type ApiGetterReturn = { manifest: {} } diff --git a/package.json b/package.json index 4532abe..930b23b 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "prettier-plugin-svelte": "^3.0.3", "tap-parser": "^15.3.2", "turbo": "^1.11.2", - "typescript": "^5.2.2" + "typescript": "^5.4.5" }, "pnpm": { "patchedDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b9d21c7..2375a0a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,7 +54,7 @@ importers: version: 3.0.3 prettier-plugin-organize-imports: specifier: ^3.2.3 - version: 3.2.3(prettier@3.0.3)(typescript@5.2.2) + version: 3.2.3(prettier@3.0.3)(typescript@5.4.5) prettier-plugin-svelte: specifier: ^3.0.3 version: 3.0.3(prettier@3.0.3)(svelte@4.2.12) @@ -65,8 +65,8 @@ importers: specifier: ^1.11.2 version: 1.11.2 typescript: - specifier: ^5.2.2 - version: 5.2.2 + specifier: ^5.4.5 + version: 5.4.5 apps/actors: dependencies: @@ -87,7 +87,7 @@ importers: version: 0.5.0 fnts: specifier: ^2.1.0 - version: 2.1.0(typescript@5.3.3) + version: 2.1.0(typescript@5.4.5) mitt: specifier: ^3.0.1 version: 3.0.1 @@ -133,7 +133,7 @@ importers: version: 2.7.6(webpack@5.89.0) postcss-loader: specifier: ^7.3.4 - version: 7.3.4(postcss@8.4.31)(typescript@5.3.3)(webpack@5.89.0) + version: 7.3.4(postcss@8.4.31)(typescript@5.4.5)(webpack@5.89.0) style-loader: specifier: ^3.3.3 version: 3.3.3(webpack@5.89.0) @@ -145,16 +145,16 @@ importers: version: 3.2.0(svelte@4.2.12) svelte-preprocess: specifier: ^5.1.3 - version: 5.1.3(postcss@8.4.31)(svelte@4.2.12)(typescript@5.3.3) + version: 5.1.3(postcss@8.4.31)(svelte@4.2.12)(typescript@5.4.5) svelte-sequential-preprocessor: specifier: ^2.0.1 version: 2.0.1 ts-loader: specifier: ^9.5.1 - version: 9.5.1(typescript@5.3.3)(webpack@5.89.0) + version: 9.5.1(typescript@5.4.5)(webpack@5.89.0) typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.5 + version: 5.4.5 webpack: specifier: ^5.89.0 version: 5.89.0(webpack-cli@5.1.4) @@ -1407,7 +1407,7 @@ packages: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} dev: true - /cosmiconfig@8.3.6(typescript@5.3.3): + /cosmiconfig@8.3.6(typescript@5.4.5): resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} engines: {node: '>=14'} peerDependencies: @@ -1420,7 +1420,7 @@ packages: js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 - typescript: 5.3.3 + typescript: 5.4.5 dev: true /cross-spawn@7.0.3: @@ -2018,7 +2018,7 @@ packages: resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} dev: true - /fnts@2.1.0(typescript@5.3.3): + /fnts@2.1.0(typescript@5.4.5): resolution: {integrity: sha512-+KFw3//Dbxw3R5xCzP+3BMsjhNiRaJ8w1Al/1aCzI7OqrqzIHCpNZShY1nUFPciqHqe8Z3URo+aA595ePa7Kqw==} peerDependencies: typescript: '>=4.7' @@ -2026,7 +2026,7 @@ packages: typescript: optional: true dependencies: - typescript: 5.3.3 + typescript: 5.4.5 dev: false /follow-redirects@1.15.3: @@ -3081,14 +3081,14 @@ packages: find-up: 4.1.0 dev: true - /postcss-loader@7.3.4(postcss@8.4.31)(typescript@5.3.3)(webpack@5.89.0): + /postcss-loader@7.3.4(postcss@8.4.31)(typescript@5.4.5)(webpack@5.89.0): resolution: {integrity: sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==} engines: {node: '>= 14.15.0'} peerDependencies: postcss: ^7.0.0 || ^8.0.1 webpack: ^5.0.0 dependencies: - cosmiconfig: 8.3.6(typescript@5.3.3) + cosmiconfig: 8.3.6(typescript@5.4.5) jiti: 1.20.0 postcss: 8.4.31 semver: 7.5.4 @@ -3164,7 +3164,7 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-organize-imports@3.2.3(prettier@3.0.3)(typescript@5.2.2): + /prettier-plugin-organize-imports@3.2.3(prettier@3.0.3)(typescript@5.4.5): resolution: {integrity: sha512-KFvk8C/zGyvUaE3RvxN2MhCLwzV6OBbFSkwZ2OamCrs9ZY4i5L77jQ/w4UmUr+lqX8qbaqVq6bZZkApn+IgJSg==} peerDependencies: '@volar/vue-language-plugin-pug': ^1.0.4 @@ -3178,7 +3178,7 @@ packages: optional: true dependencies: prettier: 3.0.3 - typescript: 5.2.2 + typescript: 5.4.5 dev: true /prettier-plugin-svelte@3.0.3(prettier@3.0.3)(svelte@4.2.12): @@ -3786,7 +3786,7 @@ packages: svelte-hmr: 0.14.12(svelte@4.2.12) dev: true - /svelte-preprocess@5.1.3(postcss@8.4.31)(svelte@4.2.12)(typescript@5.3.3): + /svelte-preprocess@5.1.3(postcss@8.4.31)(svelte@4.2.12)(typescript@5.4.5): resolution: {integrity: sha512-xxAkmxGHT+J/GourS5mVJeOXZzne1FR5ljeOUAMXUkfEhkLEllRreXpbl3dIYJlcJRfL1LO1uIAPpBpBfiqGPw==} engines: {node: '>= 16.0.0', pnpm: ^8.0.0} requiresBuild: true @@ -3831,7 +3831,7 @@ packages: sorcery: 0.11.0 strip-indent: 3.0.0 svelte: 4.2.12(patch_hash=cm43hmf4gczhssi3isoosy53r4) - typescript: 5.3.3 + typescript: 5.4.5 dev: true /svelte-remixicon@2.4.0(svelte@4.2.12): @@ -3963,7 +3963,7 @@ packages: utf8-byte-length: 1.0.4 dev: true - /ts-loader@9.5.1(typescript@5.3.3)(webpack@5.89.0): + /ts-loader@9.5.1(typescript@5.4.5)(webpack@5.89.0): resolution: {integrity: sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3975,7 +3975,7 @@ packages: micromatch: 4.0.5 semver: 7.5.4 source-map: 0.7.4 - typescript: 5.3.3 + typescript: 5.4.5 webpack: 5.89.0(webpack-cli@5.1.4) dev: true @@ -4063,22 +4063,10 @@ packages: mime-types: 2.1.35 dev: true - /typescript@5.2.2: - resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} - engines: {node: '>=14.17'} - hasBin: true - dev: true - - /typescript@5.3.3: - resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} - engines: {node: '>=14.17'} - hasBin: true - /typescript@5.4.5: resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} engines: {node: '>=14.17'} hasBin: true - dev: true /undici-types@5.25.3: resolution: {integrity: sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==} diff --git a/scripts/unit-test.ts b/scripts/unit-test.ts index 5d5020b..254dd40 100644 --- a/scripts/unit-test.ts +++ b/scripts/unit-test.ts @@ -31,7 +31,7 @@ function runner(testPage: string) { testProcess?.kill() console.error('Process timed out') exit(1) - }, 10_000) + }, 100_000) testProcess.on('exit', () => clearTimeout(timeout))