Dependabot/npm and yarn/extensions/github1s/browserify sign 4.2.2

.devcontainer/Dockerfile

@@ -2,7 +2,7 @@
 
 # [Choice] Node.js version: 14, 12, 10
 ARG VARIANT="14-buster"
-FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
+FROM mcr.microsoft.com/devcontainers/typescript-node:${VARIANT}
 
 # same package list from github1s/scripts/preinstall.sh
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
@@ -13,7 +13,7 @@ RUN mkdir -p /opt/dev \
     && cd /opt/dev \
     && git clone https://github.com/emscripten-core/emsdk.git \
     && cd /opt/dev/emsdk \
-    && ./emsdk install 2.0.6 \
-    && ./emsdk activate 2.0.6
+    && ./emsdk install 3.1.21 \
+    && ./emsdk activate 3.1.21
 
-ENV PATH="/opt/dev/emsdk:/opt/dev/emsdk/node/12.9.1_64bit/bin:/opt/dev/emsdk/upstream/emscripten:${PATH}"
+ENV PATH="/opt/dev/emsdk:/opt/dev/emsdk/node/14.18.2_64bit/bin:/opt/dev/emsdk/upstream/emscripten:${PATH}"

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
 		"dockerfile": "Dockerfile",
 		// Update 'VARIANT' to pick a Node version: 10, 12, 14
 		"args": { 
-			"VARIANT": "12"
+			"VARIANT": "20-bullseye"
 		}
 	},
 
@@ -21,7 +21,7 @@
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [5000],
+	"forwardPorts": [8080],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
 	//"postCreateCommand": "yarn",

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        node-version: [16.x, 18.x]
+        node-version: [18.x]
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/test-wtih-vscode-build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        node-version: [16.x]
+        node-version: [18.16.0]
 
     runs-on: ${{ matrix.os }}
 
@@ -35,6 +35,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-${{ matrix.node-version }}
 
+      - run: sudo apt -y install libkrb5-dev
       - run: yarn --frozen-lockfile
       - run: yarn build:vscode
       - run: yarn yalc && yarn build

.gitpod.yml

@@ -13,7 +13,7 @@ tasks:
       echo "Please wait for 'yarn watch' to complete compilation, then run 'yarn serve'"
       echo "==========================================================================="
 ports:
-  - port: 5000
+  - port: 8080
     onOpen: open-browser
 github:
   prebuilds:

README.md

@@ -62,8 +62,8 @@ git clone git@github.com:conwnet/github1s.git
 cd github1s
 yarn
 yarn watch
-# The cli will automatically open http://localhost:5000 once the build is completed.
-# You can visit http://localhost:5000/conwnet/github1s if it doesn't.
+# The cli will automatically open http://localhost:8080 once the build is completed.
+# You can visit http://localhost:8080/conwnet/github1s if it doesn't.
 ```
 
 #### Local development with full VS Code build
@@ -84,8 +84,8 @@ After the initial successful build, you could use the watch mode:
 cd github1s
 yarn
 yarn watch-with-vscode
-# The cli will automatically open http://localhost:5000 once the build is completed.
-# You can visit http://localhost:5000/conwnet/github1s if it doesn't.
+# The cli will automatically open http://localhost:8080 once the build is completed.
+# You can visit http://localhost:8080/conwnet/github1s if it doesn't.
 ```
 
 ### ... or ... VS Code + Docker Development
