iBoss/bolt-diy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge upstream/main - resolve conflicts with GitHub deployment feature

Browse Source 
- Resolved merge conflicts in DeployButton.tsx
- Kept upstream versions of GitHubDeploy.client.tsx and GitHubDeploymentDialog.tsx
- Fixed linting issues and formatting
- Maintained proper GitHub deployment functionality
- Ready for cleanup improvements
This commit is contained in:
Stijnus
2025-08-29 20:47:38 +02:00
parent 8168b9b4db 194e0d7209
commit 04da90f0c0
2 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/deploy/DeployButton.tsx
View File

@@ -129,9 +129,7 @@ export const DeployButton = ({ onVercelDeploy, onNetlifyDeploy, onGitHubDeploy }
crossOrigin="anonymous"
src="https://cdn.simpleicons.org/netlify"
/>
<span className="mx-auto">
{!netlifyConn.user ? 'No Netlify Account Connected' : 'Deploy to Netlify'}
</span>
<span className="mx-auto">{!netlifyConn.user ? 'No Netlify Account Connected' : 'Deploy to Netlify'}</span>
{netlifyConn.user && <NetlifyDeploymentLink />}
</DropdownMenu.Item>

42
app/components/deploy/GitHubDeploy.client.tsx
View File

@@ -76,7 +76,7 @@ export function useGitHubDeploy() {
// Notify that build succeeded and deployment preparation is starting
deployArtifact.runner.handleDeployAction('deploying', 'running', {
source: 'github',
source: 'github'
});
// Get all project files instead of just the build directory since we're deploying to a repository
@@ -89,32 +89,31 @@ export function useGitHubDeploy() {
for (const entry of entries) {
const fullPath = path.join(dirPath, entry.name);
// Create a relative path without the leading slash for GitHub
const relativePath = basePath ? `${basePath}/${entry.name}` : entry.name;
// Skip node_modules, .git directories and other common excludes
if (
entry.isDirectory() &&
(entry.name === 'node_modules' ||
entry.name === '.git' ||
entry.name === 'dist' ||
entry.name === 'build' ||
entry.name === '.cache' ||
entry.name === '.next')
) {
if (entry.isDirectory() && (
entry.name === 'node_modules' ||
entry.name === '.git' ||
entry.name === 'dist' ||
entry.name === 'build' ||
entry.name === '.cache' ||
entry.name === '.next'
)) {
continue;
}
if (entry.isFile()) {
// Skip binary files, large files and other common excludes
if (entry.name.endsWith('.DS_Store') || entry.name.endsWith('.log') || entry.name.startsWith('.env')) {
if (entry.name.endsWith('.DS_Store') ||
entry.name.endsWith('.log') ||
entry.name.startsWith('.env')) {
continue;
}
try {
const content = await container.fs.readFile(fullPath, 'utf-8');
// Store the file with its relative path, not the full system path
files[relativePath] = content;
} catch (error) {
@@ -132,28 +131,23 @@ export function useGitHubDeploy() {
const fileContents = await getAllFiles('/');
/*
* Show GitHub deployment dialog here - it will handle the actual deployment
* and will receive these files to deploy
*/
// Show GitHub deployment dialog here - it will handle the actual deployment
// and will receive these files to deploy
/*
* For now, we'll just complete the deployment with a success message
* Notify that deployment preparation is complete
*/
// For now, we'll just complete the deployment with a success message
// Notify that deployment preparation is complete
deployArtifact.runner.handleDeployAction('deploying', 'complete', {
source: 'github',
source: 'github'
});
return {
success: true,
files: fileContents,
projectName: artifact.title || 'bolt-project',
projectName: artifact.title || 'bolt-project'
};
} catch (err) {
console.error('GitHub deploy error:', err);
toast.error(err instanceof Error ? err.message : 'GitHub deployment preparation failed');
return false;
} finally {
setIsDeploying(false);