Skip to content

fix(request): Change axios lib for request #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
]
},
"devDependencies": {
"axios": "^0.17.1",
"babel-core": "^7.0.0-0",
"debug": "^3.1.0",
"eslint": "^4.16.0",
Expand All @@ -54,6 +53,8 @@
"lint-staged": "^6.0.1",
"memfs": "^2.6.0",
"puppeteer": "^1.0.0",
"request": "^2.83.0",
"request-promise-native": "^1.0.5",
"yorkie": "^1.0.2"
}
}
8 changes: 4 additions & 4 deletions packages/@vue/cli/lib/util/getVersions.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ module.exports = async function getVersions () {
// test/debug, use local version
latest = process.env.VUE_CLI_LATEST_VERSION = current
} else {
const axios = require('axios')
const request = require('./request')
const options = require('../options').loadOptions()
const registry = options.useTaobaoRegistry
? `https://registry.npm.taobao.org`
: `https://registry.npmjs.org`

const res = await axios.get(`${registry}/vue-cli-version-marker/latest`)
if (res.status === 200) {
latest = process.env.VUE_CLI_LATEST_VERSION = res.data.version
const res = await request.get(`${registry}/vue-cli-version-marker/latest`)
if (res.statusCode === 200) {
latest = process.env.VUE_CLI_LATEST_VERSION = res.body.version
} else {
// fallback to local version
latest = process.env.VUE_CLI_LATEST_VERSION = current
Expand Down
4 changes: 2 additions & 2 deletions packages/@vue/cli/lib/util/installDeps.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const axios = require('axios')
const request = require('./request')
const chalk = require('chalk')
const execa = require('execa')
const readline = require('readline')
Expand All @@ -16,7 +16,7 @@ const registries = {
const taobaoDistURL = 'https://npm.taobao.org/dist'

async function ping (registry) {
await axios.get(`${registry}/vue-cli-version-marker/latest`)
await request.get(`${registry}/vue-cli-version-marker/latest`)
return registry
}

Expand Down
14 changes: 14 additions & 0 deletions packages/@vue/cli/lib/util/request.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const request = require('request-promise-native')

module.exports = {
async get (uri) {
const reqOpts = {
method: 'GET',
resolveWithFullResponse: true,
json: true,
uri
}

return request(reqOpts)
}
}
3 changes: 2 additions & 1 deletion packages/@vue/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
},
"dependencies": {
"@vue/cli-shared-utils": "^3.0.0-alpha.11",
"axios": "^0.17.1",
"chalk": "^2.3.0",
"commander": "^2.12.2",
"ejs": "^2.5.7",
Expand All @@ -44,6 +43,8 @@
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"recast": "^0.13.0",
"request": "^2.83.0",
"request-promise-native": "^1.0.5",
"resolve": "^1.5.0",
"rimraf": "^2.6.2",
"semver": "^5.4.1",
Expand Down
9 changes: 4 additions & 5 deletions scripts/syncDeps.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const fs = require('fs')
const path = require('path')
const chalk = require('chalk')
const axios = require('axios')
const request = require('request-promise-native')
const semver = require('semver')
const globby = require('globby')
const { execSync } = require('child_process')
Expand All @@ -24,13 +24,12 @@ const getRemoteVersion = async (pkg) => {
}
let res
try {
res = await axios.get(`http://registry.npmjs.org/${pkg}/latest`)
res = await request(`http://registry.npmjs.org/${pkg}/latest`)
} catch (e) {
return
}
const version = res.data.version
versionCache[pkg] = version
return version
versionCache[pkg] = res.version
return res.version
}

const getRemoteVersionSync = pkg => {
Expand Down