Skip to content

Commit

Permalink
Merge branch 'master' into fix/1740
Browse files Browse the repository at this point in the history
  • Loading branch information
ArtemBaskal committed Jun 11, 2020
2 parents 8cdc68d + 1356ac2 commit 13593ad
Show file tree
Hide file tree
Showing 73 changed files with 9,193 additions and 4,960 deletions.
6 changes: 2 additions & 4 deletions AGHTechDoc.md
Original file line number Diff line number Diff line change
Expand Up @@ -893,8 +893,7 @@ Response:
"edns_cs_enabled": true | false,
"dnssec_enabled": true | false
"disable_ipv6": true | false,
"fastest_addr": true | false, // use Fastest Address algorithm
"parallel_requests": true | false, // send DNS requests to all upstream servers at once
"upstream_mode": "" | "parallel" | "fastest_addr"
}


Expand All @@ -916,8 +915,7 @@ Request:
"edns_cs_enabled": true | false,
"dnssec_enabled": true | false
"disable_ipv6": true | false,
"fastest_addr": true | false, // use Fastest Address algorithm
"parallel_requests": true | false, // send DNS requests to all upstream servers at once
"upstream_mode": "" | "parallel" | "fastest_addr"
}

Response:
Expand Down
16 changes: 0 additions & 16 deletions client/.babelrc

This file was deleted.

14 changes: 14 additions & 0 deletions client/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = (api) => {
api.cache(false);
return {
presets: [
'@babel/preset-env',
'@babel/preset-react',
],
plugins: [
'@babel/plugin-proposal-class-properties',
'@babel/plugin-transform-runtime',
'@babel/plugin-proposal-object-rest-spread',
],
};
};
5 changes: 5 additions & 0 deletions client/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
transform: {
'^.+\\.jsx?$': 'babel-jest',
},
};
Loading

0 comments on commit 13593ad

Please sign in to comment.