From 563718ed51056d14feb0605effae5ee9d83108df Mon Sep 17 00:00:00 2001
From: Preston Maness <preston@debian-BULLSEYE-live-builder-AMD64>
Date: Thu, 31 Aug 2023 20:28:05 -0500
Subject: [PATCH] Revert "Temporary fork while working on new providers"

This reverts commit ba62125b18e386b99dee5626e7160d82698b2503.

Accidentally committed this on the wrong branch.
---
 nodemon.json |  3 +--
 package.json |  8 ++++----
 yarn.lock    | 48 ++++++++++++++++++++++++------------------------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/nodemon.json b/nodemon.json
index 54320a5..ade96d8 100644
--- a/nodemon.json
+++ b/nodemon.json
@@ -1,7 +1,6 @@
 {
     "execArgs": [
-        "--experimental-fetch",
-        "--preserve-symlinks"
+        "--experimental-fetch"
     ],
     "env": {
         "NODE_ENV": "development"
diff --git a/package.json b/package.json
index aa46e80..0acc5e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@aspensmonster/keyoxide-web",
-  "version": "3.7.0",
+  "name": "keyoxide-web",
+  "version": "3.6.4",
   "description": "Verifying online identity with cryptography",
   "main": "./src/index.js",
   "type": "module",
@@ -9,7 +9,7 @@
     "bent": "^7.3.12",
     "body-parser": "^1.19.0",
     "dialog-polyfill": "^0.5.6",
-    "@aspensmonster/doipjs": "^1.0.1",
+    "doipjs": "^1.0.0",
     "dotenv": "^16.0.3",
     "express": "^4.17.1",
     "express-validator": "^6.13.0",
@@ -43,7 +43,7 @@
     "webpack-cli": "^5.0.0"
   },
   "scripts": {
-    "start": "node --experimental-fetch --preserve-symlinks ./",
+    "start": "node --experimental-fetch ./",
     "dev": "LOG_LEVEL=debug yarn run watch & yarn run build:static:dev",
     "test": "yarn run lint && mocha --loader=esmock",
     "watch": "./node_modules/.bin/nodemon --config nodemon.json ./",
diff --git a/yarn.lock b/yarn.lock
index 0a4aefb..2844930 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,30 +15,6 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@aspensmonster/doipjs@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@aspensmonster/doipjs/-/doipjs-1.0.1.tgz#de8e033f67773f6614b40c5101db8f6af0bcc20b"
-  integrity sha512-HhcFrUGvpbLcFWIyeT3unz+sjhIHs9H3nbp/zO1upiN/J/Ipn2klLVtuXlkqWcOtyG8Sy+lcGn7VwWXOI4TG6g==
-  dependencies:
-    "@openpgp/hkp-client" "^0.0.3"
-    "@openpgp/wkd-client" "^0.0.4"
-    "@xmpp/client" "^0.13.1"
-    "@xmpp/debug" "^0.13.0"
-    axios "^0.25.0"
-    browser-or-node "^1.3.0"
-    cors "^2.8.5"
-    entities "^4.4.0"
-    express "^4.17.1"
-    express-validator "^6.10.0"
-    hash-wasm "^4.9.0"
-    irc-upd "^0.11.0"
-    jose "^4.14.4"
-    merge-options "^3.0.3"
-    openpgp "^5.5.0"
-    rfc4648 "^1.5.2"
-    valid-url "^1.0.9"
-    validator "^13.9.0"
-
 "@babel/cli@^7.16.0":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.22.6.tgz#63f5be2a0abd587ccfbdc93424fa85f43142cc53"
@@ -1854,6 +1830,30 @@ doctypes@^1.1.0:
   resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9"
   integrity sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==
 
+doipjs@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/doipjs/-/doipjs-1.0.0.tgz#cb0fe9f324a8c3cd3ddb0a4bec009c772f06ab1e"
+  integrity sha512-KUIbHBE5fdIose6mml9uf4rd5m7cz2g3929DPs1EZamHV/V0M8RgUhGC4u6QGYYHREDrG3fOj43V9RrCG4hv5A==
+  dependencies:
+    "@openpgp/hkp-client" "^0.0.3"
+    "@openpgp/wkd-client" "^0.0.4"
+    "@xmpp/client" "^0.13.1"
+    "@xmpp/debug" "^0.13.0"
+    axios "^0.25.0"
+    browser-or-node "^1.3.0"
+    cors "^2.8.5"
+    entities "^4.4.0"
+    express "^4.17.1"
+    express-validator "^6.10.0"
+    hash-wasm "^4.9.0"
+    irc-upd "^0.11.0"
+    jose "^4.14.4"
+    merge-options "^3.0.3"
+    openpgp "^5.5.0"
+    rfc4648 "^1.5.2"
+    valid-url "^1.0.9"
+    validator "^13.9.0"
+
 dotenv@^16.0.3:
   version "16.3.1"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"