Merge branch 'release/0.0.7'

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.0.6",
+  "version": "0.0.7",
   "workspaces": [
     "packages/*",
     "examples/*"

packages/plugin-sails-content/lib/generate-content.js

@@ -3,7 +3,8 @@ const path = require('path')
 const render = require('./render')
 const writeHtmlToOutput = require('./write-html-to-output')
 
-async function generateContent(config) {
+async function generateContent(sails) {
+  const config = sails.config.content
   config.outputDir = config.outputDir ? config.outputDir : '.tmp/public'
   const files = await fs.readdir(config.inputDir)
 
@@ -18,13 +19,14 @@ async function generateContent(config) {
         outputDir: path.join(config.outputDir, file)
       })
     } else if (fileStats.isFile() && file.toLowerCase().endsWith('.md')) {
-      const { data, renderedHtml } = await render(filePath, config.layout)
+      const { renderedHtml } = await render(sails, filePath, config.layout)
+
       const outputFilePath = await writeHtmlToOutput(
         renderedHtml,
         file,
         config.inputDir
       )
-      // @ts-ignore
+
       sails.log.verbose(
         `[sails:content] Processed ${filePath} -> ${outputFilePath}`
       )

packages/plugin-sails-content/lib/index.js

@@ -1,13 +1,13 @@
 const generateContent = require('./generate-content')
-module.exports = function pluginSailsContent(config) {
+module.exports = function pluginSailsContent(sails) {
   return {
     name: 'sails:content',
     setup(api) {
       api.onDevCompileDone(async function () {
-        await generateContent(config)
+        await generateContent(sails)
       })
       api.onAfterBuild(async function () {
-        await generateContent(config)
+        await generateContent(sails)
       })
     }
   }

packages/plugin-sails-content/lib/render.js

@@ -1,9 +1,8 @@
 const fs = require('fs/promises')
 const matter = require('gray-matter')
 const showdown = require('showdown')
-const ejs = require('ejs')
 
-async function render(mdFile, layout) {
+async function render(sails, mdFile, layout) {
   const fileContent = await fs.readFile(mdFile, { encoding: 'utf8' })
   const { data, content } = matter(fileContent)
 
@@ -14,7 +13,11 @@ async function render(mdFile, layout) {
 
   const layoutContent = await fs.readFile(layout, { encoding: 'utf8' })
 
-  const renderedHtml = ejs.render(layoutContent, { data, content: htmlContent })
+  const renderedHtml = await sails.renderView(layoutContent, {
+    layout: false,
+    data,
+    content: htmlContent
+  })
 
   return { data, renderedHtml }
 }

packages/plugin-sails-content/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plugin-sails-content",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Sails Content plugin for Rsbuild",
   "main": "lib/index.js",
   "scripts": {
@@ -21,7 +21,6 @@
   "author": "Kelvin Omereshone <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "ejs": "^3.1.9",
     "gray-matter": "^4.0.3",
     "showdown": "^2.1.0"
   }

packages/sails-hook-content/lib/index.js

@@ -19,9 +19,7 @@ module.exports = function defineSailsContentHook(sails) {
     initialize: async function () {
       sails.log.info('Initializing custom hook (`sails-content`)')
       if (sails.config.content.output == 'static') {
-        sails.config.shipwright.build.plugins.push(
-          pluginSailsContent(sails.config.content)
-        )
+        sails.config.shipwright.build.plugins.push(pluginSailsContent(sails))
       }
     }
   }

packages/sails-hook-content/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sails-hook-content",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Sails hook for Sails Content",
   "main": "lib/index.js",
   "scripts": {
@@ -13,6 +13,6 @@
     "hookName": "content"
   },
   "dependencies": {
-    "plugin-sails-content": "^0.0.5"
+    "plugin-sails-content": "^0.0.6"
   }
 }