Merge pull request #507 from VitNode/perf/plugins

perf: Improve plugins upload
VitNode · Sep 12, 2024 · 46610ca · 46610ca
2 parents 61fafd7 + 3f8de87
commit 46610ca
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 66 deletions.
diff --git a/apps/backend/package.json b/apps/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "0.0.9-canary.48",
+  "version": "0.0.9-canary.49",
   "license": "MIT",
   "scripts": {
     "drizzle-kit": "drizzle-kit",
@@ -24,8 +24,8 @@
     "@nestjs/schedule": "^4.1.0",
     "@nestjs/serve-static": "^4.0.2",
     "pg": "^8.12.0",
-    "react": "19.0.0-rc-e56f4ae3-20240830",
-    "react-dom": "19.0.0-rc-e56f4ae3-20240830",
+    "react": "^19.0.0-rc-d6cb4e77-20240911",
+    "react-dom": "^19.0.0-rc-d6cb4e77-20240911",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1"
   },

diff --git a/apps/frontend/global.d.ts b/apps/frontend/global.d.ts
@@ -1,6 +1,6 @@
-import type core from '@/src/plugins/core/langs/en.json';
-import type admin from '@/src/plugins/admin/langs/en.json';
-import type welcome from '@/src/plugins/welcome/langs/en.json';
+import type core from '@/plugins/core/langs/en.json';
+import type admin from '@/plugins/admin/langs/en.json';
+import type welcome from '@/plugins/welcome/langs/en.json';
 
 // ! === IMPORT ===
 

diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.0.9-canary.48",
+  "version": "0.0.9-canary.49",
   "author": "Maciej Piotr (aXenDev) Balcerzak",
   "license": "GPL-3.0 license",
   "scripts": {
@@ -20,8 +20,8 @@
     "lucide-react": "^0.437.0",
     "next": "15.0.0-canary.146",
     "next-intl": "^3.19.1",
-    "react": "19.0.0-rc-e56f4ae3-20240830",
-    "react-dom": "19.0.0-rc-e56f4ae3-20240830",
+    "react": "^19.0.0-rc-d6cb4e77-20240911",
+    "react-dom": "^19.0.0-rc-d6cb4e77-20240911",
     "vitnode-frontend": "workspace:*"
   },
   "devDependencies": {

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitnode-backend",
-  "version": "0.0.9-canary.48",
+  "version": "0.0.9-canary.49",
   "description": "Backend wrapper for VitNode projects",
   "author": "VitNode Team",
   "license": "MIT",

diff --git a/packages/backend/src/core/admin/plugins/helpers/files/create/contents.ts b/packages/backend/src/core/admin/plugins/helpers/files/create/contents.ts
@@ -42,6 +42,8 @@ export const createInfoJSON = ({
   name,
   nav,
   support_url,
+  version,
+  version_code,
 }: PluginInfoJSONType): string => {
   const json = {
     name,
@@ -52,6 +54,8 @@ export const createInfoJSON = ({
     support_url,
     allow_default,
     nav,
+    version,
+    version_code,
   };
 
   return JSON.stringify(json, null, 2);

diff --git a/packages/create-vitnode-app/helpers/create-packages-json.ts b/packages/create-vitnode-app/helpers/create-packages-json.ts
@@ -56,9 +56,12 @@ export const createPackagesJSON = ({
       : {},
     devDependencies: {
       ...(eslint
-        ? { prettier: '^3.3.3', 'prettier-plugin-tailwindcss': '^0.6.6' }
+        ? {
+            'eslint-config-typescript-vitnode': `^${pkg.version}`,
+            prettier: '^3.3.3',
+            'prettier-plugin-tailwindcss': '^0.6.6',
+          }
         : {}),
-      'eslint-config-typescript-vitnode': `^${pkg.version}`,
       turbo: '^2.1.1',
     },
     packageManager,
@@ -83,24 +86,24 @@ export const createPackagesJSON = ({
       'lint:fix': 'eslint . --fix',
     },
     dependencies: {
+      '@hookform/resolvers': '^3.9.0',
       geist: '^1.3.1',
       'lucide-react': '^0.439.0',
       next: '15.0.0-canary.146',
-      react: '^19.0.0-rc.0',
-      'react-dom': '^19.0.0-rc.0',
       'next-intl': '^3.19.1',
+      react: '^19.0.0-rc-d6cb4e77-20240911',
+      'react-dom': '^19.0.0-rc-d6cb4e77-20240911',
       'react-hook-form': '^7.53.0',
-      '@hookform/resolvers': '^3.9.0',
       'vitnode-frontend': `^${pkg.version}`,
     },
     devDependencies: {
       '@types/node': '^22.5.4',
       '@types/react': '^18.3.5',
       '@types/react-dom': '^18.3.0',
       autoprefixer: '^10.4.20',
-      'graphql-tag': '^2.12.6',
       ...(eslint ? { eslint: '^9.10.0' } : {}),
       'eslint-config-typescript-vitnode': `^${pkg.version}`,
+      'graphql-tag': '^2.12.6',
       postcss: '^8.4.45',
       tailwindcss: '^3.4.10',
       typescript: '^5.6.2',

diff --git a/packages/create-vitnode-app/package.json b/packages/create-vitnode-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-vitnode-app",
-  "version": "0.0.9-canary.48",
+  "version": "0.0.9-canary.49",
   "description": "Create a new VitNode app in seconds.",
   "author": "VitNode Team",
   "license": "MIT",

diff --git a/packages/eslint-config-typescript-vitnode/package.json b/packages/eslint-config-typescript-vitnode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-typescript-vitnode",
-  "version": "0.0.9-canary.48",
+  "version": "0.0.9-canary.49",
   "description": "ESLint, TypeScript (TSConfig), Prettier config for VitNode",
   "author": "VitNode Team",
   "license": "MIT",

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vitnode-frontend",
-  "version": "0.0.9-canary.48",
+  "version": "0.0.9-canary.49",
   "description": "Frontend wrapper for VitNode projects",
   "author": "VitNode Team",
   "license": "MIT",
@@ -90,8 +90,8 @@
     "next": "15.0.0-canary.137",
     "next-intl": "^3.19.0",
     "postcss": "^8.4.42",
-    "react": "^19",
-    "react-dom": "^19",
+    "react": "^19.0.0-rc-d6cb4e77-20240911",
+    "react-dom": "^19.0.0-rc-d6cb4e77-20240911",
     "react-hook-form": "^7.53.0",
     "tailwindcss": "^3.4.10",
     "typescript": "^5.5.4"

diff --git a/packages/frontend/src/views/admin/layout/auth/aside/aside.tsx b/packages/frontend/src/views/admin/layout/auth/aside/aside.tsx
@@ -1,7 +1,6 @@
 import { LogoVitNode } from '@/components/logo-vitnode';
 import { LanguageSwitcher } from '@/components/switchers/language-switcher';
 import { ThemeSwitcher } from '@/components/switchers/theme-switcher';
-import { ScrollArea } from '@/components/ui/scroll-area';
 import { CONFIG } from '@/helpers/config-with-env';
 import { Link } from '@/navigation';
 
@@ -39,11 +38,7 @@ export const AsideAuthAdmin = () => {
         <SearchAsideAuthAdmin />
       </div>
 
-      <ScrollArea className="flex-1">
-        <div className="px-3 py-6">
-          <NavAdmin />
-        </div>
-      </ScrollArea>
+      <NavAdmin />
     </aside>
   );
 };
diff --git a/packages/frontend/src/views/admin/layout/auth/nav/nav-admin.tsx b/packages/frontend/src/views/admin/layout/auth/nav/nav-admin.tsx
@@ -1,3 +1,4 @@
+import { ScrollArea } from '@/components/ui/scroll-area';
 import { getSessionAdminData } from '@/graphql/get-session-admin';
 
 import { ItemNavAdmin } from './item/item';
@@ -7,20 +8,24 @@ export const NavAdmin = async () => {
   const data = await getSessionAdminData();
 
   return (
-    <NavAdminWrapper>
-      {data.admin__nav__show.map(item => (
-        <ItemNavAdmin
-          id={item.code}
-          items={item.nav.map(navItem => ({
-            id: navItem.code,
-            icon: navItem.icon ?? undefined,
-            children: navItem.children?.map(child => ({
-              id: child.code,
-            })),
-          }))}
-          key={item.code}
-        />
-      ))}
-    </NavAdminWrapper>
+    <ScrollArea className="flex-1">
+      <div className="px-3 py-6">
+        <NavAdminWrapper>
+          {data.admin__nav__show.map(item => (
+            <ItemNavAdmin
+              id={item.code}
+              items={item.nav.map(navItem => ({
+                id: navItem.code,
+                icon: navItem.icon ?? undefined,
+                children: navItem.children?.map(child => ({
+                  id: child.code,
+                })),
+              }))}
+              key={item.code}
+            />
+          ))}
+        </NavAdminWrapper>
+      </div>
+    </ScrollArea>
   );
 };
diff --git a/...s/frontend/src/views/admin/views/core/plugins/actions/create/hooks/mutation-create-api.ts b/...s/frontend/src/views/admin/views/core/plugins/actions/create/hooks/mutation-create-api.ts
@@ -6,7 +6,6 @@ import {
   Admin__Core_Plugins__CreateMutation,
   Admin__Core_Plugins__CreateMutationVariables,
 } from '@/graphql/mutations/admin/plugins/admin__core_plugins__create.generated';
-import { CONFIG } from '@/helpers/config-with-env';
 import { revalidatePath } from 'next/cache';
 
 export const mutationCreateApi = async (
@@ -20,19 +19,17 @@ export const mutationCreateApi = async (
       query: Admin__Core_Plugins__Create,
       variables,
     });
-  } catch (error) {
-    const e = error as Error;
-
-    return { error: e.message };
-  }
 
-  if (CONFIG.node_development) {
     // Revalidate after 3 seconds in promise. Wait for fast refresh to compilation files.
     await new Promise<void>(resolve =>
       setTimeout(() => {
         revalidatePath('/', 'layout');
         resolve();
       }, 3000),
     );
+  } catch (error) {
+    const e = error as Error;
+
+    return { error: e.message };
   }
 };
diff --git a/...ges/frontend/src/views/admin/views/core/plugins/actions/create/hooks/mutation-edit-api.ts b/...ges/frontend/src/views/admin/views/core/plugins/actions/create/hooks/mutation-edit-api.ts
@@ -19,11 +19,11 @@ export const mutationEditApi = async (
       query: Admin__Core_Plugins__Edit,
       variables,
     });
+
+    revalidatePath('/', 'layout');
   } catch (error) {
     const e = error as Error;
 
     return { error: e.message };
   }
-
-  revalidatePath('/', 'layout');
 };
diff --git a/...es/frontend/src/views/admin/views/core/plugins/table/actions/delete/hooks/mutation-api.ts b/...es/frontend/src/views/admin/views/core/plugins/table/actions/delete/hooks/mutation-api.ts
@@ -6,6 +6,7 @@ import {
   Admin__Core_Plugins__DeleteMutation,
   Admin__Core_Plugins__DeleteMutationVariables,
 } from '@/graphql/mutations/admin/plugins/admin__core_plugins__delete.generated';
+import { revalidatePath } from 'next/cache';
 
 export const mutationApi = async (
   variables: Admin__Core_Plugins__DeleteMutationVariables,
@@ -18,7 +19,13 @@ export const mutationApi = async (
       query: Admin__Core_Plugins__Delete,
       variables,
     });
-  } catch (e) {
-    if (typeof e === 'string') return { error: e };
+  } catch (error) {
+    const e = error as Error;
+
+    if (e.message !== 'fetch failed') {
+      return { error: e.message };
+    }
   }
+
+  revalidatePath('/', 'layout');
 };
diff --git a/packages/frontend/src/views/admin/views/core/plugins/upload/hooks/mutation-api.ts b/packages/frontend/src/views/admin/views/core/plugins/upload/hooks/mutation-api.ts
@@ -6,6 +6,7 @@ import {
   Admin__Core_Plugins__UploadMutation,
   Admin__Core_Plugins__UploadMutationVariables,
 } from '@/graphql/mutations/admin/plugins/admin__core_plugins__upload.generated';
+import { revalidatePath } from 'next/cache';
 
 export const mutationApi = async (formData: FormData) => {
   const files = formData.get('file') as File;
@@ -26,7 +27,13 @@ export const mutationApi = async (formData: FormData) => {
         },
       ],
     });
-  } catch (e) {
-    if (typeof e === 'string') return { error: e };
+  } catch (error) {
+    const e = error as Error;
+
+    if (e.message !== 'fetch failed') {
+      return { error: e.message };
+    }
   }
+
+  revalidatePath('/', 'layout');
 };
diff --git a/...src/views/admin/views/core/plugins/views/dev/nav/create-edit/hooks/create-mutation-api.ts b/...src/views/admin/views/core/plugins/views/dev/nav/create-edit/hooks/create-mutation-api.ts
@@ -19,11 +19,11 @@ export const createMutationApi = async (
       query: Admin__Core_Plugins__Nav__Create,
       variables,
     });
