1.3.2

Author: Nixinova

changelog.md

@@ -1,13 +1,15 @@
 # Changelog
 
-## Next
+## 1.3.2
+*2024-05-08*
 - Fixed `nowiki` content not being fully unparsed.
 - Fixed output files not having the correct path to the default stylesheet.
 - Fixed URLs in output files being absolute.
 - Fixed various issues with incorrect outputted file names.
 - Fixed `||` not being treated as valid table cell syntax.
 - Fixed front matter being generated even when config option `eleventy` was set to `false`.
 - Fixed defaults not being used when `compile` called from CLI.
+- Unmarked Eleventy as a peer dependency.
 
 ## 1.3.1
 *2024-05-03*

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wikity",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Compile wikitext to HTML: wikitext as a templating language.",
   "main": "dist/index.js",
   "scripts": {
@@ -44,14 +44,6 @@
     "glob": "^8.1.0",
     "html-formatter": "^0.1.9"
   },
-  "peerDependencies": {
-    "@11ty/eleventy": ">=0.10.0"
-  },
-  "peerDependenciesMeta": {
-    "@11ty/eleventy": {
-      "optional": true
-    }
-  },
   "devDependencies": {
     "@types/dateformat": "^3.0.1",
     "@types/dedent": "^0.7.2",

package.json

@@ -69,12 +69,13 @@ Use Wikity along with Eleventy to have all your wiki files compiled during the b
 // .eleventy.js (eleventy's configuration file)
 const wikity = require('wikity');
 module.exports = function (eleventyConfig) {
-    const wikiFolder = 'src';
-    const templatesFolder = 'templates', imagesFolder = 'images', outputFolder = 'wikity-out'; // defaults
-    const wikityOptions = { templatesFolder, imagesFolder, outputFolder };
-    const wikityPlugin = () => wikity.compile(wikiFolder, { eleventy: true, ...wikityOptions });
+    const rootFolder = 'src';
+    const templatesFolder = 'templates', imagesFolder = 'images'; // defaults; relative to root folder
+    const outputFolder = 'wikity-out'; // default
+    const wikityOptions = { eleventy: true, templatesFolder, imagesFolder, outputFolder };
+    const wikityPlugin = () => wikity.compile(rootFolder, wikityOptions);
     eleventyConfig.addPlugin(wikityPlugin);
-    eleventyConfig.addPassthroughCopy({[imagesFolder]: 'wiki/' + imagesFolder}); // Eleventy does not pass through images by default
+    eleventyConfig.addPassthroughCopy({ 'src/images': 'wiki/' + imagesFolder }); // Eleventy does not pass through images by default
 }
 ```
 
@@ -83,10 +84,10 @@ The above will use the following file structure (with some example wiki files gi
 - `src/`
   - `templates/`: Directory for wiki templates (called like `{{this}}`)
   - `images/`: Directory to place images (called like `[[File:this]]`)
-  - `wikity-out/`: File templates compiled from the `.wiki` files (add this to `.gitignore`)
   - `Index.wiki`: Example file
   - `Other_Page.wiki`: Example other file
-- `wiki/`: Output HTML files compiled from wikity-out (add this to `.gitignore`)
+- `wikity-out/`: File templates compiled from the `.wiki` files (add this to `.gitignore`)
+- `wiki/`: Output HTML files compiled from `wikity-out/` (add this to `.gitignore`)
 
 (View the above starting at the URL path `/wiki/` when ran in an HTTP server.)
 

readme.md

@@ -39,7 +39,7 @@ __TOC__
 </div>
 
 <div style="border:1px solid">
-<h1>Rule</h1>
+<h1>HorizontalRule</h1>
 -----
 </div>