From 0b950b3253b5ccef6f324aede8e9e1f2e6723822 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 28 Mar 2023 02:58:49 -0600 Subject: [PATCH 01/10] make get_commit_hash more precisce by using exact ref --- archivebox/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/archivebox/config.py b/archivebox/config.py index 775be8e4..4e434c12 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -393,7 +393,10 @@ def get_version(config): def get_commit_hash(config): try: - return list((config['PACKAGE_DIR'] / '../.git/refs/heads/').glob('*'))[0].read_text().strip() + git_dir = config['PACKAGE_DIR'] / '../') + ref = (git_dir / 'HEAD').read_text().strip().split(' ')[-1] + commit_hash = git_dir.joinpath(ref).read_text().strip() + return commit_hash except Exception: return None From f0033f75d07d856d9b3c60ea679f3b6241806ba5 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Thu, 4 May 2023 01:43:34 -0700 Subject: [PATCH 02/10] config.py lint fixes --- archivebox/config.py | 6 +++--- archivebox/extractors/__init__.py | 2 +- bin/build_docker.sh | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/archivebox/config.py b/archivebox/config.py index 4e434c12..a047ff20 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -53,6 +53,7 @@ from .config_stubs import ( ### Pre-Fetch Minimal System Config +TIMEZONE = 'UTC' SYSTEM_USER = getpass.getuser() or os.getlogin() try: @@ -81,7 +82,6 @@ CONFIG_SCHEMA: Dict[str, ConfigDefaultDict] = { 'IN_QEMU': {'type': bool, 'default': False}, 'PUID': {'type': int, 'default': os.getuid()}, 'PGID': {'type': int, 'default': os.getgid()}, - # TODO: 'SHOW_HINTS': {'type: bool, 'default': True}, }, 'GENERAL_CONFIG': { @@ -393,7 +393,7 @@ def get_version(config): def get_commit_hash(config): try: - git_dir = config['PACKAGE_DIR'] / '../') + git_dir = config['PACKAGE_DIR'] / '../' ref = (git_dir / 'HEAD').read_text().strip().split(' ')[-1] commit_hash = git_dir.joinpath(ref).read_text().strip() return commit_hash @@ -1195,7 +1195,7 @@ def check_dependencies(config: ConfigDict=CONFIG, show_help: bool=True) -> None: if config['USE_YOUTUBEDL'] and config['MEDIA_TIMEOUT'] < 20: stderr(f'[!] Warning: MEDIA_TIMEOUT is set too low! (currently set to MEDIA_TIMEOUT={config["MEDIA_TIMEOUT"]} seconds)', color='red') - stderr(' Youtube-dl will fail to archive all media if set to less than ~20 seconds.') + stderr(' youtube-dl/yt-dlp will fail to archive any media if set to less than ~20 seconds.') stderr(' (Setting it somewhere over 60 seconds is recommended)') stderr() stderr(' If you want to disable media archiving entirely, set SAVE_MEDIA=False instead:') diff --git a/archivebox/extractors/__init__.py b/archivebox/extractors/__init__.py index edcf218b..2515b8fd 100644 --- a/archivebox/extractors/__init__.py +++ b/archivebox/extractors/__init__.py @@ -184,7 +184,7 @@ def archive_link(link: Link, overwrite: bool=False, methods: Optional[Iterable[s link.url, command, ts - ) + "\n")) + ) + "\n" + str(e) + "\n")) #f.write(f"\n> {command}; ts={ts} version={config['VERSION']} docker={config['IN_DOCKER']} is_tty={config['IS_TTY']}\n") # print(' ', stats) diff --git a/bin/build_docker.sh b/bin/build_docker.sh index c88ed54c..e427c0a6 100755 --- a/bin/build_docker.sh +++ b/bin/build_docker.sh @@ -74,6 +74,7 @@ echo "[+] Generating requirements.txt and pdm.lock from pyproject.toml..." pdm lock --group=':all' --strategy="cross_platform" --production pdm export --group=':all' --production --without-hashes -o requirements.txt + echo "[+] Building archivebox:$VERSION docker image..." # docker builder prune # docker build . --no-cache -t archivebox-dev \ From 2b421c56bba9bebb85364578537fcd40d7ddf8b9 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Thu, 4 May 2023 01:43:47 -0700 Subject: [PATCH 03/10] require builx for for docker builds --- bin/build_docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/build_docker.sh b/bin/build_docker.sh index e427c0a6..2de9f676 100755 --- a/bin/build_docker.sh +++ b/bin/build_docker.sh @@ -50,6 +50,7 @@ function create_builder() { docker buildx use xbuilder && return 0 echo "[+] Creating new xbuilder for: $SELECTED_PLATFORMS" echo + docker pull 'moby/buildkit:buildx-stable-1' # Switch to buildx builder if already present / previously created docker buildx create --name xbuilder --driver docker-container --bootstrap --use --platform "$SELECTED_PLATFORMS" || true From 6761ed368c75337d21f89c282bcbf982b081ad41 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 14 Nov 2023 02:04:49 -0800 Subject: [PATCH 04/10] wip pre-0.7.1 side fixes --- .vscode/settings.json | 3 + archivebox/config.py | 1 + archivebox/core/admin.py | 19 +- archivebox/core/apps.py | 2 +- archivebox/core/settings.py | 1 + archivebox/logging_util.py | 6 +- archivebox/static | 1 + archivebox/templates/admin/private_index.html | 1 + docker-compose.yml | 3 +- etc/crontabs/archivebox | 8 + package-lock.json | 1740 +++++++++++++++++ screenshot.png | Bin 0 -> 42845 bytes 12 files changed, 1772 insertions(+), 13 deletions(-) create mode 100644 .vscode/settings.json create mode 120000 archivebox/static create mode 100644 etc/crontabs/archivebox create mode 100644 screenshot.png diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..163c9840 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.formatting.provider": "black" +} diff --git a/archivebox/config.py b/archivebox/config.py index a047ff20..2895f207 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -786,6 +786,7 @@ def find_chrome_binary() -> Optional[str]: # Precedence: Chromium, Chrome, Beta, Canary, Unstable, Dev # make sure data dir finding precedence order always matches binary finding order default_executable_paths = ( + # '~/Library/Caches/ms-playwright/chromium-*/chrome-mac/Chromium.app/Contents/MacOS/Chromium', 'chromium-browser', 'chromium', '/Applications/Chromium.app/Contents/MacOS/Chromium', diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py index 0329d9b0..ce4612a7 100644 --- a/archivebox/core/admin.py +++ b/archivebox/core/admin.py @@ -48,22 +48,23 @@ class TagInline(admin.TabularInline): from django.contrib.admin.helpers import ActionForm from django.contrib.admin.widgets import AutocompleteSelectMultiple -class AutocompleteTags: - model = Tag - search_fields = ['name'] +# class AutocompleteTags: +# model = Tag +# search_fields = ['name'] +# name = 'tags' -class AutocompleteTagsAdminStub: - name = 'admin' +# class AutocompleteTagsAdminStub: +# name = 'admin' class SnapshotActionForm(ActionForm): tags = forms.ModelMultipleChoiceField( queryset=Tag.objects.all(), required=False, - widget=AutocompleteSelectMultiple( - AutocompleteTags(), - AutocompleteTagsAdminStub(), - ), + # widget=AutocompleteSelectMultiple( + # # AutocompleteTags(), + # # AutocompleteTagsAdminStub(), + # ), ) # TODO: allow selecting actions for specific extractors? is this useful? diff --git a/archivebox/core/apps.py b/archivebox/core/apps.py index 5182da05..21b95877 100644 --- a/archivebox/core/apps.py +++ b/archivebox/core/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class CoreConfig(AppConfig): name = 'core' - default_auto_field = 'django.db.models.UUIDField' + # default_auto_field = 'django.db.models.UUIDField' diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py index 11fd649d..8334c39b 100644 --- a/archivebox/core/settings.py +++ b/archivebox/core/settings.py @@ -268,6 +268,7 @@ AUTH_PASSWORD_VALIDATORS = [ {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'}, ] +# DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField' ################################################################################ ### Shell Settings diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py index d43bb086..af98c3fb 100644 --- a/archivebox/logging_util.py +++ b/archivebox/logging_util.py @@ -393,7 +393,11 @@ def log_link_archiving_finished(link: "Link", link_dir: str, is_new: bool, stats else: _LAST_RUN_STATS.succeeded += 1 - size = get_dir_size(link_dir) + try: + size = get_dir_size(link_dir) + except FileNotFoundError: + size = (0, None, '0') + end_ts = datetime.now(timezone.utc) duration = str(end_ts - start_ts).split('.')[0] print(' {black}{} files ({}) in {}s {reset}'.format(size[2], printable_filesize(size[0]), duration, **ANSI)) diff --git a/archivebox/static b/archivebox/static new file mode 120000 index 00000000..5d01044d --- /dev/null +++ b/archivebox/static @@ -0,0 +1 @@ +templates/static \ No newline at end of file diff --git a/archivebox/templates/admin/private_index.html b/archivebox/templates/admin/private_index.html index b60f3a3e..a95a7716 100644 --- a/archivebox/templates/admin/private_index.html +++ b/archivebox/templates/admin/private_index.html @@ -88,4 +88,5 @@ {% endblock %} + {% endblock %} diff --git a/docker-compose.yml b/docker-compose.yml index e4ea2b5d..6eff7736 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,6 @@ services: # - ./etc/crontabs:/var/spool/cron/crontabs # uncomment this and archivebox_scheduler below to set up automatic recurring archive jobs # - ./archivebox:/app/archivebox # uncomment this to mount the ArchiveBox source code at runtime (for developers working on archivebox) # build: . # uncomment this to build the image from source code at buildtime (for developers working on archivebox) - environment: - ALLOWED_HOSTS=* # restrict this to only accept incoming traffic via specific domain name # - PUBLIC_INDEX=True # set to False to prevent anonymous users from viewing snapshot list @@ -161,4 +160,4 @@ networks: ipam: driver: default config: - - subnet: 172.20.0.0/24 \ No newline at end of file + - subnet: 172.20.0.0/24 diff --git a/etc/crontabs/archivebox b/etc/crontabs/archivebox new file mode 100644 index 00000000..fbb0acd3 --- /dev/null +++ b/etc/crontabs/archivebox @@ -0,0 +1,8 @@ +# DO NOT EDIT THIS FILE - edit the master and reinstall. +# (/tmp/tmpe3dawo9u installed on Tue Jun 13 23:21:48 2023) +# (Cron version -- $Id: crontab.c,v 2.13 1994/01/17 03:20:37 vixie Exp $) + +@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com/3" >> /data/logs/schedule.log 2>&1 # archivebox_schedule +@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com/2" >> /data/logs/schedule.log 2>&1 # archivebox_schedule +@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com" >> /data/logs/schedule.log 2>&1 # archivebox_schedule +@daily cd /data && /usr/local/bin/archivebox add --depth=0 "update" >> /data/logs/schedule.log 2>&1 # archivebox_schedule diff --git a/package-lock.json b/package-lock.json index 158d57dd..bf024723 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,16 @@ { "name": "archivebox", +<<<<<<< HEAD "version": "0.7.1", +======= + "version": "0.7.0", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "archivebox", +<<<<<<< HEAD "version": "0.7.1", "license": "MIT", "dependencies": { @@ -34,6 +39,36 @@ "node": ">=14.0.0" } }, +======= + "version": "0.7.0", + "license": "MIT", + "dependencies": { + "@postlight/mercury-parser": "git+https://github.com/postlight/mercury-parser.git", + "readability-extractor": "git+https://github.com/ArchiveBox/readability-extractor.git", + "single-file": "git+https://github.com/gildas-lormeau/SingleFile.git" + } + }, + "node_modules/@babel/runtime-corejs2": { + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.20.7.tgz", + "integrity": "sha512-SrtIxfjwLkUFljufH1GeqYlIYzdyxP2IoCb3tVjcrTdMyB7RQyRCdkyMzvw3k/h+CStnSf2SvvQicS1Rf/fuGQ==", + "dependencies": { + "core-js": "^2.6.12", + "regenerator-runtime": "^0.13.11" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@mozilla/readability": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.2.tgz", + "integrity": "sha512-48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw==", + "engines": { + "node": ">=10.0.0" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/@postlight/ci-failed-test-reporter": { "version": "1.0.26", "resolved": "https://registry.npmjs.org/@postlight/ci-failed-test-reporter/-/ci-failed-test-reporter-1.0.26.tgz", @@ -46,15 +81,26 @@ "ciftr": "cli.js" } }, +<<<<<<< HEAD "node_modules/@postlight/parser": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/@postlight/parser/-/parser-2.2.3.tgz", "integrity": "sha512-4/syRvqJARgLN4yH8qtl634WO0+KINjkijU/SmhCJqqh8/aOfv5uQf+SquFpA+JwsAsbGzYQkIxSum29riOreg==", +======= + "node_modules/@postlight/mercury-parser": { + "version": "2.2.1", + "resolved": "git+ssh://git@github.com/postlight/mercury-parser.git#9cd9662bcbfea00b773fad691a4f6e53394ff543", + "integrity": "sha512-nTyjg98Zpe2anZVjl16QzC3b9nThISzhzw59aoRMCW7gqjDb8VFU1bXrFlt9dEkxxey1ysuJ109hdCJI17TVVg==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "bundleDependencies": [ "jquery", "moment-timezone", "browser-request" ], +<<<<<<< HEAD +======= + "license": "MIT", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "dependencies": { "@babel/runtime-corejs2": "^7.2.0", "@postlight/ci-failed-test-reporter": "^1.0", @@ -75,13 +121,18 @@ "yargs-parser": "^15.0.1" }, "bin": { +<<<<<<< HEAD "mercury-parser": "cli.js", "postlight-parser": "cli.js" +======= + "mercury-parser": "cli.js" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "engines": { "node": ">=10" } }, +<<<<<<< HEAD "node_modules/@postlight/parser/node_modules/browser-request": { "version": "0.3.2", "engines": [ @@ -107,14 +158,28 @@ }, "node_modules/@postlight/parser/node_modules/moment": { "version": "2.29.4", +======= + "node_modules/@postlight/mercury-parser/node_modules/jquery": { + "version": "3.4.1", + "inBundle": true, + "license": "MIT" + }, + "node_modules/@postlight/mercury-parser/node_modules/moment": { + "version": "2.23.0", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "inBundle": true, "license": "MIT", "engines": { "node": "*" } }, +<<<<<<< HEAD "node_modules/@postlight/parser/node_modules/moment-timezone": { "version": "0.5.37", +======= + "node_modules/@postlight/mercury-parser/node_modules/moment-timezone": { + "version": "0.5.26", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "inBundle": true, "license": "MIT", "dependencies": { @@ -124,11 +189,14 @@ "node": "*" } }, +<<<<<<< HEAD "node_modules/@postlight/parser/node_modules/next-line": { "version": "1.1.0", "inBundle": true, "license": "MIT" }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/@postman/form-data": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.1.tgz", @@ -142,6 +210,7 @@ "node": ">= 6" } }, +<<<<<<< HEAD "node_modules/@postman/tough-cookie": { "version": "4.1.3-postman.1", "resolved": "https://registry.npmjs.org/@postman/tough-cookie/-/tough-cookie-4.1.3-postman.1.tgz", @@ -156,6 +225,8 @@ "node": ">=6" } }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/@postman/tunnel-agent": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/@postman/tunnel-agent/-/tunnel-agent-0.6.3.tgz", @@ -167,6 +238,7 @@ "node": "*" } }, +<<<<<<< HEAD "node_modules/@puppeteer/browsers": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-1.7.1.tgz", @@ -240,6 +312,28 @@ "integrity": "sha512-Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA==", "optional": true, "dependencies": { +======= + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/node": { + "version": "18.11.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", + "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", + "optional": true + }, + "node_modules/@types/yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", + "optional": true, + "dependencies": { +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "@types/node": "*" } }, @@ -249,14 +343,21 @@ "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==" }, "node_modules/acorn": { +<<<<<<< HEAD "version": "8.11.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", +======= + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "bin": { "acorn": "bin/acorn" }, "engines": { "node": ">=0.4.0" +<<<<<<< HEAD } }, "node_modules/acorn-globals": { @@ -276,6 +377,38 @@ "node": ">=0.4.0" } }, +======= + } + }, + "node_modules/acorn-globals": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", + "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", + "dependencies": { + "acorn": "^6.0.1", + "acorn-walk": "^6.0.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", + "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==", + "engines": { + "node": ">=0.4.0" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/agent-base": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", @@ -324,6 +457,14 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, +<<<<<<< HEAD +======= + "node_modules/array-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "integrity": "sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==" + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/asn1": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", @@ -340,6 +481,7 @@ "node": ">=0.8" } }, +<<<<<<< HEAD "node_modules/ast-types": { "version": "0.13.4", "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", @@ -350,6 +492,12 @@ "engines": { "node": ">=4" } +======= + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "node_modules/asynckit": { "version": "0.4.0", @@ -369,11 +517,14 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==" }, +<<<<<<< HEAD "node_modules/b4a": { "version": "1.6.4", "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz", "integrity": "sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==" }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -398,6 +549,7 @@ } ] }, +<<<<<<< HEAD "node_modules/basic-ftp": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz", @@ -406,6 +558,8 @@ "node": ">=10.0.0" } }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", @@ -414,6 +568,19 @@ "tweetnacl": "^0.14.3" } }, +<<<<<<< HEAD +======= + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/bluebird": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", @@ -441,6 +608,25 @@ "base64-js": "^1.1.2" } }, +<<<<<<< HEAD +======= + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" + }, + "node_modules/browser-request": { + "version": "0.3.2", + "resolved": "git+ssh://git@github.com/postlight/browser-request.git#38faa5b85741aabfca61aa37d1ef044d68969ddf", + "integrity": "sha512-TOvTWJ0BrWcB8Ach1AvdSBuczm2fsJdBlmo8D4N8fei7xfboW9VEk67zfriCiBo3/19Xe1waSstCEcLFUeBCjA==", + "engines": [ + "node" + ], + "dependencies": { + "http-headers": "^3.0.1" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -511,6 +697,7 @@ "node": ">= 0.6" } }, +<<<<<<< HEAD "node_modules/chromium-bidi": { "version": "0.4.26", "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.26.tgz", @@ -526,6 +713,17 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", +======= + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -579,6 +777,7 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==" }, +<<<<<<< HEAD "node_modules/cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", @@ -587,6 +786,8 @@ "node-fetch": "^2.6.12" } }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", @@ -604,6 +805,7 @@ "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", "engines": { "node": "*" +<<<<<<< HEAD } }, "node_modules/cssstyle": { @@ -617,6 +819,23 @@ "node": ">=14" } }, +======= + } + }, + "node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + }, + "node_modules/cssstyle": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz", + "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==", + "dependencies": { + "cssom": "0.3.x" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -626,6 +845,7 @@ }, "engines": { "node": ">=0.10" +<<<<<<< HEAD } }, "node_modules/data-uri-to-buffer": { @@ -670,6 +890,41 @@ }, "engines": { "node": ">=14" +======= + } + }, + "node_modules/data-urls": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", + "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "dependencies": { + "abab": "^2.0.0", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0" + } + }, + "node_modules/data-urls/node_modules/tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/data-urls/node_modules/webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" + }, + "node_modules/data-urls/node_modules/whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/debug": { @@ -701,6 +956,7 @@ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==" }, +<<<<<<< HEAD "node_modules/degenerator": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", @@ -713,6 +969,12 @@ "engines": { "node": ">= 14" } +======= + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "node_modules/delayed-stream": { "version": "1.0.0", @@ -723,13 +985,23 @@ } }, "node_modules/devtools-protocol": { +<<<<<<< HEAD "version": "0.0.1159816", "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1159816.tgz", "integrity": "sha512-2cZlHxC5IlgkIWe2pSDmCrDiTzbSJWywjbDDnupOImEBcG31CQgBLV8wWE+5t+C4rimcjHsbzy7CBzf9oFjboA==" +======= + "version": "0.0.818844", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz", + "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "node_modules/difflib": { "version": "0.2.6", "resolved": "git+ssh://git@github.com/postlight/difflib.js.git#32e8e38c7fcd935241b9baab71bb432fd9b166ed", +<<<<<<< HEAD +======= + "integrity": "sha512-uFNs7czGYLWdMP22WQhD/vlFen/CuKzC+KiajNCj+ik2Ah/I9i2AFyMWkBjFgbVFGhv95kBHOtx7tgF6IVngqA==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "dependencies": { "heap": ">= 0.2.0" } @@ -749,6 +1021,7 @@ "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" }, "node_modules/domexception": { +<<<<<<< HEAD "version": "4.0.0", "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", @@ -759,6 +1032,20 @@ "node": ">=12" } }, +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", + "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", + "dependencies": { + "webidl-conversions": "^4.0.2" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/domhandler": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", @@ -767,6 +1054,7 @@ "domelementtype": "1" } }, +<<<<<<< HEAD "node_modules/domino": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz", @@ -777,6 +1065,13 @@ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz", "integrity": "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==" }, +======= + "node_modules/dompurify": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz", + "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ==" + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/domutils": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", @@ -835,6 +1130,7 @@ } }, "node_modules/escodegen": { +<<<<<<< HEAD "version": "2.1.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", @@ -842,13 +1138,27 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2" +======= + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "bin": { "escodegen": "bin/escodegen.js", "esgenerate": "bin/esgenerate.js" }, "engines": { +<<<<<<< HEAD "node": ">=6.0" +======= + "node": ">=4.0" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "optionalDependencies": { "source-map": "~0.6.1" @@ -867,9 +1177,15 @@ } }, "node_modules/estraverse": { +<<<<<<< HEAD "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", +======= + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "engines": { "node": ">=4.0" } @@ -919,16 +1235,27 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, +<<<<<<< HEAD "node_modules/fast-fifo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==" }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, +<<<<<<< HEAD +======= + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/fd-slicer": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", @@ -943,6 +1270,21 @@ "integrity": "sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA==", "engines": { "node": ">=8" +<<<<<<< HEAD +======= + } + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/forever-agent": { @@ -951,6 +1293,7 @@ "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", "engines": { "node": "*" +<<<<<<< HEAD } }, "node_modules/form-data": { @@ -987,6 +1330,28 @@ "node": ">= 4.0.0" } }, +======= + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1014,6 +1379,7 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +<<<<<<< HEAD "node_modules/get-uri": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.2.tgz", @@ -1028,6 +1394,8 @@ "node": ">= 14" } }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -1055,11 +1423,14 @@ "url": "https://github.com/sponsors/isaacs" } }, +<<<<<<< HEAD "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -1087,6 +1458,7 @@ "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==" }, "node_modules/html-encoding-sniffer": { +<<<<<<< HEAD "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", @@ -1095,6 +1467,13 @@ }, "engines": { "node": ">=12" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", + "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", + "dependencies": { + "whatwg-encoding": "^1.0.1" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/htmlparser2": { @@ -1110,12 +1489,29 @@ "readable-stream": "^3.1.1" } }, +<<<<<<< HEAD "node_modules/http-proxy-agent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dependencies": { "@tootallnate/once": "2", +======= + "node_modules/http-headers": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/http-headers/-/http-headers-3.0.2.tgz", + "integrity": "sha512-87E1I+2Wg4dxxz4rcxElo3dxO/w1ZtgL1yA0Sb6vH3qU16vRKq1NjWQv9SCY3ly2OQROcoxHZOUpmelS+k6wOw==", + "dependencies": { + "next-line": "^1.1.0" + } + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dependencies": { + "@tootallnate/once": "1", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "agent-base": "6", "debug": "4" }, @@ -1197,11 +1593,14 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, +<<<<<<< HEAD "node_modules/ip": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -1230,12 +1629,21 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==" }, +<<<<<<< HEAD +======= + "node_modules/jquery": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==" }, "node_modules/jsdom": { +<<<<<<< HEAD "version": "21.1.2", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-21.1.2.tgz", "integrity": "sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ==", @@ -1300,6 +1708,61 @@ }, "engines": { "node": ">=14" +======= + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz", + "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==", + "dependencies": { + "abab": "^2.0.0", + "acorn": "^5.5.3", + "acorn-globals": "^4.1.0", + "array-equal": "^1.0.0", + "cssom": ">= 0.3.2 < 0.4.0", + "cssstyle": "^1.0.0", + "data-urls": "^1.0.0", + "domexception": "^1.0.1", + "escodegen": "^1.9.1", + "html-encoding-sniffer": "^1.0.2", + "left-pad": "^1.3.0", + "nwsapi": "^2.0.7", + "parse5": "4.0.0", + "pn": "^1.1.0", + "request": "^2.87.0", + "request-promise-native": "^1.0.5", + "sax": "^1.2.4", + "symbol-tree": "^3.2.2", + "tough-cookie": "^2.3.4", + "w3c-hr-time": "^1.0.1", + "webidl-conversions": "^4.0.2", + "whatwg-encoding": "^1.0.3", + "whatwg-mimetype": "^2.1.0", + "whatwg-url": "^6.4.1", + "ws": "^5.2.0", + "xml-name-validator": "^3.0.0" + } + }, + "node_modules/jsdom/node_modules/tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/jsdom/node_modules/webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" + }, + "node_modules/jsdom/node_modules/whatwg-url": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", + "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/json-schema": { @@ -1317,6 +1780,7 @@ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==" }, +<<<<<<< HEAD "node_modules/jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -1325,6 +1789,8 @@ "graceful-fs": "^4.1.6" } }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/jsprim": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz", @@ -1348,6 +1814,7 @@ "pako": "~1.0.2", "readable-stream": "~2.3.6", "setimmediate": "^1.0.5" +<<<<<<< HEAD } }, "node_modules/jszip/node_modules/readable-stream": { @@ -1364,10 +1831,29 @@ "util-deprecate": "~1.0.1" } }, +======= + } + }, + "node_modules/jszip/node_modules/readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/jszip/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" +<<<<<<< HEAD }, "node_modules/jszip/node_modules/string_decoder": { "version": "1.1.1", @@ -1375,6 +1861,33 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dependencies": { "safe-buffer": "~5.1.0" +======= + }, + "node_modules/jszip/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/left-pad": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", + "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", + "deprecated": "use String.prototype.padStart()" + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/lie": { @@ -1385,6 +1898,20 @@ "immediate": "~3.0.5" } }, +<<<<<<< HEAD +======= + "node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -1450,6 +1977,7 @@ "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", "integrity": "sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==" }, +<<<<<<< HEAD "node_modules/lru-cache": { "version": "7.18.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", @@ -1457,6 +1985,12 @@ "engines": { "node": ">=12" } +======= + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "node_modules/mime-db": { "version": "1.52.0", @@ -1488,26 +2022,55 @@ "node": "*" } }, +<<<<<<< HEAD "node_modules/mitt": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, +<<<<<<< HEAD +======= + "node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "engines": { + "node": "*" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/moment-parseformat": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/moment-parseformat/-/moment-parseformat-3.0.0.tgz", "integrity": "sha512-dVgXe6b6DLnv4CHG7a1zUe5mSXaIZ3c6lSHm/EKeVeQI2/4pwe0VRde8OyoCE1Ro2lKT5P6uT9JElF7KDLV+jw==" }, +<<<<<<< HEAD +======= + "node_modules/moment-timezone": { + "version": "0.5.26", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz", + "integrity": "sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==", + "dependencies": { + "moment": ">= 2.9.0" + }, + "engines": { + "node": "*" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, +<<<<<<< HEAD "node_modules/netmask": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", @@ -1535,6 +2098,32 @@ } } }, +======= + "node_modules/next-line": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz", + "integrity": "sha512-+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ==" + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/nth-check": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", @@ -1544,9 +2133,15 @@ } }, "node_modules/nwsapi": { +<<<<<<< HEAD "version": "2.2.7", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==" +======= + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz", + "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "node_modules/oauth-sign": { "version": "0.9.0", @@ -1564,6 +2159,7 @@ "wrappy": "1" } }, +<<<<<<< HEAD "node_modules/pac-proxy-agent": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz", @@ -1630,12 +2226,72 @@ "node": ">= 14" } }, +======= + "node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "engines": { + "node": ">=6" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" }, "node_modules/parse5": { +<<<<<<< HEAD "version": "7.1.2", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", @@ -1655,6 +2311,18 @@ }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" +======= + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", + "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==" + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "engines": { + "node": ">=8" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/path-is-absolute": { @@ -1675,10 +2343,33 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" }, +<<<<<<< HEAD "node_modules/postman-request": { "version": "2.88.1-postman.33", "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.33.tgz", "integrity": "sha512-uL9sCML4gPH6Z4hreDWbeinKU0p0Ke261nU7OvII95NU22HN6Dk7T/SaVPaj6T4TsQqGKIFw6/woLZnH7ugFNA==", +======= + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", + "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==" + }, + "node_modules/postman-request": { + "version": "2.88.1-postman.31", + "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.31.tgz", + "integrity": "sha512-OJbYqP7ItxQ84yHyuNpDywCZB0HYbpHJisMQ9lb1cSL3N5H3Td6a2+3l/a74UMd3u82BiGC5yQyYmdOIETP/nQ==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "dependencies": { "@postman/form-data": "~3.1.1", "@postman/tough-cookie": "~4.1.3-postman.1", @@ -1701,12 +2392,28 @@ "qs": "~6.5.3", "safe-buffer": "^5.1.2", "stream-length": "^1.0.2", +<<<<<<< HEAD "uuid": "^8.3.2" +======= + "tough-cookie": "~2.5.0", + "uuid": "^3.3.2" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "engines": { "node": ">= 6" } }, +<<<<<<< HEAD +======= + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "engines": { + "node": ">= 0.8.0" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -1720,6 +2427,7 @@ "node": ">=0.4.0" } }, +<<<<<<< HEAD "node_modules/proxy-agent": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.1.tgz", @@ -1773,6 +2481,8 @@ "node": ">= 14" } }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", @@ -1793,14 +2503,21 @@ } }, "node_modules/punycode": { +<<<<<<< HEAD "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", +======= + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "engines": { "node": ">=6" } }, "node_modules/puppeteer-core": { +<<<<<<< HEAD "version": "21.2.1", "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-21.2.1.tgz", "integrity": "sha512-+I8EjpWFeeFKScpQiTEnC4jGve2Wr4eA9qUMoa8S317DJPm9h7wzrT4YednZK2TQZMyPtPQ2Disb/Tg02+4Naw==", @@ -1826,6 +2543,59 @@ "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" +======= + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-5.5.0.tgz", + "integrity": "sha512-tlA+1n+ziW/Db03hVV+bAecDKse8ihFRXYiEypBe9IlLRvOCzYFG6qrCMBYK34HO/Q/Ecjc+tvkHRAfLVH+NgQ==", + "dependencies": { + "debug": "^4.1.0", + "devtools-protocol": "0.0.818844", + "extract-zip": "^2.0.0", + "https-proxy-agent": "^4.0.0", + "node-fetch": "^2.6.1", + "pkg-dir": "^4.2.0", + "progress": "^2.0.1", + "proxy-from-env": "^1.0.0", + "rimraf": "^3.0.2", + "tar-fs": "^2.0.0", + "unbzip2-stream": "^1.3.3", + "ws": "^7.2.3" + }, + "engines": { + "node": ">=10.18.1" + } + }, + "node_modules/puppeteer-core/node_modules/agent-base": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", + "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/puppeteer-core/node_modules/https-proxy-agent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", + "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", + "dependencies": { + "agent-base": "5", + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/puppeteer-core/node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "peerDependenciesMeta": { "bufferutil": { @@ -1844,11 +2614,24 @@ "node": ">=0.6" } }, +<<<<<<< HEAD +======= + "node_modules/querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "engines": { + "node": ">=0.4.x" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/querystringify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" }, +<<<<<<< HEAD "node_modules/queue-tick": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", @@ -1871,20 +2654,425 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", +======= + "node_modules/readability-extractor": { + "version": "0.0.2", + "resolved": "git+ssh://git@github.com/ArchiveBox/readability-extractor.git#42b243843c724a5d7a6b364d23985ff6acaeb55a", + "integrity": "sha512-B+oZuG4FwPYg5hxEafuhrwNOS8uiv/gYKlLKbIaeXXHlyznARYOqHpkHumiLMU6vkbZ3VAC7WucnWwh5jVOaBQ==", + "license": "MIT", + "dependencies": { + "@mozilla/readability": "^0.4.1", + "dompurify": "^2.2.7", + "jsdom": "^16.5.2" + }, + "bin": { + "readability-extractor": "readability-extractor" + } + }, + "node_modules/readability-extractor/node_modules/acorn": { + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", + "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/readability-extractor/node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/readability-extractor/node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/readability-extractor/node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/readability-extractor/node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "node_modules/readability-extractor/node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/readability-extractor/node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + }, + "node_modules/readability-extractor/node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/readability-extractor/node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/readability-extractor/node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/readability-extractor/node_modules/escodegen": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/readability-extractor/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/readability-extractor/node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readability-extractor/node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/readability-extractor/node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/readability-extractor/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "node_modules/readability-extractor/node_modules/tough-cookie": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", + "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/readability-extractor/node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/readability-extractor/node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/readability-extractor/node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/readability-extractor/node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" +<<<<<<< HEAD +======= }, "engines": { "node": ">= 6" } }, + "node_modules/regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) + }, + "engines": { + "node": ">= 6" + } + }, +<<<<<<< HEAD "node_modules/regenerator-runtime": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" }, +======= + "node_modules/request-promise": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz", + "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==", + "deprecated": "request-promise has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", + "dependencies": { + "bluebird": "^3.5.0", + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "engines": { + "node": ">=0.10.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dependencies": { + "lodash": "^4.17.19" + }, + "engines": { + "node": ">=0.10.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", + "dependencies": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "engines": { + "node": ">=0.12.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise/node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "node_modules/request/node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/request/node_modules/jsprim": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.4.0", + "verror": "1.10.0" + }, + "engines": { + "node": ">=0.6.0" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -1912,11 +3100,14 @@ "url": "https://github.com/sponsors/isaacs" } }, +<<<<<<< HEAD "node_modules/rrweb-cssom": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==" }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1941,14 +3132,27 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, +<<<<<<< HEAD "node_modules/saxes": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", +======= + "node_modules/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "dependencies": { "xmlchars": "^2.2.0" }, "engines": { +<<<<<<< HEAD "node": ">=v12.22.7" } }, @@ -1963,6 +3167,33 @@ }, "engines": { "node": ">= 14.20.0" +======= + "node": ">=10" + } + }, + "node_modules/selenium-webdriver": { + "version": "4.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.7.tgz", + "integrity": "sha512-D4qnTsyTr91jT8f7MfN+OwY0IlU5+5FmlO5xlgRUV6hDEV8JyYx2NerdTEqDDkNq7RZDYc4VoPALk8l578RBHw==", + "dependencies": { + "jszip": "^3.2.2", + "rimraf": "^2.7.1", + "tmp": "0.0.30" + }, + "engines": { + "node": ">= 10.15.0" + } + }, + "node_modules/selenium-webdriver/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/setimmediate": { @@ -1970,6 +3201,7 @@ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" }, +<<<<<<< HEAD "node_modules/single-file-cli": { "version": "1.1.18", "resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.1.18.tgz", @@ -1989,6 +3221,172 @@ } }, "node_modules/single-file-cli/node_modules/iconv-lite": { +======= + "node_modules/single-file": { + "version": "0.3.16", + "resolved": "git+ssh://git@github.com/gildas-lormeau/SingleFile.git#ec9dbc7c2272bff0dc2415a44d6cdfb2b48aa7d2", + "integrity": "sha512-NwwtloJdZlPG2zKrTAlcPRowIcwQx+1U39wcyPnfsbpVZKi6FAyLpo+CV0/xVJmvdOO0DSTvimuZtnc8/gJfTw==", + "license": "AGPL-3.0-or-later", + "dependencies": { + "file-url": "^3.0.0", + "iconv-lite": "^0.6.2", + "jsdom": "^16.4.0", + "puppeteer-core": "^5.3.0", + "selenium-webdriver": "4.0.0-alpha.7", + "strong-data-uri": "^1.0.6", + "yargs": "^16.2.0" + }, + "bin": { + "single-file": "cli/single-file" + } + }, + "node_modules/single-file/node_modules/acorn": { + "version": "8.8.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", + "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/single-file/node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/single-file/node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/single-file/node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/single-file/node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "node_modules/single-file/node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/single-file/node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + }, + "node_modules/single-file/node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/single-file/node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/single-file/node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/single-file/node_modules/escodegen": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/single-file/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/single-file/node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/single-file/node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/single-file/node_modules/iconv-lite": { +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", @@ -1999,6 +3397,7 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD "node_modules/single-file-cli/node_modules/jsdom": { "version": "22.1.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", @@ -2030,6 +3429,43 @@ }, "engines": { "node": ">=16" +======= + "node_modules/single-file/node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "peerDependencies": { "canvas": "^2.5.0" @@ -2040,6 +3476,7 @@ } } }, +<<<<<<< HEAD "node_modules/single-file-cli/node_modules/tr46": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", @@ -2119,6 +3556,79 @@ "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" }, +======= + "node_modules/single-file/node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "node_modules/single-file/node_modules/tough-cookie": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", + "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/single-file/node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/single-file/node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/single-file/node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/single-file/node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -2129,9 +3639,15 @@ } }, "node_modules/sshpk": { +<<<<<<< HEAD "version": "1.18.0", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz", "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==", +======= + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", + "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "dependencies": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -2152,6 +3668,17 @@ "node": ">=0.10.0" } }, +<<<<<<< HEAD +======= + "node_modules/stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==", + "engines": { + "node": ">=0.10.0" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/stream-length": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz", @@ -2160,6 +3687,7 @@ "bluebird": "^2.6.2" } }, +<<<<<<< HEAD "node_modules/streamx": { "version": "2.15.2", "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.2.tgz", @@ -2169,6 +3697,8 @@ "queue-tick": "^1.0.1" } }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -2223,16 +3753,25 @@ "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "node_modules/tar-fs": { +<<<<<<< HEAD "version": "3.0.4", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz", "integrity": "sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==", "dependencies": { +======= + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "dependencies": { + "chownr": "^1.1.1", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", "tar-stream": "^3.1.5" } }, "node_modules/tar-stream": { +<<<<<<< HEAD "version": "3.1.6", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.6.tgz", "integrity": "sha512-B/UyjYwPpMBv+PaFSWAmtYjwdrlEaZQEhMIBFNC5oEG8lpiW8XjcSdmEaClj28ArfKScKHs2nshz3k2le6crsg==", @@ -2240,6 +3779,20 @@ "b4a": "^1.6.4", "fast-fifo": "^1.2.0", "streamx": "^2.15.0" +======= + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/through": { @@ -2248,6 +3801,7 @@ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "node_modules/tmp": { +<<<<<<< HEAD "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", @@ -2270,6 +3824,28 @@ }, "engines": { "node": ">=6" +======= + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", + "integrity": "sha512-HXdTB7lvMwcb55XFfrTM8CPr/IYREk4hVBFaQ4b/6nInrluSL86hfHm7vu0luYKCfyBZp2trCjpc8caC3vVM3w==", + "dependencies": { + "os-tmpdir": "~1.0.1" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/tr46": { @@ -2283,6 +3859,7 @@ "integrity": "sha512-em3E3SUDONOjTBcZ36DTm3RvDded3IRU9rX32oHwwXNt3rJD5MVaFlJTQvs8tJoHRoeYP36OuQ1eL/Q7bNEWIQ==", "engines": { "node": "*" +<<<<<<< HEAD } }, "node_modules/tslib": { @@ -2296,6 +3873,27 @@ "integrity": "sha512-ntI9R7fcUKjqBP6QU8rBK2Ehyt8LAzt3UBT9JR9tgo6GtuKvyUzpayWmeMKJw1DPdXzktvtIT8m2mVXz+bL/Qg==", "dependencies": { "domino": "^2.1.6" +======= + } + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/turndown": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/turndown/-/turndown-5.0.3.tgz", + "integrity": "sha512-popfGXEiedpq6F5saRIAThKxq/bbEPVFnsDnUdjaDGIre9f3/OL9Yi/yPbPcZ7RYUDpekghr666bBfZPrwNnhQ==", + "dependencies": { + "jsdom": "^11.9.0" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/tweetnacl": { @@ -2303,6 +3901,20 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==" }, +<<<<<<< HEAD +======= + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/unbzip2-stream": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", @@ -2312,12 +3924,15 @@ "through": "^2.3.8" } }, +<<<<<<< HEAD "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "optional": true }, +======= +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/universalify": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", @@ -2334,6 +3949,18 @@ "punycode": "^2.1.0" } }, +<<<<<<< HEAD +======= + "node_modules/url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "dependencies": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/url-parse": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", @@ -2343,17 +3970,34 @@ "requires-port": "^1.0.0" } }, +<<<<<<< HEAD +======= + "node_modules/url/node_modules/punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/uuid": { +<<<<<<< HEAD "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "bin": { "uuid": "dist/bin/uuid" +======= + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "bin": { + "uuid": "bin/uuid" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/valid-url": { @@ -2374,6 +4018,7 @@ "extsprintf": "^1.2.0" } }, +<<<<<<< HEAD "node_modules/w3c-xmlserializer": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", @@ -2423,6 +4068,57 @@ "node": ">=12" } }, +======= + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" + }, +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", @@ -2432,10 +4128,20 @@ "webidl-conversions": "^3.0.0" } }, +<<<<<<< HEAD "node_modules/whatwg-url/node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" +======= + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "engines": { + "node": ">=0.10.0" + } +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "node_modules/wrap-ansi": { "version": "7.0.0", @@ -2459,6 +4165,7 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { +<<<<<<< HEAD "version": "8.14.2", "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", @@ -2476,6 +4183,13 @@ "utf-8-validate": { "optional": true } +======= + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz", + "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==", + "dependencies": { + "async-limiter": "~1.0.0" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/wuzzy": { @@ -2487,12 +4201,18 @@ } }, "node_modules/xml-name-validator": { +<<<<<<< HEAD "version": "4.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", "engines": { "node": ">=12" } +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) }, "node_modules/xmlchars": { "version": "2.2.0", @@ -2508,11 +4228,19 @@ } }, "node_modules/yargs": { +<<<<<<< HEAD "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dependencies": { "cliui": "^8.0.1", +======= + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dependencies": { + "cliui": "^7.0.2", +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", @@ -2521,7 +4249,11 @@ "yargs-parser": "^21.1.1" }, "engines": { +<<<<<<< HEAD "node": ">=12" +======= + "node": ">=10" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/yargs-parser": { @@ -2534,11 +4266,19 @@ } }, "node_modules/yargs/node_modules/yargs-parser": { +<<<<<<< HEAD "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "engines": { "node": ">=12" +======= + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "engines": { + "node": ">=10" +>>>>>>> 46b944b (wip pre-0.7.1 side fixes) } }, "node_modules/yauzl": { diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..0dfcb530cce8a021b84e63f3290c4c2fa363b4bf GIT binary patch literal 42845 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 F{sr?|$4meK literal 0 HcmV?d00001 From 277364ab61fd901070d4907c661a60ad8fe5edae Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 14 Nov 2023 02:29:18 -0800 Subject: [PATCH 05/10] remove extra files --- .vscode/settings.json | 3 --- screenshot.png | Bin 42845 -> 0 bytes 2 files changed, 3 deletions(-) delete mode 100644 .vscode/settings.json delete mode 100644 screenshot.png diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 163c9840..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.formatting.provider": "black" -} diff --git a/screenshot.png b/screenshot.png deleted file mode 100644 index 0dfcb530cce8a021b84e63f3290c4c2fa363b4bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42845 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 F{sr?|$4meK From f5c2cfcfe231f9d42c502e74f17e9d521ffe4b26 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 14 Nov 2023 02:30:59 -0800 Subject: [PATCH 06/10] dont alert on statics --- archivebox/templates/admin/private_index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/archivebox/templates/admin/private_index.html b/archivebox/templates/admin/private_index.html index a95a7716..b60f3a3e 100644 --- a/archivebox/templates/admin/private_index.html +++ b/archivebox/templates/admin/private_index.html @@ -88,5 +88,4 @@ {% endblock %} - {% endblock %} From 7d068364438c039a3bbf1f86bcb36ed6498f4599 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Mon, 18 Dec 2023 19:24:18 -0800 Subject: [PATCH 07/10] add WIP comment --- archivebox/core/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py index ce4612a7..50319804 100644 --- a/archivebox/core/admin.py +++ b/archivebox/core/admin.py @@ -48,6 +48,7 @@ class TagInline(admin.TabularInline): from django.contrib.admin.helpers import ActionForm from django.contrib.admin.widgets import AutocompleteSelectMultiple +# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration # class AutocompleteTags: # model = Tag # search_fields = ['name'] From 7d5a7f80ca8f6da7419aa6646a90c836142519b6 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Mon, 18 Dec 2023 19:24:48 -0800 Subject: [PATCH 08/10] Update admin.py --- archivebox/core/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py index 50319804..e2104e83 100644 --- a/archivebox/core/admin.py +++ b/archivebox/core/admin.py @@ -62,6 +62,7 @@ class SnapshotActionForm(ActionForm): tags = forms.ModelMultipleChoiceField( queryset=Tag.objects.all(), required=False, + # WIP: commented out because broken by Django 3.1.2 -> 4.0 migration # widget=AutocompleteSelectMultiple( # # AutocompleteTags(), # # AutocompleteTagsAdminStub(), From 5805e18380ef51521b9d03d752fd087c3d48ea9f Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Mon, 18 Dec 2023 19:25:08 -0800 Subject: [PATCH 09/10] Update settings.py --- archivebox/core/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py index 8334c39b..6a52641d 100644 --- a/archivebox/core/settings.py +++ b/archivebox/core/settings.py @@ -268,6 +268,7 @@ AUTH_PASSWORD_VALIDATORS = [ {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'}, ] +# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration # DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField' ################################################################################ From 487e560e321c595a2e3f428e3665acf00e0a0aac Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Mon, 18 Dec 2023 19:27:52 -0800 Subject: [PATCH 10/10] Update config.py to use fallback git head method --- archivebox/config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/archivebox/config.py b/archivebox/config.py index 90186b1c..1716036f 100644 --- a/archivebox/config.py +++ b/archivebox/config.py @@ -398,7 +398,14 @@ def get_commit_hash(config) -> Optional[str]: commit_hash = git_dir.joinpath(ref).read_text().strip() return commit_hash except Exception: - return None + pass + + try: + return list((config['PACKAGE_DIR'] / '../.git/refs/heads/').glob('*'))[0].read_text().strip() + except Exception: + pass + + return None def get_build_time(config) -> str: if config['IN_DOCKER']: