Resolve merge conflicts by accepting release/v0.0.5 versions

Author: SFARPak

scaffold-vue/postcss.config.js

@@ -3,8 +3,4 @@ export default {
     tailwindcss: {},
     autoprefixer: {},
   },
-<<<<<<< HEAD
-};
-=======
-}
->>>>>>> release/v0.0.5
+}

scaffold-vue/src/App.vue

@@ -1,25 +1,3 @@
-<<<<<<< HEAD
-<template>
-  <div class="min-h-screen bg-gray-100 flex items-center justify-center">
-    <div class="bg-white p-8 rounded-lg shadow-md">
-      <h1 class="text-2xl font-bold text-gray-800 mb-4">
-        Welcome to Vue 3 + Vite + TypeScript + Tailwind
-      </h1>
-      <p class="text-gray-600">
-        This is a basic scaffold for your Vue 3 project.
-      </p>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-// Your Vue component logic here
-</script>
-
-<style scoped>
-/* Scoped styles here */
-</style>
-=======
 <script setup lang="ts">
 import HelloWorld from './components/HelloWorld.vue'
 import TheWelcome from './components/TheWelcome.vue'
@@ -67,4 +45,3 @@ header {
   }
 }
 </style>
->>>>>>> release/v0.0.5

scaffold-vue/src/main.ts

@@ -1,14 +1,6 @@
-<<<<<<< HEAD
-import { createApp } from 'vue'
-import App from './App.vue'
-import './style.css'
-
-createApp(App).mount('#app')
-=======
 import './assets/main.css'
 
 import { createApp } from 'vue'
 import App from './App.vue'
 
 createApp(App).mount('#app')
->>>>>>> release/v0.0.5

scaffold-vue/vite.config.ts

@@ -1,21 +1,3 @@
-<<<<<<< HEAD
-import { defineConfig } from "vite";
-import vue from "@vitejs/plugin-vue";
-import path from "path";
-
-export default defineConfig(() => ({
-  server: {
-    host: "::",
-    port: 8080,
-  },
-  plugins: [vue()],
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./src"),
-    },
-  },
-}));
-=======
 import { fileURLToPath, URL } from 'node:url'
 
 import { defineConfig } from 'vite'
@@ -34,4 +16,3 @@ export default defineConfig({
     },
   },
 })
->>>>>>> release/v0.0.5

src/app/TitleBar.tsx

