Merge branch 'main' into jobstreaming

kylecarbs · kylecarbs · commit d5eafa59bcf8 · 2022-02-04T18:24:22.000Z
diff --git a/coderd/projects_test.go b/coderd/projects_test.go
@@ -156,12 +156,7 @@ func TestProjects(t *testing.T) {
 		require.Eventually(t, func() bool {
 			projectHistory, err := server.Client.ProjectHistory(context.Background(), user.Organization, project.Name, history.Name)
 			require.NoError(t, err)
-			completed := projectHistory.Import.Status.Completed()
-			if !completed {
-				_, err := server.Client.ProjectHistoryParameters(context.Background(), user.Organization, project.Name, history.Name)
-				require.Error(t, err)
-			}
-			return completed
+			return projectHistory.Import.Status.Completed()
 		}, 15*time.Second, 10*time.Millisecond)
 		params, err := server.Client.ProjectHistoryParameters(context.Background(), user.Organization, project.Name, history.Name)
 		require.NoError(t, err)
diff --git a/site/package.json b/site/package.json
@@ -30,7 +30,7 @@
     "@types/express": "4.17.13",
     "@types/jest": "27.4.0",
     "@types/node": "14.18.10",
-    "@types/react": "17.0.38",
+    "@types/react": "17.0.39",
     "@types/react-dom": "17.0.11",
     "@types/superagent": "4.1.15",
     "@typescript-eslint/eslint-plugin": "4.33.0",
diff --git a/site/yarn.lock b/site/yarn.lock
@@ -3197,10 +3197,10 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@17.0.38":
-  version "17.0.38"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.38.tgz#f24249fefd89357d5fa71f739a686b8d7c7202bd"
-  integrity sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==
+"@types/react@*", "@types/react@17.0.39":
+  version "17.0.39"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce"
+  integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
