Merge branch 'master' of github.com:simpleid/simpleid.github.io

Author: kelvinmo

.devcontainer/devcontainer.json

@@ -0,0 +1 @@
+{"image":"mcr.microsoft.com/devcontainers/javascript-node:22"}

.eleventy.js

@@ -6,7 +6,6 @@ const html_entities = require('html-entities');
 const searchFilter = require("./_src/searchFilter");
 
 const pluginSyntaxHighlight = require('@11ty/eleventy-plugin-syntaxhighlight');
-const pluginSass = require('eleventy-sass');
 const pluginRss = require('@11ty/eleventy-plugin-rss');
 const pluginNavigation = require('@11ty/eleventy-navigation');
 const pluginToc = require('eleventy-plugin-toc');
@@ -60,18 +59,38 @@ module.exports = function(conf) {
     conf.addLiquidFilter('getNewestCollectionItemDate', pluginRss.getNewestCollectionItemDate);
     conf.addLiquidFilter('date_to_rfc822', pluginRss.dateToRfc822);
 
+    // Extensions
+    conf.addTemplateFormats('scss');
+    conf.addExtension('scss', {
+        outputFileExtension: 'css',
+        useLayouts: false,
+        compile: async function(inputContent, inputPath) {
+            let parsedPath = path.parse(inputPath);
+            if (parsedPath.name.startsWith('_')) return;
+
+            let result = sass.compileString(inputContent, {
+                loadPaths: [
+                    parsedPath.dir || ".",
+                    '_sass'
+                ],
+                style: 'compressed'
+            });
+
+            this.addDependencies(inputPath, result.loadedUrls);
+
+            return async (data) => {
+                return result.css;
+            };
+        }
+    });
+
     // Plugins
     conf.addPlugin(pluginSyntaxHighlight, {
         preAttributes: {
             tabindex: 0,
             'data-highlight': 'true'
         }
     });
-    conf.addPlugin(pluginSass, {
-        sass: {
-            loadPaths: [ '_sass' ]
-        }
-    });
     conf.addPlugin(pluginNavigation);
     conf.addPlugin(pluginToc);
 

.eleventyignore

@@ -1 +1,2 @@
 README.md
+.github

.github/workflows/build.yml

@@ -20,14 +20,16 @@ jobs:
       - name: Set up nodejs
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version-file: '.nvmrc'
           cache: npm
 
       - name: Install dependencies
         run: npm install
 
       - name: Run Eleventy build
         run: npm run-script build
+        env:
+          NODE_OPTIONS: "--experimental-require-module"
 
       - name: Upload build output
         uses: actions/upload-pages-artifact@v3

.nvmrc

@@ -0,0 +1 @@
+22

docs/2/common-problems.md

@@ -23,7 +23,7 @@ If login verification is enabled and you have lost the device that generates the
 
 ```yaml
 otp: 
-    type: recovery
+    recovery: true
 ```
 
 2. You will now be able to [log into SimpleID](/docs/2/login) without the verification code.

docs/2/installing.md

@@ -110,12 +110,12 @@ openssl rsa -in private.pem -out public.pem -pubout
 ```
 
 The private and public keys, `private.pem` and `public.pem` have to be
-converted into separate JSON Web Key Sets. The easiest way of doing this
-is to use the `jwkstool` utility that is included with the SimpleJWT library.
+converted into separate JSON Web Key Sets.  One way of doing this is using
+the [jwkstool utility](https://github.com/kelvinmo/jwkstool).
 
 ```shell
-www/vendor/bin/jwkstool add -c private.json private.pem
-www/vendor/bin/jwkstool add -c public.json public.pem
+php jwkstool.phar add --generate-id=thumbnail -c private.json private.pem
+php jwkstool.phar add --generate-id=thumbnail -c public.json public.pem
 rm private.pem
 rm public.pem
 ```

docs/2/system-requirements.md

@@ -33,7 +33,8 @@ To host a SimpleID installation requires:
     - xmlreader;
     - openssl;
     - hash;
-    - sodium.
+    - sodium;
+    - intl.
 5. PHP needs to be configured so that <code>register_globals</code> and <code>short_open_tag</code> are switched **off**. See the [PHP manual](http://www.php.net/manual/en/security.globals.php) for further details.
 6. If you are using [PHP Suhosin](http://www.hardened-php.net/suhosin/index.html), or some other query filter, you may need to increase the [`suhosin.get.max_value_length`](http://www.hardened-php.net/suhosin/configuration.html#suhosin.get.max_value_length) configuration to at least 1024, as SimpleID uses very long query strings.