chore(deps): upgrade axios to 1.6.0 (#12489)

aws-amplify · Nov 6, 2023 · 51e97ea · 51e97ea
1 parent 70c60fe
commit 51e97ea
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 92 deletions.
diff --git a/.github/actions/setup-samples-staging/action.yml b/.github/actions/setup-samples-staging/action.yml
@@ -34,7 +34,7 @@ runs:
       env:
         BRANCH: ${{ github.ref_name }}
       run: |
-        if git ls-remote origin $BRANCH | grep -q refs/heads/next/$BRANCH$; then
+        if git ls-remote origin $BRANCH | grep -q refs/heads/$BRANCH$; then
             # Branch exists, checkout and echo success message
             git fetch origin $BRANCH
             git checkout $BRANCH

diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json
@@ -19,10 +19,10 @@
     "test": "npm run lint && jest --coverage",
     "test:size": "size-limit",
     "build-with-test": "npm test && npm run build",
-    "build:cjs": "node ./build es5 && webpack && webpack --config ./webpack.config.dev.js",
-    "build:esm": "node ./build es6",
-    "build:cjs:watch": "node ./build es5 --watch",
-    "build:esm:watch": "node ./build es6 --watch",
+    "build:cjs": "rimraf lib && tsc -m commonjs --outDir lib && webpack && webpack --config ./webpack.config.dev.js",
+    "build:esm": "rimraf lib-esm && tsc -m esnext --outDir lib-esm",
+    "build:cjs:watch": "rimraf lib && tsc -m commonjs --outDir lib --watch",
+    "build:esm:watch": "rimraf lib-esm && tsc -m esnext --outDir lib-esm --watch",
     "build": "npm run clean && npm run build:esm && npm run build:cjs",
     "clean": "npm run clean:size && rimraf lib-esm lib dist",
     "clean:size": "rimraf dual-publish-tmp tmp*",
@@ -41,7 +41,8 @@
   },
   "homepage": "https://aws-amplify.github.io/",
   "devDependencies": {
-    "@types/zen-observable": "^0.8.0"
+    "@types/zen-observable": "^0.8.0",
+    "typescript": "5.0.2"
   },
   "files": [
     "lib",
@@ -65,29 +66,26 @@
       "name": "API (GraphQL client)",
       "path": "./lib-esm/index.js",
       "import": "{ Amplify, GraphQLAPI }",
-      "limit": "89.52 kB"
+      "limit": "95273 B"
     }
   ],
   "jest": {
+    "moduleNameMapper": {
+      "axios": "axios/dist/node/axios.cjs"
+    },
     "globals": {
       "ts-jest": {
         "diagnostics": false,
-        "tsConfig": {
-          "lib": [
-            "es5",
-            "es2015",
-            "dom",
-            "esnext.asynciterable",
-            "es2017.object"
-          ],
-          "allowJs": true
-        }
+        "tsConfig": false
       }
     },
     "transform": {
       "^.+\\.(js|jsx|ts|tsx)$": "ts-jest"
     },
     "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
+    "testPathIgnorePatterns": [
+      "/testUtils/"
+    ],
     "moduleFileExtensions": [
       "ts",
       "tsx",
@@ -96,7 +94,6 @@
       "jsx"
     ],
     "testEnvironment": "jsdom",
-    "testURL": "http://localhost/",
     "coverageThreshold": {
       "global": {
         "branches": 0,
@@ -105,6 +102,7 @@
         "statements": 0
       }
     },
+    "testURL": "http://localhost/",
     "coveragePathIgnorePatterns": [
       "/node_modules/",
       "dist",

diff --git a/packages/api-graphql/tsconfig.json b/packages/api-graphql/tsconfig.json
@@ -0,0 +1,8 @@
+{
+	"extends": "../tsconfig.base.json",
+	"compilerOptions": {},
+	"include": ["./src"],
+	"watchOptions": {
+		"excludeDirectories": ["lib*"]
+	}
+}
diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json
@@ -19,10 +19,10 @@
     "test": "npm run lint && jest --coverage",
     "test:size": "size-limit",
     "build-with-test": "npm test && npm run build",
-    "build:cjs": "node ./build es5 && webpack && webpack --config ./webpack.config.dev.js",
-    "build:esm": "node ./build es6",
-    "build:cjs:watch": "node ./build es5 --watch",
-    "build:esm:watch": "node ./build es6 --watch",
+    "build:cjs": "rimraf lib && tsc -m commonjs --outDir lib && webpack && webpack --config ./webpack.config.dev.js",
+	  "build:esm": "rimraf lib-esm && tsc -m esnext --outDir lib-esm",
+	  "build:cjs:watch": "rimraf lib && tsc -m commonjs --outDir lib --watch",
+	  "build:esm:watch": "rimraf lib-esm && tsc -m esnext --outDir lib-esm --watch",
     "build": "npm run clean && npm run build:esm && npm run build:cjs",
     "clean": "npm run clean:size && rimraf lib-esm lib dist",
     "clean:size": "rimraf dual-publish-tmp tmp*",
@@ -47,60 +47,60 @@
   ],
   "dependencies": {
     "@aws-amplify/core": "5.8.5",
-    "axios": "0.26.0",
+    "axios": "1.6.0",
     "tslib": "^1.8.0",
     "url": "0.11.0"
   },
+  "devDependencies": {
+    "typescript": "5.0.2"
+  },
   "size-limit": [
     {
       "name": "API (rest client)",
       "path": "./lib-esm/index.js",
       "import": "{ Amplify, RestAPI }",
-      "limit": "31 kB"
+      "limit": "36665 B"
     }
   ],
   "jest": {
-    "globals": {
-      "ts-jest": {
-        "diagnostics": false,
-        "tsConfig": {
-          "lib": [
-            "es5",
-            "es2015",
-            "dom",
-            "esnext.asynciterable",
-            "es2017.object"
-          ],
-          "allowJs": true
-        }
-      }
-    },
-    "transform": {
-      "^.+\\.(js|jsx|ts|tsx)$": "ts-jest"
+    "moduleNameMapper": {
+      "axios": "axios/dist/node/axios.cjs"
     },
-    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
-    "moduleFileExtensions": [
-      "ts",
-      "tsx",
-      "js",
-      "json",
-      "jsx"
-    ],
-    "testEnvironment": "jsdom",
-    "testURL": "http://localhost/",
-    "coverageThreshold": {
-      "global": {
-        "branches": 0,
-        "functions": 0,
-        "lines": 0,
-        "statements": 0
-      }
-    },
-    "coveragePathIgnorePatterns": [
-      "/node_modules/",
-      "dist",
-      "lib",
-      "lib-esm"
-    ]
-  }
+    "globals": {
+			"ts-jest": {
+				"diagnostics": false,
+				"tsConfig": false
+			}
+		},
+		"transform": {
+			"^.+\\.(js|jsx|ts|tsx)$": "ts-jest"
+		},
+		"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
+		"testPathIgnorePatterns": [
+			"/testUtils/"
+		],
+		"moduleFileExtensions": [
+			"ts",
+			"tsx",
+			"js",
+			"json",
+			"jsx"
+		],
+		"testEnvironment": "jsdom",
+		"coverageThreshold": {
+			"global": {
+				"branches": 0,
+				"functions": 0,
+				"lines": 0,
+				"statements": 0
+			}
+		},
+		"testURL": "http://localhost/",
+		"coveragePathIgnorePatterns": [
+			"/node_modules/",
+			"dist",
+			"lib",
+			"lib-esm"
+		]
+	}
 }
