Infrastructure/verdaccio
0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2025-04-01 02:42:23 -05:00
Code Issues Activity

chore: remove axios in favor of fetch

Browse source 
xhr is not in the wave anymore
This commit is contained in:
Juan Picado @jotadeveloper 2018-03-20 07:21:54 +01:00
parent b9a6edf9b0
commit fef7ee75e8
No known key found for this signature in database
GPG key ID: 18AC54485952D158
9 changed files with 40 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -51,7 +51,6 @@
"@commitlint/config-conventional": "6.1.3",
"@commitlint/travis-cli": "6.1.3",
"@verdaccio/types": "2.0.2",
"axios": "0.18.0",
"babel-cli": "6.26.0",
"babel-core": "6.26.0",
"babel-eslint": "8.2.2",
@ -129,7 +128,8 @@
"verdaccio-memory": "0.0.6",
"webpack": "3.10.0",
"webpack-dev-server": "2.11.1",
"webpack-merge": "4.1.2"
"webpack-merge": "4.1.2",
"whatwg-fetch": "2.0.3"
},
"keywords": [
"private",

18
src/webui/src/components/Header/index.js
View file

@ -7,11 +7,11 @@ import {Link} from 'react-router-dom';
import API from '../../../utils/api';
import storage from '../../../utils/storage';
import {getRegistryURL} from '../../../utils/url';
import classes from './header.scss';
import './logo.png';
import {getRegistryURL} from '../../../utils/url';
export default class Header extends React.Component {
state = {
@ -43,9 +43,9 @@ export default class Header extends React.Component {
}
componentWillMount() {
API.get('logo')
API.request('logo')
.then((response) => {
this.setState({logo: response.data});
this.setState({logo: response.url});
})
.catch((error) => {
throw new Error(error);
@ -62,15 +62,15 @@ export default class Header extends React.Component {
}
try {
let resp = await API.post(`login`, {
let resp = await API.request(`login`, 'POST', {
data: {
username: this.state.username,
password: this.state.password
}
});
}).then((response) => response.json());
storage.setItem('token', resp.data.token);
storage.setItem('username', resp.data.username);
storage.setItem('token', resp.token);
storage.setItem('username', resp.username);
location.reload();
} catch (e) {
const errorObj = {
@ -78,7 +78,7 @@ export default class Header extends React.Component {
type: 'error'
};
if (get(e, 'response.status', 0) === 401) {
errorObj.description = e.response.data.error;
errorObj.description = e.response.error;
} else {
errorObj.description = e.message;
}

2
src/webui/src/components/PackageSidebar/index.jsx
View file

@ -32,7 +32,7 @@ export default class PackageSidebar extends React.Component {
let packageMeta;
try {
packageMeta = (await API.get(`sidebar/${packageName}`)).data;
packageMeta = await API.request(`sidebar/${packageName}`, 'GET').then((response) => response.json());
} catch (err) {
this.setState({
failed: true

4
src/webui/src/modules/detail/index.jsx
View file

@ -47,9 +47,9 @@ export default class Detail extends React.Component {
});
try {
const resp = await API.get(`package/readme/${packageName}`);
const resp = await API.request(`package/readme/${packageName}`, 'GET').then((response) => response.text());
this.setState({
readMe: resp.data
readMe: resp
});
} catch (err) {
this.setState({

8
src/webui/src/modules/home/index.js
View file

@ -52,11 +52,11 @@ export default class Home extends React.Component {
async loadPackages() {
try {
this.req = await API.get('packages');
this.req = await API.request('packages', 'GET').then((response) => response.json());
if (this.state.query === '') {
this.setState({
packages: this.req.data,
packages: this.req,
loading: false
});
}
@ -71,12 +71,12 @@ export default class Home extends React.Component {
async searchPackage(query) {
try {
this.req = await API.get(`/search/${query}`);
this.req = await API.request(`/search/${query}`, 'GET').then((response) => response.json());
// Implement cancel feature later
if (this.state.query === query) {
this.setState({
packages: this.req.data,
packages: this.req,
fistTime: false,
loading: false
});

41
src/webui/utils/api.js
View file

@ -1,34 +1,27 @@
import storage from './storage';
import axios from 'axios';
class API {
constructor() {
['get', 'delete', 'post', 'put', 'patch'].map((method) => {
this[method] = (url, options = {}) => {
if (!window.VERDACCIO_API_URL) {
throw new Error('VERDACCIO_API_URL is not defined!');
}
request(url, method = 'GET', options = {}) {
if (!window.VERDACCIO_API_URL) {
throw new Error('VERDACCIO_API_URL is not defined!');
}
const token = storage.getItem('token');
if (token) {
if (!options.headers) options.headers = {};
const token = storage.getItem('token');
if (token) {
if (!options.headers) options.headers = {};
options.headers.authorization = token;
}
options.headers.authorization = token;
}
if (!['http://', 'https://', '//'].some((prefix) => url.startsWith(prefix))) {
url = window.VERDACCIO_API_URL + url;
}
if (!['http://', 'https://', '//'].some((prefix) => url.startsWith(prefix))) {
url = window.VERDACCIO_API_URL + url;
}
return axios.request({
method,
url,
...options
});
};
});
}
return fetch(url, {
method,
...options
});
}
}
export default new API();

3
tools/webpack.dev.config.babel.js
View file

@ -10,6 +10,7 @@ export default {
...baseConfig,
entry: {
main: [
'whatwg-fetch',
'react-hot-loader/patch',
'webpack-dev-server/client?http://localhost:4872',
'webpack/hot/only-dev-server',
@ -22,6 +23,8 @@ export default {
publicPath: '/',
},
devtool: 'cheap-module-eval-source-map',
plugins: [
new webpack.DefinePlugin({
__DEBUG__: true,

2
tools/webpack.prod.config.babel.js
View file

@ -9,7 +9,7 @@ import getPackageVersion from './getPackageVersion';
const prodConf = {
entry: {
main: ['babel-polyfill', `${env.SRC_ROOT}/webui/src/index.js`],
main: ['babel-polyfill', 'whatwg-fetch', `${env.SRC_ROOT}/webui/src/index.js`],
},
module: {

15
yarn.lock
View file

@ -601,13 +601,6 @@ aws4@^1.2.1, aws4@^1.6.0:
version "1.6.0"
resolved "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
axios@0.18.0:
version "0.18.0"
resolved "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
dependencies:
follow-redirects "^1.3.0"
is-buffer "^1.1.5"
babel-cli@6.26.0:
version "6.26.0"
resolved "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
@ -3600,12 +3593,6 @@ flow-runtime@0.17.0:
version "0.17.0"
resolved "https://registry.npmjs.org/flow-runtime/-/flow-runtime-0.17.0.tgz#ff57dd22bd7b0682c7beff20c3590f6a4a8286e3"
follow-redirects@^1.3.0:
version "1.4.1"
resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz#d8120f4518190f55aac65bb6fc7b85fcd666d6aa"
dependencies:
debug "^3.1.0"
for-in@^0.1.3:
version "0.1.8"
resolved "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@ -9123,7 +9110,7 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
dependencies:
iconv-lite "0.4.19"
whatwg-fetch@>=0.10.0:
whatwg-fetch@2.0.3, whatwg-fetch@>=0.10.0:
version "2.0.3"
resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"