gardenjs 1.6.2 → 1.6.3

package/bin/servegarden.js

@@ -7,40 +7,22 @@ import { exec } from 'node:child_process'
 import fs from 'node:fs'
 import { promisify } from 'node:util'
 import path, { dirname } from 'path'
+import { createServer, createTsServer } from '../src/server.js'
 import { fileURLToPath } from 'url'
-import { createServer } from '../src/server.js'
+
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
 const exampleSourceFolder = path.resolve(__dirname, '../examples') + '/'
 const execAsync = promisify(exec)
 
 if (fs.existsSync('./garden.config.js')) {
-  createNodeViteServer()
+  await createServer()
 } else if (fs.existsSync('./garden.config.ts')) {
-  try {
-    const tsNode = await import('ts-node')
-    tsNode.register({
-      transpileOnly: true,
-      compilerOptions: {
-        module: 'ESNext',
-      },
-    })
-    createNodeViteServer()
-  } catch (e) {
-    throw new Error(
-      `For typescript support you need to install ts-node and typescript\n\n` +
-        `npm install --save-dev ts-node typescript\n\n` +
-        `Original error: ${e.message}`
-    )
-  }
+  await createTsServer()
 } else {
   runSetupScript()
 }
 
-async function createNodeViteServer() {
-  await createServer()
-}
-
 async function runSetupScript() {
   console.clear()
   console.log('Welcome to the garden setup process')
@@ -48,13 +30,29 @@ async function runSetupScript() {
   separator()
   console.log('')
 
-  const filetype = await select({
-    message: 'Do you want to use typescript or javascript',
-    choices: [
-      { name: 'javascript', value: 'javascript', checked: true },
-      { name: 'typescript', value: 'typescript' },
-    ],
-  })
+  const isTypescriptProject =
+    fs.existsSync('./tsconfig.json') || fs.existsSync('vite.config.ts')
+  const filetype = isTypescriptProject
+    ? await select({
+        message: 'Do you want to use TypeScript or JavaScript',
+        choices: [
+          { name: 'TypeScript', value: 'typescript' },
+          {
+            name: 'JavaScript',
+            value: 'javascript',
+          },
+        ],
+      })
+    : await select({
+        message: 'Do you want to use JavaScript or TypeScript',
+        choices: [
+          {
+            name: 'JavaScript',
+            value: 'javascript',
+          },
+          { name: 'TypeScript', value: 'typescript' },
+        ],
+      })
   const gardenFile =
     filetype === 'javascript' ? 'garden.config.js' : 'garden.config.ts'
   const gardenViteFile =
@@ -171,7 +169,8 @@ async function runSetupScript() {
   })
 
   console.log('')
-  console.log('Done. Edit garden.config.js file according to your needs.')
+  console.log(`Done. Edit ${gardenFile} file according to your needs.`)
+  console.log('')
   console.log('Run npm run garden again, to start gardenjs.')
   separator()
   console.log('Happy gardening!')

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "gardenjs",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "A component library explorer for UI development, testing and documentation.",
-  "repository": "https://github.com/gardenjs/gardenjs",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gardenjs/gardenjs.git"
+  },
   "homepage": "https://gardenjs.org/",
   "main": "index.js",
   "type": "module",
@@ -64,15 +67,15 @@
     "prettier-plugin-svelte": "3.4.0",
     "sass": "1.89.2",
     "svelte": "5.36.7",
-    "ts-node": "^10.9.2",
-    "typescript": "5.8.3",
     "vite": "7.0.5"
   },
   "dependencies": {
     "@inquirer/checkbox": "1.5.0",
     "@inquirer/prompts": "3.3.0",
     "@inquirer/select": "^2.0.0",
+    "build": "^0.1.4",
     "chokidar": "^5.0.0",
+    "execa": "^9.6.1",
     "highlight.js": "11.11.1",
     "marked": "4.3.0",
     "node-watch": "0.7.4",
@@ -80,11 +83,11 @@
     "vite-node": "3.2.4"
   },
   "peerDependencies": {
-    "ts-node": "^10.0.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "tsx": "^4.21.0"
   },
   "peerDependenciesMeta": {
-    "ts-node": {
+    "tsx": {
       "optional": true
     },
     "typescript": {

package/src/runTsServer.js

@@ -0,0 +1,3 @@
+import { createServer } from './server.js'
+
+await createServer()

package/src/server.js

@@ -1,12 +1,32 @@
 import { getConfig } from './config.js'
 import { fileURLToPath } from 'url'
-const __filename = fileURLToPath(import.meta.url)
 import { dirname } from 'path'
-import path from 'path'
-const __dirname = dirname(__filename)
-
+import path, { join } from 'path'
 import open from 'open'
+import { execa } from 'execa'
 import { createServer as createViteServer } from 'vite'
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+export async function createTsServer() {
+  const { tsconfig } = await getConfig()
+  try {
+    const tsconfigPath = join(process.cwd(), tsconfig ?? 'tsconfig.json')
+    await execa(
+      'tsx',
+      ['--tsconfig', tsconfigPath, path.resolve(__dirname, './runTsServer.js')],
+      {
+        stdio: 'inherit',
+      }
+    )
+  } catch (e) {
+    throw new Error(
+      `For typescript support you need to install tsx and typescript\n\n` +
+        `npm install --save-dev tsx typescript\n\n` +
+        `Original error: ${e.message}`
+    )
+  }
+}
 
 export async function createServer() {
   const { serverport, vite_config, devmodus, no_open_browser } =