@@ -94,27 +94,9 @@ export const TitleBar = () => {
           </Button>
         </div>
 
-<<<<<<< HEAD
-        <img src={logo} alt="AliFullStack Logo" className="w-6 h-6 mr-0.5" />
-        <Button
-          data-testid="title-bar-app-name-button"
-          variant="outline"
-          size="sm"
-          className={`hidden @2xl:block no-app-region-drag text-xs max-w-38 truncate font-medium ${
-            selectedApp ? "cursor-pointer" : ""
-          }`}
-          onClick={handleAppClick}
-        >
-          {displayText}
-        </Button>
-        {isDyadPro && (
-          <DyadProButton isAliFullStackProEnabled={isAliFullStackProEnabled} />
-        )}
-=======
         <div className="flex-1 flex justify-center items-center absolute inset-0 pointer-events-none">
           <span className="text-lg font-semibold no-app-region-drag pointer-events-auto">AliFullStack</span>
         </div>
->>>>>>> release/v0.0.5
 
         <div className="flex items-center flex-shrink-0 ml-auto">
           {isDyadPro && <DyadProButton isAliFullStackProEnabled={isAliFullStackProEnabled} />}

src/hooks/useParseRouter.ts

@@ -21,35 +21,20 @@ export function useParseRouter(appId: number | null) {
     refreshApp,
   } = useLoadApp(appId);
 
-  // Detect Next.js app by presence of next.config.* in file list
-  const isNextApp = useMemo(() => {
-    if (!app?.files) return false;
-    return app.files.some((f) => f.toLowerCase().includes("next.config"));
-  }, [app?.files]);
-
-  // Detect Vue app by presence of .vue files in src/ or frontend/src/
-  const isVueApp = useMemo(() => {
-    if (!app?.files) return false;
-    return app.files.some((f) => f.includes('.vue'));
-  }, [app?.files]);
-
   // Load router related file to extract routes for non-Next apps
-  // For Vue apps, try .vue files; for React/other, try .tsx files
-  const primaryRouterPath = isVueApp ? "frontend/src/App.vue" : "frontend/src/App.tsx";
-  const fallbackRouterPath = isVueApp ? "src/App.vue" : "src/App.tsx";
-
+  // First try frontend/src/App.tsx (new structure), then fallback to src/App.tsx
   const {
     content: frontendRouterContent,
     loading: frontendRouterFileLoading,
     error: frontendRouterFileError,
-  } = useLoadAppFile(appId, primaryRouterPath);
+  } = useLoadAppFile(appId, "frontend/src/App.tsx");
 
   const {
     content: routerContent,
     loading: routerFileLoading,
     error: routerFileError,
     refreshFile,
-  } = useLoadAppFile(appId, fallbackRouterPath);
+  } = useLoadAppFile(appId, "src/App.tsx");
 
   const {
     content: vueRouterContent,
@@ -63,8 +48,6 @@ export function useParseRouter(appId: number | null) {
     error: vueAppError,
   } = useLoadAppFile(appId, "src/App.vue");
 
-<<<<<<< HEAD
-=======
   // Detect Next.js app by presence of next.config.* in file list
   const isNextApp = useMemo(() => {
     if (!app?.files) return false;
@@ -82,7 +65,6 @@ export function useParseRouter(appId: number | null) {
   const finalRouterLoading = frontendRouterFileLoading || routerFileLoading || (isVueApp ? vueAppLoading : false);
   const finalRouterError = frontendRouterFileError || routerFileError || (isVueApp ? vueAppError : false);
 
->>>>>>> release/v0.0.5
   // Parse routes either from Next.js file-based routing or from router file
   useEffect(() => {
     const buildLabel = (path: string) =>
@@ -176,41 +158,16 @@ export function useParseRouter(appId: number | null) {
 
       try {
         const parsedRoutes: ParsedRoute[] = [];
+        const routePathsRegex = /<Route\s+(?:[^>]*\s+)?path=["']([^"']+)["']/g;
+        let match: RegExpExecArray | null;
 
-        if (isVueApp) {
-          // For Vue apps, look for route definitions in various formats
-          // Vue Router routes can be defined in different ways
-          const vueRouteRegexes = [
-            // Vue Router createRouter format: path: '/home'
-            /path:\s*["']([^"']+)["']/g,
-            // Vue Router route object: { path: '/home' }
-            /{[^}]*path:\s*["']([^"']+)["'][^}]*}/g,
-          ];
-
-          for (const regex of vueRouteRegexes) {
-            let match: RegExpExecArray | null;
-            while ((match = regex.exec(content)) !== null) {
-              const path = match[1];
-              const label = buildLabel(path);
-              if (!parsedRoutes.some((r) => r.path === path)) {
-                parsedRoutes.push({ path, label });
-              }
-            }
-          }
-        } else {
-          // React-style route parsing
-          const routePathsRegex = /<Route\s+(?:[^>]*\s+)?path=["']([^"']+)["']/g;
-          let match: RegExpExecArray | null;
-
-          while ((match = routePathsRegex.exec(content)) !== null) {
-            const path = match[1];
-            const label = buildLabel(path);
-            if (!parsedRoutes.some((r) => r.path === path)) {
-              parsedRoutes.push({ path, label });
-            }
+        while ((match = routePathsRegex.exec(content)) !== null) {
+          const path = match[1];
+          const label = buildLabel(path);
+          if (!parsedRoutes.some((r) => r.path === path)) {
+            parsedRoutes.push({ path, label });
           }
         }
-
         setRoutes(parsedRoutes);
       } catch (e) {
         console.error("Error parsing router file:", e);