Update dependencies. (mattermost#1045)

* Update dependencies. * Fix nock usage.
Shragenator · Feb 6, 2020 · 1d18297 · 1d18297
1 parent 5f5a8a5
commit 1d18297
Show file tree

Hide file tree

Showing 16 changed files with 824 additions and 811 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: check-style clean pre-run test install
+.PHONY: check-style clean pre-run test install update-dependencies
 
 node_modules: package.json
 	@if ! [ $(shell which npm) ]; then \
@@ -35,3 +35,9 @@ install: node_modules
 
 bundle: | pre-run node_modules
 	npm run build
+
+update-dependencies: # Updates the dependencies
+	npm update --depth 9999
+	npm audit fix
+	@echo Automatic dependency update complete.
+	@echo You should manually inspect changes to package.json and pin exact versions of packages where appropriate.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,17 +25,17 @@
     "dev-mobile:watch": "ttsc --watch --outDir ${MOBILE_DIR:-../mattermost-mobile}/node_modules/mattermost-redux"
   },
   "dependencies": {
+    "core-js": "3.1.4",
     "form-data": "2.5.1",
     "gfycat-sdk": "1.4.18",
-    "moment-timezone": "0.5.26",
     "isomorphic-fetch": "2.2.1",
+    "moment-timezone": "0.5.26",
     "redux": "4.0.4",
     "redux-action-buffer": "1.2.0",
     "redux-offline": "git+https://github.com/enahum/redux-offline.git#885024de96b6ec73650c340c8928066585c413df",
     "redux-persist": "4.9.1",
     "redux-persist-node-storage": "2.0.0",
     "redux-thunk": "2.3.0",
-    "core-js": "3.1.4",
     "remote-redux-devtools": "0.5.16",
     "reselect": "4.0.0",
     "serialize-error": "5.0.0",
@@ -58,12 +58,12 @@
     "@babel/preset-env": "7.6.0",
     "@babel/preset-typescript": "7.6.0",
     "@babel/runtime": "7.6.0",
-    "@types/shallow-equals": "1.0.0",
-    "@typescript-eslint/eslint-plugin": "2.3.1",
-    "@typescript-eslint/parser": "2.3.1",
     "@types/jest": "24.9.0",
     "@types/moment-timezone": "0.5.12",
     "@types/node": "12.7.11",
+    "@types/shallow-equals": "1.0.0",
+    "@typescript-eslint/eslint-plugin": "2.3.1",
+    "@typescript-eslint/parser": "2.3.1",
     "@zerollup/ts-transform-paths": "1.7.3",
     "babel-eslint": "10.0.3",
     "babel-plugin-module-resolver": "3.2.0",
@@ -77,18 +77,18 @@
     "jest": "24.8.0",
     "jest-junit": "6.4.0",
     "mock-socket": "8.0.5",
-    "nock": "^11.3.5",
+    "nock": "11.7.2",
     "redux-mock-store": "1.5.3",
     "rollup": "1.22.0",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-resolve": "5.2.0",
-    "rollup-plugin-terser": "5.1.2",
+    "rollup-plugin-terser": "5.2.0",
     "rollup-plugin-typescript2": "0.24.3",
+    "source-map-support": "0.5.12",
     "ts-jest": "24.1.0",
     "tslib": "1.10.0",
     "ttypescript": "1.5.7",
-    "source-map-support": "0.5.12",
     "typescript": "3.6.3"
   }
 }
diff --git a/src/actions/bots.test.js b/src/actions/bots.test.js
@@ -27,8 +27,8 @@ describe('Actions.Bots', () => {
 
     it('loadBots', async () => {
         const bots = [TestHelper.fakeBot(), TestHelper.fakeBot()];
-        nock(Client4.getBotsRoute()).
-            get('').
+        nock(Client4.getBaseRoute()).
+            get('/bots').
             query(true).
             reply(201, bots);
 
@@ -41,8 +41,8 @@ describe('Actions.Bots', () => {
 
     it('loadBot', async () => {
         const bot = TestHelper.fakeBot();
-        nock(Client4.getBotRoute(bot.user_id)).
-            get('').
+        nock(Client4.getBaseRoute()).
+            get(`/bots/${bot.user_id}`).
             query(true).
             reply(201, bot);
 
@@ -55,8 +55,8 @@ describe('Actions.Bots', () => {
 
     it('createBot', async () => {
         const bot = TestHelper.fakeBot();
-        nock(Client4.getBotsRoute()).
-            post('').
+        nock(Client4.getBaseRoute()).
+            post('/bots').
             reply(200, bot);
         await store.dispatch(BotActions.createBot(bot));
 
@@ -67,15 +67,15 @@ describe('Actions.Bots', () => {
 
     it('patchBot', async () => {
         const bot = TestHelper.fakeBot();
-        nock(Client4.getBotRoute()).
-            post('').
+        nock(Client4.getBaseRoute()).
+            post('/bots').
             reply(200, bot);
         await store.dispatch(BotActions.createBot(bot));
 
         bot.username = 'mynewusername';
 
-        nock(Client4.getBotRoute(bot.user_id)).
-            put('').
+        nock(Client4.getBaseRoute()).
+            put(`/bots/${bot.user_id}`).
             reply(200, bot);
         await store.dispatch(BotActions.patchBot(bot.user_id, bot));
 
@@ -86,8 +86,8 @@ describe('Actions.Bots', () => {
 
     it('disableBot', async () => {
         const bot = TestHelper.fakeBot();
-        nock(Client4.getBotRoute()).
-            post('').
+        nock(Client4.getBaseRoute()).
+            post('/bots').
             reply(200, bot);
         await store.dispatch(BotActions.createBot(bot));
 
@@ -115,8 +115,8 @@ describe('Actions.Bots', () => {
 
     it('assignBot', async () => {
         const bot = TestHelper.fakeBot();
-        nock(Client4.getBotRoute()).
-            post('').
+        nock(Client4.getBaseRoute()).
+            post('/bots').
             reply(200, bot);
         await store.dispatch(BotActions.createBot(bot));
 
@@ -134,8 +134,8 @@ describe('Actions.Bots', () => {
     it('logout', async () => {
         // Fill redux store with somthing
         const bot = TestHelper.fakeBot();
-        nock(Client4.getBotRoute()).
-            post('').
+        nock(Client4.getBaseRoute()).
+            post('/bots').
             reply(200, bot);
         await store.dispatch(BotActions.createBot(bot));