diff --git a/package.json b/package.json index 82ed8df..e5d4d45 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,8 @@ "decompress-unzip": "^4.0.1", "dotenv": "^10.0.0", "intercept-stdout": "^0.1.2", - "isomorphic-fetch": "^3.0.0", "kleur": "^4.1.4", + "node-fetch": "^2.6.9", "portfinder": "^1.0.28", "progress-stream": "^2.0.0", "prompts": "^2.4.1", @@ -64,6 +64,7 @@ "eslint-plugin-import": "^2.24.2", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-react": "^7.26.1", + "eslint-plugin-react-hooks": "^4.6.0", "gramma": "^1.6.0", "husky": "^7.0.0", "jest": "^27.2.4", diff --git a/src/boot/prepareConfig.js b/src/boot/prepareConfig.js index 1c3d51c..b805bf0 100644 --- a/src/boot/prepareConfig.js +++ b/src/boot/prepareConfig.js @@ -79,7 +79,7 @@ const prepareConfig = (paths) => (argv) => { const globalConfig = prepareFileConfig(paths.globalConfigFile) const localConfig = prepareFileConfig(paths.localConfigFile) - if (localConfig && localConfig.api_url === "localhost") { + if (localConfig && localConfig.api_url === "0.0.0.0") { localConfig.api_url = "inherit" } diff --git a/src/cli.js b/src/cli.js index f2de462..b18af1f 100755 --- a/src/cli.js +++ b/src/cli.js @@ -1,6 +1,5 @@ #!/usr/bin/env node require("dotenv").config() -require("isomorphic-fetch") const yargs = require("yargs") const { version } = require("../package.json") diff --git a/src/index.js b/src/index.js index 58b55c2..4e700bf 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,3 @@ -require("isomorphic-fetch") - const check = require("./requests/checkViaAPI") const replaceAll = require("./text-manipulation/replaceAll") diff --git a/src/requests/checkViaAPI.js b/src/requests/checkViaAPI.js index a1b519d..8c34974 100644 --- a/src/requests/checkViaAPI.js +++ b/src/requests/checkViaAPI.js @@ -1,3 +1,4 @@ +const fetch = require("node-fetch") const queryString = require("query-string") const initialConfig = require("../initialConfig") // @ts-ignore diff --git a/src/requests/checkWithFallback.js b/src/requests/checkWithFallback.js index b4170ad..548d6b1 100644 --- a/src/requests/checkWithFallback.js +++ b/src/requests/checkWithFallback.js @@ -14,13 +14,13 @@ const checkWithFallback = async (text, cfg) => { response = await checkViaAPI(text, session) if ( - cfg.session.api_url.includes("localhost") && + cfg.session.api_url.includes("0.0.0.0") && cfg.session.server_once === "true" ) { await stopServer(cfg) } } catch (error) { - if (error.code === "ECONNREFUSED" || cfg.session.api_url === "localhost") { + if (error.code === "ECONNREFUSED" || cfg.session.api_url === "0.0.0.0") { if (global.server_path) { if (!session.markdown) { console.info(`Checking via local LanguageTool cmd...`) diff --git a/src/requests/updates.js b/src/requests/updates.js index 083343f..416efb5 100644 --- a/src/requests/updates.js +++ b/src/requests/updates.js @@ -1,6 +1,7 @@ const fs = require("fs") const path = require("path") const kleur = require("kleur") +const fetch = require("node-fetch") const { version } = require("../../package.json") const checkForUpdates = async (configDir) => { diff --git a/src/server/installServer.js b/src/server/installServer.js index e7e5ea2..ced7f25 100644 --- a/src/server/installServer.js +++ b/src/server/installServer.js @@ -41,7 +41,7 @@ const installServer = async (cfg) => { const serverPath = path.join(serverDir, unpackedDirName) configure("server_path", serverPath, cfg, true, true) - configure("api_url", "localhost", cfg, true, true) + configure("api_url", "0.0.0.0", cfg, true, true) console.log(kleur.green(`Server installed in: ${serverDir}`)) } diff --git a/src/server/startServer.js b/src/server/startServer.js index 5220cea..dee4584 100644 --- a/src/server/startServer.js +++ b/src/server/startServer.js @@ -3,6 +3,7 @@ const path = require("path") const kleur = require("kleur") const portfinder = require("portfinder") const tcpPortUsed = require("tcp-port-used") +const fetch = require("node-fetch") const configure = require("../actions/configure") const confirmPort = require("../prompts/confirmPort") @@ -73,7 +74,7 @@ const startServer = async (cfg, { port = null, viaCommand = false } = {}) => { }) // eslint-disable-next-line camelcase - const api_url = `http://localhost:${PORT}/v2/check` + const api_url = `http://0.0.0.0:${PORT}/v2/check` await pingServer(api_url) diff --git a/src/utils/downloadFile.js b/src/utils/downloadFile.js index 64496e3..1972e97 100644 --- a/src/utils/downloadFile.js +++ b/src/utils/downloadFile.js @@ -1,6 +1,7 @@ const fs = require("fs") const progressStream = require("progress-stream") const cliProgress = require("cli-progress") +const fetch = require("node-fetch") const toMegabytes = (bytes) => { return Number((bytes / (1000 * 1000)).toFixed(2)) diff --git a/src/utils/prepareMarkdown.js b/src/utils/prepareMarkdown.js index 0a7caa5..0e209eb 100644 --- a/src/utils/prepareMarkdown.js +++ b/src/utils/prepareMarkdown.js @@ -6023,7 +6023,7 @@ function urlToPath(path2) { function getPathFromURLPosix(url) { if (url.hostname !== "") { const error = new TypeError( - 'File URL host must be "localhost" or empty on darwin', + 'File URL host must be "0.0.0.0" or empty on darwin', ) error.code = "ERR_INVALID_FILE_URL_HOST" throw error