@silexlabs/silex 3.0.6 → 3.0.8

package/src/ts/plugins/server/GitlabHostingConnector.ts

@@ -73,13 +73,19 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
           - if: '$CI_PIPELINE_SOURCE == "trigger"'
     `
     try {
+      job.message = `Checking if ${pathYml} needs to be created or updated...`
+      job.logs[0].push(job.message)
       const originalCi = await this.readFile(session, websiteId, pathYml)
       if(originalCi.toString().startsWith(SILEX_OVERWRITE_NOTICE)) {
+        job.message = `Updating ${pathYml}...`
+        job.logs[0].push(job.message)
         await this.updateFile(session, websiteId, pathYml, contentYml)
       }
     } catch (e) {
       // If the file .gitlab-ci.yml does not exist, create it, otherwise do nothing (do not overwriting existing one)
       if (e.statusCode === 404 || e.httpStatusCode === 404 || e.message.endsWith('A file with this name doesn\'t exist')) {
+        job.message = `Creating ${pathYml}...`
+        job.logs[0].push(job.message)
         await this.createFile(session, websiteId, pathYml, contentYml)
       } else {
         jobError(job.jobId, e.message)

package/src/ts/server/api/publicationApi.ts

@@ -127,12 +127,12 @@ export default function (config: ServerConfig): Router {
         const fileWithContent = file as ClientSideFileWithContent
         const fileWithSrc = file as ClientSideFileWithSrc
         if(!fileWithContent.content && !fileWithSrc.src) throw new PublicationError('Missing content or src in file', 400)
-        const src = fileWithSrc.src
+        const content = fileWithContent.content ?? await storage.readAsset(session, websiteId, fileWithSrc.src)
         return {
           // Destination
           path: file.permalink ?? file.path,
           // Content
-          content: fileWithContent.content ?? await storage.readAsset(session, websiteId, fileWithSrc.src),
+          content,
         }
       }))