+
+    revalidatePath('/', 'layout');
   } catch (error) {
     const e = error as Error;
 
     return { error: e.message };
   }
-
-  revalidatePath('/[locale]/admin/(auth)/(vitnode)', 'layout');
 };
diff --git a/...d/src/views/admin/views/core/plugins/views/dev/nav/create-edit/hooks/edit-mutation-api.ts b/...d/src/views/admin/views/core/plugins/views/dev/nav/create-edit/hooks/edit-mutation-api.ts
@@ -21,11 +21,11 @@ export const editMutationApi = async (variables: Args) => {
       query: Admin__Core_Plugins__Nav__Edit,
       variables,
     });
+
+    revalidatePath('/', 'layout');
   } catch (error) {
     const e = error as Error;
 
     return { error: e.message };
   }
-
-  revalidatePath('/[locale]/admin/(auth)/(vitnode)', 'layout');
 };
diff --git a/...rc/views/admin/views/core/plugins/views/dev/nav/item/actions/delete/hooks/mutation-api.ts b/...rc/views/admin/views/core/plugins/views/dev/nav/item/actions/delete/hooks/mutation-api.ts
@@ -21,11 +21,11 @@ export const mutationApi = async (variables: Args) => {
       query: Admin__Core_Plugins__Nav__Delete,
       variables,
     });
+
+    revalidatePath('/', 'layout');
   } catch (error) {
     const e = error as Error;
 
     return { error: e.message };
   }
-
-  revalidatePath('/[locale]/admin/(auth)/(vitnode)', 'layout');
 };
diff --git a/packages/frontend/src/views/theme/layout/header/header.tsx b/packages/frontend/src/views/theme/layout/header/header.tsx
@@ -12,6 +12,7 @@ import { UserBar } from './user-bar/user-bar';
 export const Header = async ({ className }: { className?: string }) => {
   const {
     core_sessions__authorization: { user },
+    core_nav__show: { edges },
   } = await getSessionData();
 
   return (
@@ -23,7 +24,7 @@ export const Header = async ({ className }: { className?: string }) => {
     >
       <div className="container flex h-16 items-center gap-5 px-5">
         <LogoHeader />
-        <Nav />
+        {edges.length > 0 && <Nav />}
 
         <div className="ml-auto hidden gap-2 sm:flex">
           <LanguageSwitcher />

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml