Tools: Fix website builder

packages/tools/package.json

@@ -23,8 +23,6 @@
     "@joplin/lib": "~2.11",
     "@joplin/renderer": "~2.11",
     "@joplin/utils": "~2.11",
-    "@types/node-fetch": "2.6.2",
-    "@types/yargs": "17.0.20",
     "dayjs": "1.11.7",
     "execa": "4.1.0",
     "fs-extra": "11.1.1",
@@ -49,6 +47,8 @@
     "@types/jest": "29.2.6",
     "@types/mustache": "4.2.2",
     "@types/node": "18.11.18",
+    "@types/node-fetch": "2.6.2",
+    "@types/yargs": "17.0.20",
     "gettext-extractor": "3.7.0",
     "gulp": "4.0.2",
     "html-entities": "1.4.0",

packages/utils/net.ts

@@ -1,6 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 
 import { sleep } from './time';
+import fetch from 'node-fetch';
 
 export const fetchWithRetry = async (url: string, opts: any = null) => {
 	if (!opts) opts = {};

packages/utils/package.json

@@ -19,10 +19,12 @@
   "author": "",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "execa": "5.1.1"
+    "execa": "5.1.1",
+    "node-fetch": "2.6.7"
   },
   "devDependencies": {
     "@types/jest": "29.5.0",
+    "@types/node-fetch": "2.6.2",
     "jest": "29.5.0",
     "ts-jest": "29.0.5"
   }

yarn.lock

@@ -5419,8 +5419,10 @@ __metadata:
   resolution: "@joplin/utils@workspace:packages/utils"
   dependencies:
     "@types/jest": 29.5.0
+    "@types/node-fetch": 2.6.2
     execa: 5.1.1
     jest: 29.5.0
+    node-fetch: 2.6.7
     ts-jest: 29.0.5
   languageName: unknown
   linkType: soft