Merge pull request #986 from wherelse/fix-folderpath

fix: preview folder path
getgridea · May 17, 2022 · 31e14d5 · 31e14d5
2 parents 1034e40 + 4d842d1
commit 31e14d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/server/app.ts b/src/server/app.ts
@@ -218,7 +218,7 @@ export default class App {
       // Site folder exists
       if (fse.pathExistsSync(this.appDir)) {
         // Check if the `images`, `config`, 'output', `post-images`, 'posts', 'themes', 'static' folder exists, if it does not exist, copy it from default-files
-        ['images', 'config', 'output', 'post-images', 'posts', 'themes', 'static'].forEach((folder: string) => {
+        ['images', 'config', 'post-images', 'posts', 'themes', 'static'].forEach((folder: string) => {
           const folderPath = path.join(this.appDir, folder)
           if (!fse.pathExistsSync(folderPath)) {
             fse.copySync(
@@ -235,7 +235,7 @@ export default class App {
         this.checkTheme('paper')
 
         // move output/favicon.ico to Gridea/favicon.ico
-        const outputFavicon = path.join(this.appDir, 'output', 'favicon.ico')
+        const outputFavicon = path.join(this.buildDir, 'favicon.ico')
         const sourceFavicon = path.join(this.appDir, 'favicon.ico')
         const existFaviconOutput = fse.pathExistsSync(outputFavicon)
         const existFaviconSource = fse.pathExistsSync(sourceFavicon)
@@ -288,8 +288,8 @@ export default class App {
       const routesStack = routers.stack
       routesStack.forEach(removeMiddleware)
     }
-    this.previewServer.use(express.static(`${this.appDir}/output`))
-    console.log(`Preview server: Static dir change to ${this.appDir}/output`)
+    this.previewServer.use(express.static(`${this.buildDir}`))
+    console.log(`Preview server: Static dir change to ${this.buildDir}`)
   }
 
   private initEvents(): void {

diff --git a/src/server/plugins/deploys/sftp.ts b/src/server/plugins/deploys/sftp.ts
@@ -109,7 +109,7 @@ export default class SftpDeploy extends Model {
       connectConfig.password = setting.password
     }
 
-    const localPath = normalizePath(path.join(this.appDir, 'output'))
+    const localPath = normalizePath(path.join(this.buildDir))
     const remotePath = normalizePath(path.join(setting.remotePath))
 
     try {

diff --git a/src/server/renderer.ts b/src/server/renderer.ts
@@ -85,7 +85,7 @@ export default class Renderer extends Model {
   async loadConfig() {
     this.themePath = urlJoin(this.appDir, 'themes', this.db.themeConfig.themeName)
 
-    fse.ensureDirSync(urlJoin(this.appDir, 'output'))
+    fse.ensureDirSync(urlJoin(this.outputDir))
   }
 
   /**