From 67d984c52c67b8e64ab7770049b8f9d4ee870016 Mon Sep 17 00:00:00 2001 From: Anirban Kar Date: Wed, 1 Jan 2025 03:57:55 +0530 Subject: [PATCH 1/2] fix: hotfix auto select starter template works without github token #release (#959) * fix: hotfix starter template fix, updated header link to use navigate * template auth fix * updated changelog script --- .github/scripts/generate-changelog.sh | 6 +++--- .github/workflows/update-stable.yml | 2 ++ app/utils/selectStarterTemplate.ts | 24 ++++++++++++++---------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/scripts/generate-changelog.sh b/.github/scripts/generate-changelog.sh index fd84ee4f..e6300128 100755 --- a/.github/scripts/generate-changelog.sh +++ b/.github/scripts/generate-changelog.sh @@ -137,7 +137,7 @@ while IFS= read -r commit_line; do fi CATEGORIES["$CATEGORY"]=1 - COMMITS_BY_CATEGORY["$CATEGORY"]+="* ${PR_TITLE#*: } ([#$PR_NUM](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/pull/$PR_NUM)) by [@$GITHUB_USERNAME](https://github.com/$GITHUB_USERNAME)"$'\n' + COMMITS_BY_CATEGORY["$CATEGORY"]+="* ${PR_TITLE#*: } ([#$PR_NUM](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/pull/$PR_NUM)) by @$GITHUB_USERNAME"$'\n' else COMMITS_BY_CATEGORY["$CATEGORY"]+="* ${PR_TITLE#*: } ([#$PR_NUM](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/pull/$PR_NUM))"$'\n' fi @@ -165,7 +165,7 @@ while IFS= read -r commit_line; do CATEGORIES["$CATEGORY"]=1 COMMIT_TITLE=${COMMIT_MSG%% (#*} # Remove the PR number suffix COMMIT_TITLE=${COMMIT_TITLE#*: } # Remove the type prefix - COMMITS_BY_CATEGORY["$CATEGORY"]+="* $COMMIT_TITLE ([#$PR_NUM](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/pull/$PR_NUM)) by [@$GITHUB_USERNAME](https://github.com/$GITHUB_USERNAME)"$'\n' + COMMITS_BY_CATEGORY["$CATEGORY"]+="* $COMMIT_TITLE ([#$PR_NUM](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/pull/$PR_NUM)) by @$GITHUB_USERNAME"$'\n' else COMMIT_TITLE=${COMMIT_MSG%% (#*} # Remove the PR number suffix COMMIT_TITLE=${COMMIT_TITLE#*: } # Remove the type prefix @@ -196,7 +196,7 @@ while IFS= read -r commit_line; do CATEGORIES["$CATEGORY"]=1 COMMIT_TITLE=${COMMIT_MSG#*: } # Remove the type prefix - COMMITS_BY_CATEGORY["$CATEGORY"]+="* $COMMIT_TITLE (${HASH:0:7}) by [@$GITHUB_USERNAME](https://github.com/$GITHUB_USERNAME)"$'\n' + COMMITS_BY_CATEGORY["$CATEGORY"]+="* $COMMIT_TITLE (${HASH:0:7}) by @$GITHUB_USERNAME"$'\n' else # Fallback to git author name if no GitHub username found AUTHOR_NAME=$(git show -s --format='%an' "$HASH") diff --git a/.github/workflows/update-stable.yml b/.github/workflows/update-stable.yml index b1944876..f7341c43 100644 --- a/.github/workflows/update-stable.yml +++ b/.github/workflows/update-stable.yml @@ -88,6 +88,8 @@ jobs: id: changelog env: NEW_VERSION: ${{ steps.bump_version.outputs.new_version }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: .github/scripts/generate-changelog.sh - name: Get the latest commit hash and version tag diff --git a/app/utils/selectStarterTemplate.ts b/app/utils/selectStarterTemplate.ts index 0e779e1c..4a7536da 100644 --- a/app/utils/selectStarterTemplate.ts +++ b/app/utils/selectStarterTemplate.ts @@ -2,6 +2,7 @@ import ignore from 'ignore'; import type { ProviderInfo } from '~/types/model'; import type { Template } from '~/types/template'; import { STARTER_TEMPLATES } from './constants'; +import Cookies from 'js-cookie'; const starterTemplateSelectionPrompt = (templates: Template[]) => ` You are an experienced developer who helps people choose the best starter template for their projects. @@ -116,14 +117,20 @@ const getGitHubRepoContent = async ( const baseUrl = 'https://api.github.com'; try { + const token = Cookies.get('githubToken') || import.meta.env.VITE_GITHUB_ACCESS_TOKEN; + + const headers: HeadersInit = { + Accept: 'application/vnd.github.v3+json', + }; + + // Add your GitHub token if needed + if (token) { + headers.Authorization = 'token ' + token; + } + // Fetch contents of the path const response = await fetch(`${baseUrl}/repos/${repoName}/contents/${path}`, { - headers: { - Accept: 'application/vnd.github.v3+json', - - // Add your GitHub token if needed - Authorization: 'token ' + import.meta.env.VITE_GITHUB_ACCESS_TOKEN, - }, + headers, }); if (!response.ok) { @@ -156,10 +163,7 @@ const getGitHubRepoContent = async ( } else if (item.type === 'file') { // Fetch file content const fileResponse = await fetch(item.url, { - headers: { - Accept: 'application/vnd.github.v3+json', - Authorization: 'token ' + import.meta.env.VITE_GITHUB_ACCESS_TOKEN, - }, + headers, }); const fileData: any = await fileResponse.json(); const content = atob(fileData.content); // Decode base64 content From 608d9338a856e287508252811054fd29ebad2c7a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 31 Dec 2024 22:28:11 +0000 Subject: [PATCH 2/2] chore: release version 0.0.5 --- changelog.md | 62 ++++------------------------------------------------ package.json | 2 +- 2 files changed, 5 insertions(+), 59 deletions(-) diff --git a/changelog.md b/changelog.md index 8de95f5c..cb34d061 100644 --- a/changelog.md +++ b/changelog.md @@ -1,68 +1,14 @@ -# 🚀 Release v0.0.4 +# 🚀 Release v0.0.5 ## What's Changed 🌟 -### 🔄 Changes since v0.0.3 - -### ✨ Features - -* add xAI grok-2-1212 model ([#800](https://github.com/stackblitz-labs/bolt.diy/pull/800)) -* providers list is now 2 columns (75ec49b) by Dustin Loring -* enhanced Terminal Error Handling and Alert System ([#797](https://github.com/stackblitz-labs/bolt.diy/pull/797)) -* add Starter template menu in homepage ([#884](https://github.com/stackblitz-labs/bolt.diy/pull/884)) -* catch errors from web container preview and show in actionable alert so user can send them to AI for fixing ([#856](https://github.com/stackblitz-labs/bolt.diy/pull/856)) -* redact file contents from chat and put latest files into system prompt ([#904](https://github.com/stackblitz-labs/bolt.diy/pull/904)) -* added Automatic Code Template Detection And Import ([#867](https://github.com/stackblitz-labs/bolt.diy/pull/867)) -* added hyperbolic llm models ([#943](https://github.com/stackblitz-labs/bolt.diy/pull/943)) - +### 🔄 Changes since v0.0.4 ### 🐛 Bug Fixes -* chat title character restriction (e064803) by Dustin Loring -* fixed model not loading/working, even after baseUrl set in .env file ([#816](https://github.com/stackblitz-labs/bolt.diy/pull/816)) -* added wait till terminal prompt for bolt shell execution ([#789](https://github.com/stackblitz-labs/bolt.diy/pull/789)) -* fixed console error for SettingsWIndow & Removed ts-nocheck ([#714](https://github.com/stackblitz-labs/bolt.diy/pull/714)) -* add Message Processing Throttling to Prevent Browser Crashes ([#848](https://github.com/stackblitz-labs/bolt.diy/pull/848)) -* provider menu dropdown fix (ghost providers) ([#862](https://github.com/stackblitz-labs/bolt.diy/pull/862)) -* ollama provider module base url hotfix for docker ([#863](https://github.com/stackblitz-labs/bolt.diy/pull/863)) -* check for updates does not look for commit.json now ([#861](https://github.com/stackblitz-labs/bolt.diy/pull/861)) -* detect and remove markdown block syntax that llms sometimes hallucinate for file actions ([#886](https://github.com/stackblitz-labs/bolt.diy/pull/886)) -* add defaults for LMStudio to work out of the box ([#928](https://github.com/stackblitz-labs/bolt.diy/pull/928)) -* import folder filtering ([#939](https://github.com/stackblitz-labs/bolt.diy/pull/939)) -* refresh model list after api key changes ([#944](https://github.com/stackblitz-labs/bolt.diy/pull/944)) -* better model loading ui feedback and model list update ([#954](https://github.com/stackblitz-labs/bolt.diy/pull/954)) -* updated logger and model caching minor bugfix #release ([#895](https://github.com/stackblitz-labs/bolt.diy/pull/895)) - - -### 📚 Documentation - -* simplified setup ([#817](https://github.com/stackblitz-labs/bolt.diy/pull/817)) -* toc for readme (de64007) by Dustin Loring -* faq style change, toc added to index (636f87f) by Dustin Loring -* setup updated (ab5cde3) by Dustin Loring -* updated Docs ([#845](https://github.com/stackblitz-labs/bolt.diy/pull/845)) -* updated download link ([#850](https://github.com/stackblitz-labs/bolt.diy/pull/850)) -* updated env.example of OLLAMA & LMSTUDIO base url ([#877](https://github.com/stackblitz-labs/bolt.diy/pull/877)) - - -### ♻️ Code Refactoring - -* updated vite config to inject add version metadata into the app on build ([#841](https://github.com/stackblitz-labs/bolt.diy/pull/841)) -* refactored LLM Providers: Adapting Modular Approach ([#832](https://github.com/stackblitz-labs/bolt.diy/pull/832)) - - -### ⚙️ CI - -* updated the docs ci to only trigger if any files changed in the docs folder ([#849](https://github.com/stackblitz-labs/bolt.diy/pull/849)) -* improved change-log generation script and cleaner release ci action ([#896](https://github.com/stackblitz-labs/bolt.diy/pull/896)) - - -### 🔍 Other Changes - -* fix hotfix for version metadata issue ([#853](https://github.com/stackblitz-labs/bolt.diy/pull/853)) -* feat; data tab added to the settings (1f938fc) by Dustin Loring +* hotfix auto select starter template works without github token #release ([#959](https://github.com/stackblitz-labs/bolt.diy/pull/959)) by @thecodacus ## 📈 Stats -**Full Changelog**: [`v0.0.3..v0.0.4`](https://github.com/stackblitz-labs/bolt.diy/compare/v0.0.3...v0.0.4) +**Full Changelog**: [`v0.0.4..v0.0.5`](https://github.com/stackblitz-labs/bolt.diy/compare/v0.0.4...v0.0.5) diff --git a/package.json b/package.json index bd381f9d..1668d994 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "MIT", "sideEffects": false, "type": "module", - "version": "0.0.4", + "version": "0.0.5", "scripts": { "deploy": "npm run build && wrangler pages deploy", "build": "remix vite:build",