From 7c8c8a754f3ff3f1a7a1ca9ca8a3d1783fb0e57a Mon Sep 17 00:00:00 2001 From: Samuel Elliott Date: Sat, 7 Jul 2018 18:53:16 +0100 Subject: [PATCH] Use request instead of axios --- client/src/modules/updater.js | 8 ++--- client/src/modules/vendor.js | 9 ++--- client/webpack.config.js | 8 ++++- client/webpack.production.config.js | 8 ++++- package-lock.json | 56 ++++++++++++++--------------- package.json | 2 +- 6 files changed, 48 insertions(+), 43 deletions(-) diff --git a/client/src/modules/updater.js b/client/src/modules/updater.js index c4967069..c9ac8810 100644 --- a/client/src/modules/updater.js +++ b/client/src/modules/updater.js @@ -10,8 +10,8 @@ import Events from './events'; import Globals from './globals'; -import { axios } from 'vendor'; import { ClientLogger as Logger } from 'common'; +import request from 'request-promise-native'; export default new class { @@ -63,11 +63,11 @@ export default new class { Logger.info('Updater', 'Checking for updates'); try { - const response = await axios.get('https://rawgit.com/JsSucks/BetterDiscordApp/master/package.json'); + const response = await request('https://rawgit.com/JsSucks/BetterDiscordApp/master/package.json'); - this.latestVersion = response.data.version; + this.latestVersion = response.version; Events.emit('update-check-end'); - Logger.info('Updater', `Latest Version: ${response.data.version} - Current Version: ${Globals.version}`); + Logger.info('Updater', `Latest Version: ${response.version} - Current Version: ${Globals.version}`); if (this.latestVersion !== Globals.version) { this.updatesAvailable = true; diff --git a/client/src/modules/vendor.js b/client/src/modules/vendor.js index 5150d0bd..efdf35c7 100644 --- a/client/src/modules/vendor.js +++ b/client/src/modules/vendor.js @@ -12,17 +12,14 @@ import jQuery from 'jquery'; import lodash from 'lodash'; import Vue from 'vue'; -import axios from 'axios'; -import axiosHttpAdapter from 'axios/lib/adapters/http'; - -axios.defaults.adapter = axiosHttpAdapter; +import request from 'request-promise-native'; import Combokeys from 'combokeys'; import filetype from 'file-type'; import filewatcher from 'filewatcher'; import VTooltip from 'v-tooltip'; -export { jQuery as $, axios }; +export { jQuery as $, request }; export default class { @@ -43,7 +40,7 @@ export default class { */ static get Vue() { return Vue } - static get axios() { return axios } + static get request() { return request } static get Combokeys() { return Combokeys } static get filetype() { return filetype } diff --git a/client/webpack.config.js b/client/webpack.config.js index e5f516d7..cddb13a0 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js @@ -31,6 +31,13 @@ module.exports = { loaders: [jsLoader, vueLoader, scssLoader] }, externals: { + electron: 'require("electron")', + fs: 'require("fs")', + path: 'require("path")', + util: 'require("util")', + process: 'require("process")', + net: 'require("net")', + request: 'require.main.require("request")', sparkplug: 'require("../../core/dist/sparkplug")' }, resolve: { @@ -47,7 +54,6 @@ module.exports = { path.resolve('src', 'builtin') ] }, - target: 'electron-renderer', node: { process: false, __filename: false, diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js index 7ae814f2..b0f1e944 100644 --- a/client/webpack.production.config.js +++ b/client/webpack.production.config.js @@ -32,6 +32,13 @@ module.exports = { loaders: [jsLoader, vueLoader, scssLoader] }, externals: { + electron: 'require("electron")', + fs: 'require("fs")', + path: 'require("path")', + util: 'require("util")', + process: 'require("process")', + net: 'require("net")', + request: 'require.main.require("request")', sparkplug: 'require("./sparkplug")' }, resolve: { @@ -48,7 +55,6 @@ module.exports = { path.resolve('src', 'builtin') ] }, - target: 'electron-renderer', node: { process: false, __filename: false, diff --git a/package-lock.json b/package-lock.json index 3da838fd..5b1204b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -725,16 +725,6 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" }, - "axios": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", - "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", - "dev": true, - "requires": { - "follow-redirects": "1.5.1", - "is-buffer": "1.1.6" - } - }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -4323,26 +4313,6 @@ } } }, - "follow-redirects": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.1.tgz", - "integrity": "sha512-v9GI1hpaqq1ZZR6pBD1+kI7O24PhDvNGNodjS3MdcEqyrahCp8zbtpv+2B/krUnSmUH80lbAS7MrdeK5IylgKg==", - "dev": true, - "requires": { - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -11223,6 +11193,26 @@ "uuid": "3.2.1" } }, + "request-promise-core": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz", + "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", + "dev": true, + "requires": { + "lodash": "4.17.10" + } + }, + "request-promise-native": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", + "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", + "dev": true, + "requires": { + "request-promise-core": "1.1.1", + "stealthy-require": "1.1.1", + "tough-cookie": "2.3.3" + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -12021,6 +12011,12 @@ } } }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "dev": true + }, "stream-browserify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", diff --git a/package.json b/package.json index a4b86c20..2ac60406 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,6 @@ }, "devDependencies": { "archiver": "^2.1.1", - "axios": "^0.18.0", "babel-core": "^6.26.3", "babel-loader": "^7.1.4", "babel-preset-env": "^1.7.0", @@ -54,6 +53,7 @@ "mkdirp": "^0.5.1", "node-gyp": "^3.7.0", "pump": "^3.0.0", + "request-promise-native": "^1.0.5", "sass-loader": "^6.0.7", "uglifyjs-webpack-plugin": "^1.2.7", "v-tooltip": "^2.0.0-rc.33",