Merge pull request #27 from githubnext/jaked/fix_onRequestGitHubData

update `onRequestGithubData` call in homepage block
githubnext · Mar 17, 2022 · 8bdebbf · 8bdebbf
2 parents cb99010 + c243ddc
commit 8bdebbf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -235,7 +235,7 @@
     "@excalidraw/excalidraw": "^0.10.0",
     "@fullstackio/cq": "^6.0.9",
     "@fullstackio/remark-cq": "^6.1.2",
-    "@githubnext/utils": "^0.18.0",
+    "@githubnext/utils": "^0.19.3",
     "@githubocto/flat-ui": "^0.13.4",
     "@loadable/component": "^5.15.0",
     "@mdx-js/runtime": "2.0.0-next.9",

diff --git a/src/blocks/folder-blocks/homepage/index.tsx b/src/blocks/folder-blocks/homepage/index.tsx
@@ -8,10 +8,9 @@ export default function (props: FolderBlockProps) {
   const [isLoading, setIsLoading] = useState(false);
 
   const getSiteUrl = async () => {
-    const info = await onRequestGitHubData("repo-info", {
-      owner: props.context.owner,
-      repo: props.context.repo,
-    });
+    const info = await onRequestGitHubData(
+      "/repos/${props.context.owner}/${props.context.repo}"
+    );
     setUrl(info.homepage);
     setIsLoading(false);
   };

diff --git a/src/components/local-block.tsx b/src/components/local-block.tsx
@@ -2,7 +2,6 @@ import { useCallback, useEffect, useState } from "react";
 // @ts-ignore
 import loadable from "@loadable/component";
 import { FileContext, FolderContext, RepoFiles } from "@githubnext/utils";
-import { getFileContent, getRepoInfo } from "../hooks";
 
 interface Block {
   id: string;

diff --git a/src/hooks/index.tsx b/src/hooks/index.tsx
@@ -190,19 +190,3 @@ export const useLocalStorage = (key: string, initialValue: any) => {
 
   return [storedValue, setValue];
 };
-
-export async function getRepoInfo(params: RepoContext): Promise<string> {
-  const { repo, owner } = params;
-
-  const apiUrl = `https://api.github.com/repos/${owner}/${repo}`;
-
-  const res = await fetch(apiUrl);
-  if (res.status !== 200) {
-    throw new Error(
-      `Error fetching repo info: ${owner}/${repo}\n${await res.text()}`
-    );
-  }
-
-  const resObject = await res.json();
-  return resObject;
-}
diff --git a/yarn.lock b/yarn.lock
@@ -762,10 +762,10 @@
     unist-util-visit "^1.0.0"
     uuid "^3.3.2"
 
-"@githubnext/utils@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@githubnext/utils/-/utils-0.18.0.tgz#43e5c1909b6cabfe07c85b9c81525ebdbe04d035"
-  integrity sha512-Xsi7zUDt2vGgrHDvzDLpQWGXdyof65iV7PBWffu/cX/IJKXRG4KJ5zUt7lD7iAXYv4VOgnbmtI81B/ayt2vByQ==
+"@githubnext/utils@^0.19.3":
+  version "0.19.3"
+  resolved "https://registry.yarnpkg.com/@githubnext/utils/-/utils-0.19.3.tgz#31c535c70454c2a3363de8cea1f8bf0a30a3d556"
+  integrity sha512-WetjTPpR6nZMUwUNw30RuhOzAdeKCKgPy7Oh5jxRjr/kIKSGfJU7NY3knqqvPk3jD/JjavW0n6AoGWSOL7cvkA==
   dependencies:
     "@types/lodash.uniqueid" "^4.0.6"
     lodash.uniqueid "^4.0.1"