From 6761ed368c75337d21f89c282bcbf982b081ad41 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 14 Nov 2023 02:04:49 -0800 Subject: [PATCH] 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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 OS?cNP=d#Wzp$P!