Merge branch 'master' into feature/throws-over-32kb

Author: pbassut

.circleci/config.yml

@@ -26,9 +26,6 @@ workflows:
   static_analysis:
     jobs:
       - test
-      - size:
-          requires:
-            - test
       - coverage:
           requires:
             - test
@@ -100,13 +97,6 @@ jobs:
       - checkout
       - attach_workspace: { at: . }
       - run: yarn run report-coverage
-  size:
-    docker:
-      - image: circleci/node:10-browsers
-    steps:
-      - checkout
-      - attach_workspace: { at: . }
-      - run: yarn run size
   snyk:
     docker:
       - image: circleci/node:10-browsers

History.md

@@ -1,3 +1,8 @@
+v3.5.0 / 2021-1-5
+==========================
+* Update axios to fix the Server-Side Request Forgery vulnerability  (#259) 
+
+
 v3.4.1-beta.3 / 2020-10-26
 ==========================
 * Update axios to fix the infinite retry bug (#255) 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "analytics-node",
-  "version": "3.4.0-beta.3",
+  "version": "3.5.0",
   "description": "The hassle-free way to integrate analytics into any Node.js application",
   "license": "MIT",
   "repository": "segmentio/analytics-node",
@@ -12,16 +12,9 @@
   "engines": {
     "node": ">=4"
   },
-  "size-limit": [
-    {
-      "limit": "25 KB",
-      "path": "index.js"
-    }
-  ],
   "scripts": {
     "circle-lint": ".buildscript/circle.sh",
     "dependencies": "yarn",
-    "size": "size-limit",
     "test": "standard && nyc ava --timeout=20s&& .buildscript/e2e.sh",
     "report-coverage": "nyc report --reporter=lcov > coverage.lcov && codecov",
     "np": "np --no-publish",
@@ -41,7 +34,7 @@
   ],
   "dependencies": {
     "@segment/loosely-validate-event": "^2.0.0",
-    "axios": "^0.19.2",
+    "axios": "^0.21.1",
     "axios-retry": "^3.0.2",
     "lodash.isstring": "^4.0.1",
     "md5": "^2.2.1",
@@ -61,8 +54,13 @@
     "nyc": "^14.1.1",
     "pify": "^4.0.1",
     "sinon": "^7.3.2",
-    "size-limit": "^1.3.5",
     "snyk": "^1.171.1",
     "standard": "^12.0.1"
+  },
+  "resolutions": {
+    "kind-of": "^6.0.3",
+    "lodash": "^4.17.19",
+    "set-value": "^2.0.1",
+    "yargs-parser": "^13.1.2"
   }
 }