Merge pull request #31 from this-is-tobi/develop

fix: fix theme templates copy

.github/workflows/ci.yml

@@ -68,7 +68,7 @@ jobs:
       packages: write
     with:
       REGISTRY_NAMESPACE: ${{ needs.expose-vars.outputs.REGISTRY_NAMESPACE }}
-      PR_NUMBER: ${{ github.event.pull_request.number || github.event.number || null }}
+      PR_NUMBER: ${{ github.event.pull_request.number || github.event.number || '' }}
       MULTI_ARCH: ${{ needs.expose-vars.outputs.MULTI_ARCH == 'true' }}
       USE_QEMU: ${{ needs.expose-vars.outputs.USE_QEMU == 'true' }}
 

src/lib/prepare.spec.ts

@@ -35,7 +35,7 @@ vi.mock('../utils/const.js', () => ({
   FORKS_FILE: '/tmp/docpress/mock/docs/forks.md',
   VITEPRESS_CONFIG: '/tmp/docpress/mock/.vitepress/config.js',
   VITEPRESS_THEME: '/tmp/docpress/mock/.vitepress/theme',
-  TEMPLATE_THEME: resolve(import.meta.dirname, '../templates/theme'),
+  TEMPLATE_THEME: resolve(import.meta.dirname, '../../public/templates/theme'),
 }))
 vi.mock('./git.js', async importOriginal => ({
   ...await importOriginal<typeof import('../utils/functions.js')>(),

src/lib/prepare.ts

@@ -2,7 +2,7 @@ import { basename, dirname, parse, resolve } from 'node:path'
 import { appendFileSync, cpSync, readdirSync, readFileSync, renameSync, statSync, writeFileSync } from 'node:fs'
 import YAML from 'yaml'
 import type { defineConfig } from 'vitepress'
-import { generateFile } from '../templates/index.js'
+import { generateFile } from '../utils/templates.js'
 import type { GlobalOpts } from '../schemas/global.js'
 import type { getUserInfos } from '../utils/functions.js'
 import { createDir, extractFiles, getMdFiles, prettify } from '../utils/functions.js'
@@ -241,10 +241,8 @@ export function generateVitepressFiles(vitepressConfig: Partial<ReturnType<typeo
   log(`   Generate index file.`, 'info')
   writeFileSync(INDEX_FILE, separator.concat(YAML.stringify(index), separator))
   log(`   Add Docpress theme files.`, 'info')
-  const templates = extractFiles(TEMPLATE_THEME)
-  for (const filePath of templates) {
-    const relativePath = filePath.replace(`${TEMPLATE_THEME}/`, '')
-    log(`   Processing file '${resolve(VITEPRESS_THEME, relativePath)}'.`, 'debug')
-    generateFile(resolve(TEMPLATE_THEME, filePath), resolve(VITEPRESS_THEME, relativePath))
-  }
+  return extractFiles(TEMPLATE_THEME).forEach((path) => {
+    const relativePath = path.replace(`${TEMPLATE_THEME}/`, '')
+    generateFile(path, resolve(VITEPRESS_THEME, relativePath))
+  })
 }

src/utils/const.ts

@@ -18,4 +18,7 @@ export const VITEPRESS_THEME = resolve(process.cwd(), 'docpress/.vitepress/theme
 
 export const VITEPRESS_USER_THEME = resolve(process.cwd(), 'docpress/.vitepress/theme/extras')
 
-export const TEMPLATE_THEME = resolve(import.meta.dirname, '../templates/theme')
+// eslint-disable-next-line dot-notation
+export const TEMPLATE_THEME = process.env['NODE_ENV'] === 'development'
+  ? resolve(import.meta.dirname, '../../public/templates/theme')
+  : resolve(import.meta.dirname, './templates/theme')

src/templates/index.ts → src/utils/templates.ts

@@ -1,6 +1,6 @@
 import { readFileSync, writeFileSync } from 'node:fs'
 import { dirname } from 'node:path'
-import { createDir } from '../utils/functions.js'
+import { createDir } from './functions.js'
 
 export function generateFile(src: string, dest: string) {
   const content = readFileSync(src, { encoding: 'utf8' })

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "baseUrl": "./",
-    "rootDir": "./src",
+    "rootDirs": ["./src", "./public"],
     "types": [
       "node",
       "vite/client",
@@ -48,6 +48,7 @@
   "include": [
     "./src/**/*.ts",
     "./src/**/*.d.ts",
+    "./public/**/*.ts",
   ],
   "exclude": [
     "./src/**/*.spec.ts",