diff --git a/packages/api-rest/tsconfig.json b/packages/api-rest/tsconfig.json
@@ -0,0 +1,8 @@
+{
+	"extends": "../tsconfig.base.json",
+	"compilerOptions": {},
+	"include": ["./src"],
+	"watchOptions": {
+		"excludeDirectories": ["lib*"]
+	}
+}
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -26,10 +26,10 @@
 		"test": "npm run lint && jest -w 1 --coverage",
 		"test:size": "size-limit",
 		"build-with-test": "npm test && npm run build",
-		"build:cjs": "node ./build es5 && webpack && webpack --config ./webpack.config.dev.js",
-		"build:esm": "node ./build es6",
-		"build:cjs:watch": "node ./build es5 --watch",
-		"build:esm:watch": "node ./build es6 --watch",
+		"build:cjs": "rimraf lib && tsc -m commonjs --outDir lib && webpack && webpack --config ./webpack.config.dev.js",
+		"build:esm": "rimraf lib-esm && tsc -m esnext --outDir lib-esm",
+		"build:cjs:watch": "rimraf lib && tsc -m commonjs --outDir lib --watch",
+		"build:esm:watch": "rimraf lib-esm && tsc -m esnext --outDir lib-esm --watch",
 		"build": "npm run clean && npm run build:esm && npm run build:cjs",
 		"clean": "npm run clean:size && rimraf lib-esm lib dist",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