@@ -104,8 +104,8 @@ You can use the VS Code plugin [Remote-Containers](https://marketplace.visualstu
 ```bash
 yarn
 yarn watch
-# The cli will automatically open http://localhost:5000 once the build is completed.
-# You can visit http://localhost:5000/conwnet/github1s if it doesn't.
+# The cli will automatically open http://localhost:8080 once the build is completed.
+# You can visit http://localhost:8080/conwnet/github1s if it doesn't.
 ```
 
 ### Format all codes

docs/guide.md

@@ -35,7 +35,7 @@ $ yarn
 $ yarn watch # or yarn build, it may take minutes, wait please
 ```
 
-Then, there will be a new directory named `dist` generated in the project root. The `yarn watch:dev-server` (part of `yarn watch` command) will automatically open http://localhost:5000 in the browser.
+Then, there will be a new directory named `dist` generated in the project root. The `yarn watch:dev-server` (part of `yarn watch` command) will automatically open http://localhost:8080 in the browser.
 
 If you get a 404 error for some static files, please wait a minute for the building to complete.
 

extensions/github1s/assets/pages/components.css

@@ -55,7 +55,7 @@
   outline: 1px solid transparent;
   font-family: var(--vscode-font-family);
   color: var(--vscode-input-foreground);
-  border: 1px solid var(--vscode-input-background);
+  border: 1px solid var(--vscode-input-border, var(--vscode-widget-border));
   background-color: var(--vscode-input-background);
 }
 

extensions/github1s/package.json

@@ -608,7 +608,7 @@
     "@apollo/client": "^3.5.10",
     "@octokit/core": "^3.6.0",
     "dayjs": "^1.11.1",
-    "graphql": "^16.3.0",
+    "graphql": "^16.8.1",
     "history": "^5.3.0",
     "js-base64": "^3.7.2",
     "json-stable-stringify": "^1.0.1",
@@ -622,7 +622,7 @@
     "node-polyfill-webpack-plugin": "^1.1.4",
     "ts-loader": "^9.2.8",
     "typescript": "^4.6.3",
-    "webpack": "^5.72.0",
+    "webpack": "^5.76.0",
     "webpack-cli": "^4.9.2"
   }
 }

extensions/github1s/src/adapters/ossinsight/constants.ts

@@ -16,7 +16,7 @@ export const RankingLanguages = [
 	'PHP',
 	'C++',
 	'C#',
-	'Typescript',
+	'TypeScript',
 	'Shell',
 	'C',
 	'Ruby',

extensions/github1s/src/adapters/ossinsight/data-source.ts

@@ -33,24 +33,6 @@ export class OSSInsightDataSource extends DataSource {
 		type: FileType.Directory,
 		name: '',
 		children: [
-			{
-				type: FileType.Directory,
-				name: '.vscode',
-				children: [
-					{
-						type: FileType.File,
-						name: 'settings.json',
-						content: () =>
-							JSON.stringify({
-								'files.exclude': { '.vscode': true },
-								'markdown.preview.doubleClickToSwitchToEditor': false,
-								'workbench.editorAssociations': {
-									'*.md': 'vscode.markdown.preview.editor',
-								},
-							}),
-					},
-				],
-			},
 			{
 				type: FileType.Directory,
 				name: 'collections',

extensions/github1s/src/adapters/ossinsight/interfaces.ts

@@ -12,104 +12,82 @@ const resolveDataFromResponse = (response: Response) => {
 	if (response.status < 200 || response.status >= 300) {
 		return [];
 	}
-	return response.json().then((body) => body?.data || []);
+	return response.json().then((body) => body?.data?.rows || []);
 };
 
 export type RepoItem = {
 	collection_names?: string;
 	contributor_logins?: string;
 	description?: string;
-	forks?: number;
+	forks: string;
 	language?: string;
 	repo_name: string;
-	stars?: number;
-	total_score?: number;
+	stars: string;
+	total_score: string;
 };
 
 export const getTrendingRepos = (period: RankingPeriod, language: string): Promise<RepoItem[]> => {
 	const encodedLanguage = encodeURIComponent(language) || 'All';
 	const periodValue =
 		period === RankingPeriod.Today ? 'past_24_hours' : RankingPeriod.ThisWeek ? 'past_week' : 'past_month';
-	const requestUrl = `${OSSInsightEndpoint}/q/trending-repos?language=${encodedLanguage}&period=${periodValue}`;
+	const requestUrl = `${OSSInsightEndpoint}/v1/trends/repos/?language=${encodedLanguage}&period=${periodValue}`;
 	return fetch(requestUrl).then(resolveDataFromResponse);
 };
 
 export type RecentHotCollectionItem = {
-	id: number;
-	last_2nd_month_rank: number;
-	last_month_rank: number;
+	id: string;
 	name: string;
-	rank: number;
-	rank_changes: number;
-	repo_id: number;
+	repos: string;
+	repo_id: string;
 	repo_name: string;
-	repos: number;
-	visits: number;
+	repo_rank_changes: string;
+	repo_past_period_rank: string;
+	repo_current_period_rank: string;
 };
 
 export const getRecentHotCollections = (): Promise<RecentHotCollectionItem[]> => {
-	const requestUrl = `${OSSInsightEndpoint}/q/recent-hot-collections`;
+	const requestUrl = `${OSSInsightEndpoint}/v1/collections/hot/`;
 	return fetch(requestUrl).then(resolveDataFromResponse);
 };
 
 export type CollectionItem = {
-	id: number;
+	id: string;
 	name: string;
-	public: number;
 };
 
 export const getCollections = memorize((): Promise<CollectionItem[]> => {
-	const requestUrl = `${OSSInsightEndpoint}/collections`;
+	const requestUrl = `${OSSInsightEndpoint}/v1/collections/`;
 	return fetch(requestUrl).then(resolveDataFromResponse);
 });
 
-export const getCollectionIdByName = async (collectionName: string): Promise<number | null> => {
+export const getCollectionIdByName = async (collectionName: string): Promise<string | null> => {
 	const collections = await getCollections();
 	return collections.find((item) => item.name === collectionName)?.id || null;
 };
 
 export type Last28DaysRankItem = {
-	last_2nd_period_rank: number;
-	last_2nd_period_total: number;
-	last_period_rank: number;
-	last_period_total: number;
-	rank_pop: number;
-	repo_id: number;
+	repo_id: string;
 	repo_name: string;
-	total: number;
-	total_pop: number;
+	current_period_growth: string;
+	past_period_growth: string;
+	growth_pop: string;
+	rank_pop: string;
+	total: string;
+	current_period_rank: string;
+	past_period_rank: string;
 };
 
-export const getCollectionStarsLast28DaysRank = (collectionId: number): Promise<Last28DaysRankItem[]> => {
-	const requestUrl = `${OSSInsightEndpoint}/q/collection-stars-last-28-days-rank?collectionId=${collectionId}`;
+export const getCollectionStarsLast28DaysRank = (collectionId: string): Promise<Last28DaysRankItem[]> => {
+	const requestUrl = `${OSSInsightEndpoint}/v1/collections/${collectionId}/ranking_by_stars/`;
 	return fetch(requestUrl).then(resolveDataFromResponse);
 };
 
-export const getCollectionPullRequestsLast28DaysRank = (collectionId: number): Promise<Last28DaysRankItem[]> => {
-	const requestUrl = `${OSSInsightEndpoint}/q/collection-pull-requests-last-28-days-rank?collectionId=${collectionId}`;
+export const getCollectionPullRequestsLast28DaysRank = (collectionId: string): Promise<Last28DaysRankItem[]> => {
+	const requestUrl = `${OSSInsightEndpoint}/v1/collections/${collectionId}/ranking_by_issues/`;
 	return fetch(requestUrl).then(resolveDataFromResponse);
 };
 
-export const getCollectionIssuesLast28DaysRank = (collectionId: number): Promise<Last28DaysRankItem[]> => {
-	const requestUrl = `${OSSInsightEndpoint}/q/collection-issues-last-28-days-rank?collectionId=${collectionId}`;
-	return fetch(requestUrl).then(resolveDataFromResponse);
-};
-
-export type CollectionStarsMonthRankItem = {
-	current_month: string;
-	current_month_rank: number;
-	current_month_total: number;
-	last_month: string;
-	last_month_rank: number;
-	last_month_total: number;
-	rank_mom: number;
-	repo_id: number;
-	repo_name: string;
-	total: number;
-	total_mom: number;
-};
-
-export const getCollectionStarsMonthRank = (collectionId: number) => {
-	const requestUrl = `https://api.ossinsight.io/q/collection-stars-last-28-days-rank?collectionId=${collectionId}`;
+export const getCollectionIssuesLast28DaysRank = (collectionId: string): Promise<Last28DaysRankItem[]> => {
+	const requestUrl = `${OSSInsightEndpoint}/v1/collections/${collectionId}/ranking_by_prs/`;
 	return fetch(requestUrl).then(resolveDataFromResponse);
 };

extensions/github1s/src/adapters/ossinsight/templates.ts

@@ -34,16 +34,16 @@ const createRepoItemMarkdown = (repo: RepoItem, period: RankingPeriod) => {
 		`[![LastCommit](https://img.shields.io/github/last-commit/${repo.repo_name})](https://github.com/${repo.repo_name}/commits)`,
 	];
 
-	const increaseStarsText = (repo.stars || 0) >= 0 ? `+${repo.stars || 0}` : `-${repo.stars}`;
-	const increaseForksText = (repo.forks || 0) >= 0 ? `+${repo.forks || 0}` : `-${repo.forks}`;
+	const increaseStarsText = (+repo.stars || 0) >= 0 ? `+${repo.stars || 0}` : `-${repo.stars}`;
+	const increaseForksText = (+repo.forks || 0) >= 0 ? `+${repo.forks || 0}` : `-${repo.forks}`;
 	const contributorsMarkdown = contributorAvatars.length
 		? '    Built by  ' + contributorAvatars.join('  ')
 		: '';
 	const collectionMarkdown = repo.collection_names ? ` &nbsp;&nbsp; <i>${repo.collection_names}</i>` : '';
 	const fireThreshold = period === RankingPeriod.ThisWeek ? 5000 : period === RankingPeriod.ThisMonth ? 12000 : 1000;
 
 	return `
-## ${(repo.total_score || 0) >= fireThreshold ? '🔥' : '🚀'} [${repo.repo_name}](${buildRepoLink(repo.repo_name)})
+## ${(+repo.total_score || 0) >= fireThreshold ? '🔥' : '🚀'} [${repo.repo_name}](${buildRepoLink(repo.repo_name)})
 
 ${repo.description || ''}
 
@@ -126,12 +126,23 @@ const getPopCountText = (pop_count: number, percentage = false) => {
 		: '';
 };
 
+const getRankChangeText = (rank_change: number) => {
+	const absValue = Math.abs(rank_change);
+	return rank_change > 0
+		? ` <span style="color: #ff453a">(↓${absValue})</span>`
+		: rank_change < 0
+		? ` <span style="color: #30d158">(↑${absValue})</span>`
+		: '';
+};
+
 export const createCollectionsListPageMarkdown = async () => {
 	const collectionReposMap = new Map<string, [string, string][]>();
 	const [hotCollections, allCollections] = await Promise.all([getRecentHotCollections(), getCollections()]);
-	const sortedCollections = hotCollections.sort((itemA, itemB) => itemA.rank - itemB.rank);
+	const sortedCollections = hotCollections.sort(
+		(itemA, itemB) => +itemA.repo_current_period_rank - +itemB.repo_current_period_rank
+	);
 	const uniqueCollections = sortedCollections.filter((collection) => {
-		const relativeRankText = getPopCountText(collection.last_2nd_month_rank - collection.last_month_rank);
+		const relativeRankText = getRankChangeText(+collection.repo_rank_changes);
 		if (!collectionReposMap.has(collection.name)) {
 			collectionReposMap.set(collection.name, [[collection.repo_name, relativeRankText]]);
 			return true;
@@ -192,24 +203,24 @@ export const createCollectionPageMarkdown = async (collectionName: string) => {
 	]);
 
 	const starRankListMarkdown = starsData.map((item) => {
-		const rankMarkdown = ` ${item.last_period_rank}${getPopCountText(item.rank_pop)}`;
+		const rankMarkdown = ` ${item.current_period_rank}${getRankChangeText(+item.rank_pop)}`;
 		const repoMarkdown = ` [${item.repo_name}](${buildRepoLink(item.repo_name)})`;
-		const starsMarkdown = ` ${item.last_period_total}${getPopCountText(item.total_pop, true)}`;
-		return `|${rankMarkdown} |${repoMarkdown} |${starsMarkdown} | ${item.last_2nd_period_total} | ${item.total} |`;
+		const starsMarkdown = ` ${item.current_period_growth}${getPopCountText(+item.growth_pop, true)}`;
+		return `|${rankMarkdown} |${repoMarkdown} |${starsMarkdown} | ${item.past_period_growth} | ${item.total} |`;
 	});
 
 	const pullRankListMarkdown = pullsData.map((item) => {
-		const rankMarkdown = ` ${item.last_period_rank}${getPopCountText(item.rank_pop)}`;
+		const rankMarkdown = ` ${item.current_period_rank}${getRankChangeText(+item.rank_pop)}`;
 		const repoMarkdown = ` [${item.repo_name}](${buildRepoLink(item.repo_name)})`;
-		const starsMarkdown = ` ${item.last_period_total}${getPopCountText(item.total_pop, true)}`;
-		return `|${rankMarkdown} |${repoMarkdown} |${starsMarkdown} | ${item.last_2nd_period_total} | ${item.total} |`;
+		const starsMarkdown = ` ${item.current_period_growth}${getPopCountText(+item.growth_pop, true)}`;
+		return `|${rankMarkdown} |${repoMarkdown} |${starsMarkdown} | ${item.past_period_growth} | ${item.total} |`;
 	});
 
 	const issuesRankListMarkdown = issuesData.map((item) => {
-		const rankMarkdown = ` ${item.last_period_rank}${getPopCountText(item.rank_pop)}`;
+		const rankMarkdown = ` ${item.current_period_rank}${getRankChangeText(+item.rank_pop)}`;
 		const repoMarkdown = ` [${item.repo_name}](${buildRepoLink(item.repo_name)})`;
-		const starsMarkdown = ` ${item.last_period_total}${getPopCountText(item.total_pop, true)}`;
-		return `|${rankMarkdown} |${repoMarkdown} |${starsMarkdown} | ${item.last_2nd_period_total} | ${item.total} |`;
+		const starsMarkdown = ` ${item.current_period_growth}${getPopCountText(+item.growth_pop, true)}`;
+		return `|${rankMarkdown} |${repoMarkdown} |${starsMarkdown} | ${item.past_period_growth} | ${item.total} |`;
 	});
 
 	return `