diff --git a/package.json b/package.json index 6427d8b6..6791dcff 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "start:daemon": "cd packages/daemon && yarn start", "pm2": "concurrently 'yarn:pm2:*'", "pm2:daemon": "cd packages/daemon && yarn pm2", - "postinstall": "patch-package", "prepare": "husky install", "release:create": "hygen blog new" }, @@ -48,7 +47,6 @@ "chokidar-cli": "^3.0.0", "concurrently": "^8.2.1", "husky": "^8.0.0", - "patch-package": "^8.0.0", "postinstall-postinstall": "^2.1.0", "prettier": "^3.0.3", "prettier-plugin-organize-imports": "^3.2.3", diff --git a/packages/common/package.json b/packages/common/package.json index e5f67635..eb9543e8 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -4,7 +4,6 @@ "main": "src/index.ts", "license": "MIT", "scripts": { - "postinstall": "cd ../.. && patch-package", "check:types": "tsc --noEmit" }, "dependencies": { diff --git a/packages/daemon/package.json b/packages/daemon/package.json index a800f72e..cf9ba9d9 100644 --- a/packages/daemon/package.json +++ b/packages/daemon/package.json @@ -13,8 +13,7 @@ "ddos": "tsx watch src/stresser/index.ts", "start": "tsx src/server.ts", "pm2": "pm2 stop all; pm2 del daemon ; pm2 start \"yarn start\" --name=daemon -l /home/pockethost/logs/daemon-`date +%s`.log", - "migrate": "tsx src/migrate/migrate.ts", - "postinstall": "cd ../.. && patch-package" + "migrate": "tsx src/migrate/migrate.ts" }, "dependencies": { "@pockethost/common": "0.0.1", @@ -27,13 +26,13 @@ "commander": "^11.0.0", "date-fns": "^2.29.3", "decompress": "^4.2.1", - "decompress-unzip": "^4.0.1", + "decompress-unzip": "https://github.com/pockethost/decompress-unzip.git#pockethost", "dockerode": "^3.3.5", "dotenv": "^16.3.1", "event-source-polyfill": "^1.0.31", "eventsource": "^2.0.2", "exit-hook": "^4.0.0", - "ftp-srv": "^4.6.2", + "ftp-srv": "https://github.com/pockethost/ftp-srv.git#pockethost", "get-port": "^6.1.2", "glob": "^10.3.10", "http-proxy": "^1.18.1", diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json index f8e16f97..0fa1f947 100644 --- a/packages/dashboard/package.json +++ b/packages/dashboard/package.json @@ -8,13 +8,12 @@ "dev": "vite dev --force", "build": "vite build", "lint": "prettier --check .", - "format": "prettier --write .", - "postinstall": "cd ../.. && patch-package" + "format": "prettier --write ." }, "type": "module", "dependencies": { - "@dansvel/vite-plugin-markdown": "^2.0.5", - "@microsoft/fetch-event-source": "https://github.com/Almar/fetch-event-source.git#pr/make_web_worker_friendly", + "@dansvel/vite-plugin-markdown": "https://github.com/pockethost/vite-plugin-markdown.git#pockethost", + "@microsoft/fetch-event-source": "https://github.com/pockethost/fetch-event-source.git#pockethost", "@pockethost/common": "*", "@sveltejs/adapter-static": "^2.0.3", "@sveltejs/kit": "^1.25.2", diff --git a/packages/www/package.json b/packages/www/package.json index 8e23a9fd..f0c1500c 100644 --- a/packages/www/package.json +++ b/packages/www/package.json @@ -9,8 +9,7 @@ "start": "npx @11ty/eleventy --serve --quiet", "debug": "DEBUG=Eleventy* npx @11ty/eleventy", "debugstart": "DEBUG=Eleventy* npx @11ty/eleventy --serve --quiet", - "benchmark": "DEBUG=Eleventy:Benchmark* npx @11ty/eleventy", - "postinstall": "cd ../.. && patch-package" + "benchmark": "DEBUG=Eleventy:Benchmark* npx @11ty/eleventy" }, "repository": { "type": "git", diff --git a/patches/@dansvel+vite-plugin-markdown+2.0.5.patch b/patches/@dansvel+vite-plugin-markdown+2.0.5.patch deleted file mode 100644 index 7441fc3d..00000000 --- a/patches/@dansvel+vite-plugin-markdown+2.0.5.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/node_modules/@dansvel/vite-plugin-markdown/dist/cjs/index.d.ts b/node_modules/@dansvel/vite-plugin-markdown/dist/cjs/index.d.ts -index a5f9715..d84ae89 100644 ---- a/node_modules/@dansvel/vite-plugin-markdown/dist/cjs/index.d.ts -+++ b/node_modules/@dansvel/vite-plugin-markdown/dist/cjs/index.d.ts -@@ -4,8 +4,8 @@ export interface PluginOptions { - markedOptions?: marked.options; - withOrigin?: boolean; - } --export interface Metadata { -- attributes: {}; -+export interface Metadata { -+ attributes: TAttributes; - body: string; - } - export interface Result extends Metadata { -diff --git a/node_modules/@dansvel/vite-plugin-markdown/dist/mjs/index.js b/node_modules/@dansvel/vite-plugin-markdown/dist/mjs/index.js -index f405f8c..8beee2e 100644 ---- a/node_modules/@dansvel/vite-plugin-markdown/dist/mjs/index.js -+++ b/node_modules/@dansvel/vite-plugin-markdown/dist/mjs/index.js -@@ -1,5 +1,8 @@ - import frontMatter from 'front-matter'; - import { marked } from 'marked'; -+import { parse } from 'node-html-parser'; -+import {reduce} from '@s-libs/micro-dash' -+ - class Content { - variables = []; - #contextCode = ''; -@@ -29,6 +32,29 @@ export default (options) => { - attributes, - body: marked.parse(body) - }; -+ let outline = [] -+ let currentOutline = undefined -+ let currentElements = [] -+ parse(result.body).childNodes.forEach( (v)=>{ -+ if(v.rawTagName==='h2') { -+ if(currentOutline) { -+ currentOutline.body = currentElements.map(e=>e.outerHTML).join(`\n`) -+ outline.push(currentOutline) -+ } -+ currentOutline = -+ { -+ title: v.text, -+ } -+ currentElements = [] -+ return -+ } -+ currentElements.push(v) -+ }) -+ if(currentOutline) { -+ currentOutline.body = currentElements.map(e=>e.outerHTML).join(`\n`) -+ outline.push(currentOutline) -+ } -+ result.outline = outline - if (options.withOrigin) { - result = { - ...result, diff --git a/patches/@microsoft+fetch-event-source+2.0.3.patch b/patches/@microsoft+fetch-event-source+2.0.3.patch deleted file mode 100644 index 1d143552..00000000 --- a/patches/@microsoft+fetch-event-source+2.0.3.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/node_modules/@microsoft/fetch-event-source/package.json b/node_modules/@microsoft/fetch-event-source/package.json -index 8528735..2e9bac3 100644 ---- a/node_modules/@microsoft/fetch-event-source/package.json -+++ b/node_modules/@microsoft/fetch-event-source/package.json -@@ -9,9 +9,9 @@ - }, - "author": "Microsoft", - "license": "MIT", -- "main": "lib/cjs/index.js", -- "module": "lib/esm/index.js", -- "types": "lib/cjs/index.d.ts", -+ "main": "src/index.ts", -+ "module": "src/index.ts", -+ "types": "src/index.ts", - "sideEffects": false, - "scripts": { - "clean": "rimraf ./lib ./coverage", -diff --git a/node_modules/@microsoft/fetch-event-source/src/fetch.ts b/node_modules/@microsoft/fetch-event-source/src/fetch.ts -index 1e2236c..ccfdf6d 100644 ---- a/node_modules/@microsoft/fetch-event-source/src/fetch.ts -+++ b/node_modules/@microsoft/fetch-event-source/src/fetch.ts -@@ -84,7 +84,7 @@ export function fetchEventSource(input: RequestInfo, { - } - - let retryInterval = DefaultRetryInterval; -- let retryTimer = 0; -+ let retryTimer : ReturnType | undefined = undefined; - function dispose() { - globalThis.document?.removeEventListener('visibilitychange', onVisibilityChange); - globalThis.clearTimeout(retryTimer); -diff --git a/node_modules/@microsoft/fetch-event-source/src/index.ts b/node_modules/@microsoft/fetch-event-source/src/index.ts -index cdcc974..f793fb1 100644 ---- a/node_modules/@microsoft/fetch-event-source/src/index.ts -+++ b/node_modules/@microsoft/fetch-event-source/src/index.ts -@@ -1,2 +1,3 @@ --export { fetchEventSource, FetchEventSourceInit, EventStreamContentType } from './fetch'; --export { EventSourceMessage } from './parse'; -+export { fetchEventSource, type EventStreamContentType, type FetchEventSourceInit } from './fetch'; -+export { type EventSourceMessage } from './parse'; -+ -diff --git a/node_modules/@microsoft/fetch-event-source/src/parse.ts b/node_modules/@microsoft/fetch-event-source/src/parse.ts -index c13e3c4..40af9aa 100644 ---- a/node_modules/@microsoft/fetch-event-source/src/parse.ts -+++ b/node_modules/@microsoft/fetch-event-source/src/parse.ts -@@ -1,3 +1,5 @@ -+ -+ - /** - * Represents a message sent in an event stream - * https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events#Event_stream_format -@@ -21,7 +23,7 @@ export interface EventSourceMessage { - */ - export async function getBytes(stream: ReadableStream, onChunk: (arr: Uint8Array) => void) { - const reader = stream.getReader(); -- let result: ReadableStreamDefaultReadResult; -+ let result: ReadableStreamReadResult; - while (!(result = await reader.read()).done) { - onChunk(result.value); - } diff --git a/patches/decompress-unzip+4.0.1.patch b/patches/decompress-unzip+4.0.1.patch deleted file mode 100644 index 4536de2e..00000000 --- a/patches/decompress-unzip+4.0.1.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/node_modules/decompress-unzip/index.d.ts b/node_modules/decompress-unzip/index.d.ts -new file mode 100644 -index 0000000..25422a6 ---- /dev/null -+++ b/node_modules/decompress-unzip/index.d.ts -@@ -0,0 +1,3 @@ -+type Plugin = ()=>(buf:Buffer)=>Promise -+const plugin:Plugin -+export default plugin -\ No newline at end of file diff --git a/patches/ftp-srv+4.6.2.patch b/patches/ftp-srv+4.6.2.patch deleted file mode 100644 index 22bf6b2f..00000000 --- a/patches/ftp-srv+4.6.2.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/node_modules/ftp-srv/ftp-srv.d.ts b/node_modules/ftp-srv/ftp-srv.d.ts -index b14b113..15134cb 100644 ---- a/node_modules/ftp-srv/ftp-srv.d.ts -+++ b/node_modules/ftp-srv/ftp-srv.d.ts -@@ -2,11 +2,19 @@ import * as tls from 'tls' - import { Stats } from 'fs' - import { EventEmitter } from 'events'; - -+export type FileStat= { -+ isDirectory(): boolean -+ mode: number -+ size: number -+ mtime: number -+ name: string -+} -+ - export class FileSystem { - - readonly connection: FtpConnection; - readonly root: string; -- readonly cwd: string; -+ cwd: string; - - constructor(connection: FtpConnection, {root, cwd}?: { - root: any; -@@ -15,9 +23,9 @@ export class FileSystem { - - currentDirectory(): string; - -- get(fileName: string): Promise; -+ get(fileName: string): Promise; - -- list(path?: string): Promise; -+ list(path?: string): Promise; - - chdir(path?: string): Promise; - -@@ -28,7 +36,7 @@ export class FileSystem { - - read(fileName: string, {start}?: { - start?: any; -- }): Promise; -+ }): Promise; - - delete(path: string): Promise; - diff --git a/patches/sqlite3+5.1.6.patch b/patches/sqlite3+5.1.6.patch deleted file mode 100644 index ee334478..00000000 --- a/patches/sqlite3+5.1.6.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff --git a/node_modules/sqlite3/lib/sqlite3.d.ts b/node_modules/sqlite3/lib/sqlite3.d.ts -index 15e6623..0cbc0f5 100644 ---- a/node_modules/sqlite3/lib/sqlite3.d.ts -+++ b/node_modules/sqlite3/lib/sqlite3.d.ts -@@ -139,6 +139,153 @@ export class Database extends events.EventEmitter { - wait(callback?: (param: null) => void): this; - - interrupt(): void; -+ -+ backup(path:string, callback?: ()=>void): Backup -+ backup(filename:string, destDbName:string, sourceDbName:string, filenameIsDest:boolean, callback?: ()=>void): Backup -+} -+ -+/** -+ * -+ * A class for managing an sqlite3_backup object. For consistency -+ * with other node-sqlite3 classes, it maintains an internal queue -+ * of calls. -+ * -+ * Intended usage from node: -+ * -+ * var db = new sqlite3.Database('live.db'); -+ * var backup = db.backup('backup.db'); -+ * ... -+ * // in event loop, move backup forward when we have time. -+ * if (backup.idle) { backup.step(NPAGES); } -+ * if (backup.completed) { ... success ... } -+ * if (backup.failed) { ... sadness ... } -+ * // do other work in event loop - fine to modify live.db -+ * ... -+ * -+ * Here is how sqlite's backup api is exposed: -+ * -+ * - `sqlite3_backup_init`: This is implemented as -+ * `db.backup(filename, [callback])` or -+ * `db.backup(filename, destDbName, sourceDbName, filenameIsDest, [callback])`. -+ * - `sqlite3_backup_step`: `backup.step(pages, [callback])`. -+ * - `sqlite3_backup_finish`: `backup.finish([callback])`. -+ * - `sqlite3_backup_remaining`: `backup.remaining`. -+ * - `sqlite3_backup_pagecount`: `backup.pageCount`. -+ * -+ * There are the following read-only properties: -+ * -+ * - `backup.completed` is set to `true` when the backup -+ * succeeeds. -+ * - `backup.failed` is set to `true` when the backup -+ * has a fatal error. -+ * - `backup.message` is set to the error string -+ * the backup has a fatal error. -+ * - `backup.idle` is set to `true` when no operation -+ * is currently in progress or queued for the backup. -+ * - `backup.remaining` is an integer with the remaining -+ * number of pages after the last call to `backup.step` -+ * (-1 if `step` not yet called). -+ * - `backup.pageCount` is an integer with the total number -+ * of pages measured during the last call to `backup.step` -+ * (-1 if `step` not yet called). -+ * -+ * There is the following writable property: -+ * -+ * - `backup.retryErrors`: an array of sqlite3 error codes -+ * that are treated as non-fatal - meaning, if they occur, -+ * backup.failed is not set, and the backup may continue. -+ * By default, this is `[sqlite3.BUSY, sqlite3.LOCKED]`. -+ * -+ * The `db.backup(filename, [callback])` shorthand is sufficient -+ * for making a backup of a database opened by node-sqlite3. If -+ * using attached or temporary databases, or moving data in the -+ * opposite direction, the more complete (but daunting) -+ * `db.backup(filename, destDbName, sourceDbName, filenameIsDest, [callback])` -+ * signature is provided. -+ * -+ * A backup will finish automatically when it succeeds or a fatal -+ * error occurs, meaning it is not necessary to call `db.finish()`. -+ * By default, SQLITE_LOCKED and SQLITE_BUSY errors are not -+ * treated as failures, and the backup will continue if they -+ * occur. The set of errors that are tolerated can be controlled -+ * by setting `backup.retryErrors`. To disable automatic -+ * finishing and stick strictly to sqlite's raw api, set -+ * `backup.retryErrors` to `[]`. In that case, it is necessary -+ * to call `backup.finish()`. -+ * -+ * In the same way as node-sqlite3 databases and statements, -+ * backup methods can be called safely without callbacks, due -+ * to an internal call queue. So for example this naive code -+ * will correctly back up a db, if there are no errors: -+ * -+ * var backup = db.backup('backup.db'); -+ * backup.step(-1); -+ * backup.finish(); -+ * -+ */ -+export class Backup extends events.EventEmitter { -+ /** -+ * `true` when the backup is idle and ready for `step()` to -+ * be called, `false` when busy. -+ */ -+ readonly idle: boolean -+ -+ /** -+ * `true` when the backup has completed, `false` otherwise. -+ */ -+ readonly completed: boolean -+ -+ /** -+ * `true` when the backup has failed, `false` otherwise. `Backup.message` -+ * contains the error message. -+ */ -+ readonly failed: boolean -+ -+ /** -+ * Message failure string from sqlite3_errstr() if `Backup.failed` is `true` -+ */ -+ readonly message: boolean -+ -+ /** -+ * The number of remaining pages after the last call to `step()`, -+ * or `-1` if `step()` has never been called. -+ */ -+ readonly remaining: number -+ -+ /** -+ * The total number of pages measured during the last call to `step()`, -+ * or `-1` if `step()` has never been called. -+ */ -+ readonly pageCount: number -+ -+ -+ /** -+ * An array of sqlite3 error codes that are treated as non-fatal - -+ * meaning, if they occur, `Backup.failed` is not set, and the backup -+ * may continue. By default, this is `[sqlite3.BUSY, sqlite3.LOCKED]`. -+ */ -+ retryErrors: number[] -+ -+ /** -+ * Asynchronously finalize the backup (required). -+ * -+ * @param callback Called when the backup is finalized. -+ */ -+ finish(callback?: ()=>void): void -+ -+ /** -+ * Asynchronously perform an incremental segment of the backup. -+ * -+ * Example: -+ * -+ * ``` -+ * backup.step(5) -+ * ``` -+ * -+ * @param nPages Number of pages to process (5 recommended). -+ * @param callback Called when the step is completed. -+ */ -+ step(nPages: number,callback?: ()=>void): void - } - - export function verbose(): sqlite3; diff --git a/yarn.lock b/yarn.lock index 5118c509..4f48da75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -195,10 +195,9 @@ enabled "2.0.x" kuler "^2.0.0" -"@dansvel/vite-plugin-markdown@^2.0.5": +"@dansvel/vite-plugin-markdown@https://github.com/pockethost/vite-plugin-markdown.git#pockethost": version "2.0.5" - resolved "https://registry.yarnpkg.com/@dansvel/vite-plugin-markdown/-/vite-plugin-markdown-2.0.5.tgz#55cff46adb457cb654b84a424aef2e25ca635926" - integrity sha512-6pdL6vDffWU3E1VoYRRzpXswnghAN3W2dRW3642z9cRnKFEdLYBoxZ7qTgLYUF+kVAh4eabZe0iXEp9P1SICdw== + resolved "https://github.com/pockethost/vite-plugin-markdown.git#ad1b2315dc1f1c3189c116640e9f7a4df0786d98" dependencies: front-matter "*" marked "*" @@ -422,9 +421,9 @@ semver "^7.3.5" tar "^6.1.11" -"@microsoft/fetch-event-source@https://github.com/Almar/fetch-event-source.git#pr/make_web_worker_friendly": +"@microsoft/fetch-event-source@https://github.com/pockethost/fetch-event-source.git#pockethost": version "2.0.3" - resolved "https://github.com/Almar/fetch-event-source.git#4ded4d4f5b215b938d7223398d6f2be6473a4c27" + resolved "https://github.com/pockethost/fetch-event-source.git#ebe3b7122647b48b93fd11effbbfb915d98956b0" "@mole-inc/bin-wrapper@^8.0.1": version "8.0.1" @@ -887,11 +886,6 @@ dependencies: "@types/node" "*" -"@yarnpkg/lockfile@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" - integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== - a-sync-waterfall@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz#75b6b6aa72598b497a125e7a2770f14f4c8a1fa7" @@ -1145,11 +1139,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - autoprefixer@^10.4.16: version "10.4.16" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8" @@ -1647,11 +1636,6 @@ ci-info@^3.2.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== -ci-info@^3.7.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" - integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== - clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -2147,13 +2131,12 @@ decompress-targz@^4.0.0: file-type "^5.2.0" is-stream "^1.1.0" -decompress-unzip@^4.0.1: +decompress-unzip@^4.0.1, "decompress-unzip@https://github.com/pockethost/decompress-unzip.git#pockethost": version "4.0.1" - resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" - integrity sha512-1fqeluvxgnn86MOh66u8FjbtJpAFv5wgCT9Iw8rcBqQcCo5tO8eiJw7NNTrvt9n4CRBVq7CstiS922oPgyGLrw== + resolved "https://github.com/pockethost/decompress-unzip.git#6ef397b9a2df11d39c7b26ce779e123833844751" dependencies: file-type "^3.8.0" - get-stream "^2.2.0" + get-stream "^3.0.0" pify "^2.3.0" yauzl "^2.4.2" @@ -2953,13 +2936,6 @@ find-versions@^5.0.0: dependencies: semver-regex "^4.0.5" -find-yarn-workspace-root@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" - integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== - dependencies: - micromatch "^4.0.2" - flat-cache@^3.0.4: version "3.1.0" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f" @@ -3052,16 +3028,6 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^9.0.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -3084,10 +3050,9 @@ fsevents@~2.3.3: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -ftp-srv@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/ftp-srv/-/ftp-srv-4.6.2.tgz#20d94cf3c9ec14cfd16e5d3648ecf852660a017e" - integrity sha512-BaBE2PV5tfWNuBxGTMlswnbaUGbWJYX3POOv4Li5HOnqPS/+DLbCQBDM7WMc4Ll6BVPO8t27ziXOLGfPJeJYpg== +"ftp-srv@https://github.com/pockethost/ftp-srv.git#pockethost": + version "0.0.0" + resolved "https://github.com/pockethost/ftp-srv.git#6925e8908da55cb72b2992e1fc7da64b16a5dc25" dependencies: bluebird "^3.5.1" bunyan "^1.8.12" @@ -3156,14 +3121,6 @@ get-port@^6.1.2: resolved "https://registry.yarnpkg.com/get-port/-/get-port-6.1.2.tgz#c1228abb67ba0e17fb346da33b15187833b9c08a" integrity sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw== -get-stream@^2.2.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" - integrity sha512-AUGhbbemXxrZJRD5cDvKtQxLuYaIbNtDTK8YqupCI393Q2KSTreEsLUN3ZxAWFGiKTzL6nKuzfcIvieflUX9qA== - dependencies: - object-assign "^4.0.1" - pinkie-promise "^2.0.0" - get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -3344,7 +3301,7 @@ graceful-fs@4.2.10: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.6: +graceful-fs@^4.1.10, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -3737,11 +3694,6 @@ is-decimal@^1.0.0: resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== -is-docker@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - is-expression@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab" @@ -3894,13 +3846,6 @@ is-upper-case@^1.1.0: dependencies: upper-case "^1.1.0" -is-wsl@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - is-yarn-global@^0.4.0: version "0.4.1" resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.4.1.tgz#b312d902b313f81e4eaf98b6361ba2b45cd694bb" @@ -3983,13 +3928,6 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-stable-stringify@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz#e06f23128e0bbe342dc996ed5a19e28b57b580e0" - integrity sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g== - dependencies: - jsonify "^0.0.1" - jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" @@ -3999,11 +3937,6 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonify@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978" - integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg== - jstransformer@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3" @@ -4029,13 +3962,6 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw-sync@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" - integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== - dependencies: - graceful-fs "^4.1.11" - kleur@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780" @@ -4374,7 +4300,7 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: +micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -4834,14 +4760,6 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^7.4.2: - version "7.4.2" - resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" - integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== - dependencies: - is-docker "^2.0.0" - is-wsl "^2.1.1" - openai@^4.11.1: version "4.11.1" resolved "https://registry.yarnpkg.com/openai/-/openai-4.11.1.tgz#c2ed9b5e58c3c626b8d43e4eae0cfdbcd44cc844" @@ -5017,27 +4935,6 @@ pascal-case@^2.0.0: camel-case "^3.0.0" upper-case-first "^1.1.0" -patch-package@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61" - integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA== - dependencies: - "@yarnpkg/lockfile" "^1.1.0" - chalk "^4.1.2" - ci-info "^3.7.0" - cross-spawn "^7.0.3" - find-yarn-workspace-root "^2.0.0" - fs-extra "^9.0.0" - json-stable-stringify "^1.0.2" - klaw-sync "^6.0.0" - minimist "^1.2.6" - open "^7.4.2" - rimraf "^2.6.3" - semver "^7.5.3" - slash "^2.0.0" - tmp "^0.0.33" - yaml "^2.2.2" - path-case@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5" @@ -5142,18 +5039,6 @@ pify@^3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw== - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== - pirates@^4.0.1: version "4.0.6" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" @@ -5701,7 +5586,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^2.5.2, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@^2.5.2, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -5995,11 +5880,6 @@ slash@^1.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" integrity sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg== -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== - slugify@^1.6.6: version "1.6.6" resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.6.tgz#2d4ac0eacb47add6af9e04d3be79319cbcc7924b" @@ -7082,7 +6962,7 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^2.1.1, yaml@^2.2.2, yaml@^2.3.2: +yaml@^2.1.1, yaml@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.2.tgz#f522db4313c671a0ca963a75670f1c12ea909144" integrity sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==