Merge pull request #1278 from rharkor/dev

Dev

_old/package.json

@@ -36,5 +36,5 @@
     "turbo": "^2.0.4"
   },
   "license": "MIT",
-  "packageManager": "[email protected].2"
+  "packageManager": "[email protected].3"
 }

package.json

@@ -46,5 +46,5 @@
         "zx": "^8.1.4"
     },
     "license": "MIT",
-    "packageManager": "[email protected].2"
+    "packageManager": "[email protected].3"
 }

packages/cli/assets/plugins/app/empty/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "Empty app directory",
     "description": "Generates an empty app directory",
-    "suggestedPath": "app"
+    "paths": [
+        {
+            "from": "app",
+            "to": "app"
+        }
+    ]
 }

packages/cli/assets/plugins/component.d.json

@@ -12,14 +12,29 @@
         "description": {
             "type": "string"
         },
-        "suggestedPath": {
+        "source": {
             "type": "string"
+        },
+        "paths": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "additionalProperties": false,
+                "properties": {
+                    "from": {
+                        "type": "string"
+                    },
+                    "to": {
+                        "type": "string"
+                    }
+                }
+            }
         }
     },
     "required": [
         "$schema",
         "name",
         "description",
-        "suggestedPath"
+        "paths"
     ]
 }

packages/cli/assets/plugins/conventional-commits/default/config.json

@@ -0,0 +1,15 @@
+{
+    "$schema": "../../component.d.json",
+    "name": "Git hooks",
+    "description": "Execute git-conventional-commits on commit",
+    "paths": [
+        {
+            "from": ".git-hooks",
+            "to": ".git-hooks"
+        },
+        {
+            "from": "git-conventional-commits.yaml",
+            "to": "git-conventional-commits.yaml"
+        }
+    ]
+}

packages/cli/assets/plugins/devcontainer/default/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "Default devcontainer configuration",
     "description": "Open VS Code in a linux container",
-    "suggestedPath": ".devcontainer"
+    "paths": [
+        {
+            "from": ".devcontainer",
+            "to": ".devcontainer"
+        }
+    ]
 }

packages/cli/assets/plugins/github/issue-template/default/config.json

@@ -1,6 +1,11 @@
 {
     "$schema": "../../../component.d.json",
     "name": "Default gitHub issue template",
-    "description": "",
-    "suggestedPath": ".github/ISSUE_TEMPLATE"
+    "description": "FitHub issue template with bug report and feature request",
+    "paths": [
+        {
+            "from": "ISSUE_TEMPLATE",
+            "to": ".github/ISSUE_TEMPLATE"
+        }
+    ]
 }

packages/cli/assets/plugins/github/workflows/default/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../../component.d.json",
     "name": "Default gitHub workflows",
     "description": "Basic github workflows configuration (check, deploy, release)",
-    "suggestedPath": ".github/workflows"
+    "paths": [
+        {
+            "from": "workflows",
+            "to": ".github/workflows"
+        }
+    ]
 }

packages/cli/assets/plugins/gitignore/default/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "Default gitignore",
     "description": "Default gitignore configuration",
-    "suggestedPath": ".gitignore"
+    "paths": [
+        {
+            "from": ".gitignore",
+            "to": ".gitignore"
+        }
+    ]
 }

packages/cli/assets/plugins/license/default/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "MIT License",
     "description": "",
-    "suggestedPath": "LICENSE"
+    "paths": [
+        {
+            "from": "LICENSE",
+            "to": "LICENSE"
+        }
+    ]
 }

packages/cli/assets/plugins/makefile/default/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "Default makefile",
     "description": "Basic makefile with buildnrun command to start a docker app",
-    "suggestedPath": "Makefile"
+    "paths": [
+        {
+            "from": "Makefile",
+            "to": "Makefile"
+        }
+    ]
 }

packages/cli/assets/plugins/packages/empty/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "Empty packages directory",
     "description": "Generates an empty packages directory",
-    "suggestedPath": "packages"
+    "paths": [
+        {
+            "from": "packages",
+            "to": "packages"
+        }
+    ]
 }

packages/cli/assets/plugins/releaserc/default/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "Default semantic-release configuration",
     "description": "Automate versioning and package publishing with semantic-release",
-    "suggestedPath": ".releaserc.json"
+    "paths": [
+        {
+            "from": ".releaserc.json",
+            "to": ".releaserc.json"
+        }
+    ]
 }

packages/cli/assets/plugins/turbo/default/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "Default turbo configuration",
     "description": "Basic steps configuration for turbo (build, lint, dev, ...)",
-    "suggestedPath": "turbo.json"
+    "paths": [
+        {
+            "from": "turbo.json",
+            "to": "turbo.json"
+        }
+    ]
 }

packages/cli/assets/plugins/vscode/default/config.json

@@ -2,5 +2,10 @@
     "$schema": "../../component.d.json",
     "name": "Default vscode configuration",
     "description": "Suggested vscode configuration with format on save",
-    "suggestedPath": ".vscode"
+    "paths": [
+        {
+            "from": ".vscode",
+            "to": ".vscode"
+        }
+    ]
 }

packages/cli/assets/templates/empty-monorepo/config.json

@@ -7,13 +7,12 @@
         "devcontainer/default",
         "app/empty",
         "packages/empty",
-        "githooks/default",
+        "conventional-commits/default",
         "vscode/default",
         "github/workflows/default",
         "github/issue-template/default",
         "gitignore/default",
         "releaserc/default",