@@ -48,7 +48,8 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"devDependencies": {
-		"@types/zen-observable": "^0.8.0"
+		"@types/zen-observable": "^0.8.0",
+		"typescript": "5.0.2"
 	},
 	"files": [
 		"lib",
@@ -67,29 +68,26 @@
 			"name": "API (top-level class)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Amplify, API }",
-			"limit": "90.28 kB"
+			"limit": "96.05 kB"
 		}
 	],
 	"jest": {
+		"moduleNameMapper": {
+			"axios": "axios/dist/node/axios.cjs"
+		},
 		"globals": {
-			"ts-jest": {
-				"diagnostics": false,
-				"tsConfig": {
-					"lib": [
-						"es5",
-						"es2015",
-						"dom",
-						"esnext.asynciterable",
-						"es2017.object"
-					],
-					"allowJs": true
+				"ts-jest": {
+					"diagnostics": false,
+					"tsConfig": false
 				}
-			}
 		},
 		"transform": {
 			"^.+\\.(js|jsx|ts|tsx)$": "ts-jest"
 		},
 		"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
+		"testPathIgnorePatterns": [
+			"/testUtils/"
+		],
 		"moduleFileExtensions": [
 			"ts",
 			"tsx",
@@ -98,7 +96,6 @@
 			"jsx"
 		],
 		"testEnvironment": "jsdom",
-		"testURL": "http://localhost/",
 		"coverageThreshold": {
 			"global": {
 				"branches": 0,
@@ -107,11 +104,13 @@
 				"statements": 0
 			}
 		},
+		"testURL": "http://localhost/",
 		"coveragePathIgnorePatterns": [
 			"/node_modules/",
 			"dist",
 			"lib",
 			"lib-esm"
 		]
 	}
+
 }
diff --git a/packages/api/tsconfig.json b/packages/api/tsconfig.json
@@ -0,0 +1,8 @@
+{
+	"extends": "../tsconfig.base.json",
+	"compilerOptions": {},
+	"include": ["./src"],
+	"watchOptions": {
+		"excludeDirectories": ["lib*"]
+	}
+}
diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
@@ -55,6 +55,9 @@
     "tslib": "^2.0.0"
   },
   "jest": {
+    "moduleNameMapper": {
+      "axios": "axios/dist/node/axios.cjs"
+    },
     "globals": {
       "ts-jest": {
         "diagnostics": false,

diff --git a/packages/datastore-storage-adapter/package.json b/packages/datastore-storage-adapter/package.json
@@ -44,6 +44,9 @@
 		"sqlite3": "^5.0.2"
 	},
 	"jest": {
+		"moduleNameMapper": {
+			"axios": "axios/dist/node/axios.cjs"
+		},
 		"globals": {
 			"ts-jest": {
 				"diagnostics": true,

diff --git a/packages/datastore/package.json b/packages/datastore/package.json
@@ -73,10 +73,13 @@
 			"name": "DataStore (top-level class)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Amplify, DataStore }",
-			"limit": "137 kB"
+			"limit": "144.06 kB"
 		}
 	],
 	"jest": {
+		"moduleNameMapper": {
+			"axios": "axios/dist/node/axios.cjs"
+		},
 		"globals": {
 			"ts-jest": {
 				"diagnostics": true,

diff --git a/packages/pushnotification/package.json b/packages/pushnotification/package.json
@@ -46,6 +46,9 @@
     "@react-native-community/push-notification-ios": "1.0.3"
   },
   "jest": {
+    "moduleNameMapper": {
+      "axios": "axios/dist/node/axios.cjs"
+    },
     "globals": {
       "ts-jest": {
         "diagnostics": false,

diff --git a/yarn.lock b/yarn.lock