-        "git-conventional-commits/default",
         "license/default",
         "makefile/default"
     ]

packages/cli/depcheck.json

@@ -16,6 +16,7 @@
         "@nextui-org/system",
         "@nextui-org/theme",
         "@nextui-org/tooltip",
+        "@nextui-org/divider",
         "@react-aria/ssr",
         "@react-aria/visually-hidden",
         "@tanstack/react-query",

packages/cli/package.json

@@ -84,6 +84,7 @@
         "@nextui-org/button": "^2.0.37",
         "@nextui-org/checkbox": "^2.1.4",
         "@nextui-org/chip": "^2.0.32",
+        "@nextui-org/divider": "^2.0.31",
         "@nextui-org/dropdown": "^2.1.29",
         "@nextui-org/input": "^2.2.4",
         "@nextui-org/link": "^2.0.34",
@@ -97,7 +98,6 @@
         "@react-aria/ssr": "^3.9.5",
         "@react-aria/visually-hidden": "^3.8.14",
         "@rharkor/logger": "^1.3.1",
-        "@rharkor/task": "^1.0.1",
         "@tanstack/react-query": "^5.39.0",
         "@tanstack/react-query-devtools": "^5.39.0",
         "@total-typescript/ts-reset": "^0.5.0",
@@ -115,7 +115,6 @@
         "commander": "^12.1.0",
         "cross-env": "^7.0.3",
         "framer-motion": "^11.0.0",
-        "fs-extra": "^11.2.0",
         "globby": "^14.0.2",
         "lucide-react": "^0.408.0",
         "minimist": "^1.2.8",

packages/cli/src/app/package.json

@@ -1,6 +1,6 @@
 {
     "scripts": {
-        "dev": "next dev"
+        "dev": "next dev --turbo"
     },
     "depcheck": false
 }

packages/cli/src/app/src/api/configuration/_router.ts

@@ -1,8 +1,9 @@
 import { publicProcedure, router } from "@/lib/server/trpc"
 
-import { resetConfiguration, updateConfiguration } from "./mutations"
+import { applyConfiguration, resetConfiguration, updateConfiguration } from "./mutations"
 import { getConfigurationQuery } from "./queries"
 import {
+  applyConfigurationResponseSchema,
   getConfigurationResponseSchema,
   resetConfigurationResponseSchema,
   updateConfigurationRequestSchema,
@@ -16,4 +17,5 @@ export const configurationRouter = router({
     .output(updateConfigurationResponseSchema())
     .mutation(updateConfiguration),
   resetConfiguration: publicProcedure.output(resetConfigurationResponseSchema()).mutation(resetConfiguration),
+  applyConfiguration: publicProcedure.output(applyConfigurationResponseSchema()).mutation(applyConfiguration),
 })

packages/cli/src/app/src/api/configuration/mutations.ts

@@ -1,8 +1,11 @@
 import { z } from "zod"
 
 import { getConfiguration, setConfiguration } from "@/lib/configuration"
+import { env } from "@/lib/env"
+import { pluginsDirectory } from "@/lib/plugins"
 import { handleApiError } from "@/lib/utils/server-utils"
 import { apiInputFromSchema } from "@/types"
+import { applyConfigurationTask } from "@next-boilerplate/scripts/utils/template-config/apply.js"
 
 import { updateConfigurationRequestSchema, updateConfigurationResponseSchema } from "./schemas"
 
@@ -35,3 +38,21 @@ export const resetConfiguration = async ({}: apiInputFromSchema<typeof undefined
     return handleApiError(error)
   }
 }
+
+export const applyConfiguration = async ({}: apiInputFromSchema<typeof undefined>) => {
+  try {
+    const configuration = await getConfiguration()
+
+    //* Apply the configuration
+    await applyConfigurationTask({
+      configFileName: "config.json",
+      pluginsDirectory,
+      root: env.ROOT_PATH,
+    })
+
+    const data: z.infer<ReturnType<typeof updateConfigurationResponseSchema>> = { configuration }
+    return data
+  } catch (error: unknown) {
+    return handleApiError(error)
+  }
+}

packages/cli/src/app/src/api/configuration/schemas.ts

@@ -5,13 +5,7 @@ import { fullPluginSchema } from "@/lib/plugins/store"
 export const configurationSchema = () =>
   z.object({
     name: z.string().optional(),
-    plugins: z
-      .array(
-        fullPluginSchema.extend({
-          outputPath: z.string().optional(),
-        })
-      )
-      .optional(),
+    plugins: z.array(fullPluginSchema).optional(),
   })
 export type TConfiguration = z.infer<ReturnType<typeof configurationSchema>>
 
@@ -21,3 +15,8 @@ export const updateConfigurationRequestSchema = () => z.object({ configuration:
 export const updateConfigurationResponseSchema = () => z.object({ configuration: configurationSchema() })
 
 export const resetConfigurationResponseSchema = () => z.object({ configuration: configurationSchema() })
+
+export const applyConfigurationResponseSchema = () =>
+  z.object({
+    configuration: configurationSchema(),
+  })

packages/cli/src/app/src/app/components/current-configuration.dr.ts

@@ -13,6 +13,9 @@ export const CurrentConfigurationDr = dictionaryRequirements(
     outputPath: true,
     save: true,
     close: true,
+    pluginSettings: true,
+    apply: true,
+    configurationApplied: true,
   },
   NoConfigurationDr,
   HeaderDr