Merge pull request #171 from NicDoesCode/develop

Merge DEV release

Author: NicDoesCode

.gitignore

@@ -7,4 +7,5 @@ node_modules/
 cert/
 *.instance.*
 .env
-wwwroot/docs/
+wwwroot/docs/
+wwwroot/config/

.vscode/launch.json

@@ -4,6 +4,13 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Launch Chrome (HTTPS)",
+            "request": "launch",
+            "type": "chrome",
+            "url": "https://localhost:8443",
+            "webRoot": "${workspaceFolder}/wwwroot"
+        },
         {
             "name": "Launch Firefox (HTTP)",
             "type": "firefox",

app.js

@@ -1,7 +1,11 @@
-const fs = require('fs');
-const path = require('path');
-const express = require('express');
-const https = require('https');
+import path from "path";
+import fs from "fs";
+import url from 'url';
+import express from 'express';
+import https from 'https';
+
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+
 const app = express();
 const portHttp = 8080;
 const portHttps = 8443;

deploy-to-azure-storage.js build/deploy-to-azure-storage.jsdeploy-to-azure-storage.js renamed to build/deploy-to-azure-storage.js

@@ -0,0 +1,136 @@
+import HtmlWebpackPlugin from "html-webpack-plugin";
+import Minimatch from 'minimatch';
+
+const PLUGIN_NAME = 'HtmlWebpackExcludeScriptsPlugin';
+
+export default class HtmlWebpackExcludeScriptsPlugin {
+
+
+    /** @type {{skipAssets: Array<string|RegExp|Function>, excludeAssets: Array<string|RegExp|Function>}} */
+    #config;
+
+
+    /**
+     * @param {{skipAssets: Array<string|RegExp|Function>, excludeAssets: Array<string|RegExp|Function>}} config 
+     */
+    constructor(config) {
+        this.#config = config ?? [];
+    }
+
+
+    apply(compiler) {
+
+        if (compiler.hooks) {
+            // webpack 4 support
+            compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+
+                console.log('WP4'); // TMP 
+                if (compilation.outputName === 'index.html') {
+                    console.log(compilation); // TMP 
+                    // data.plugin.userOptions.chunks.forEach(c => console.log(c));
+                }
+
+                // if (compilation.hooks.htmlWebpackPluginAlterAssetTags) {
+                if (compilation.hooks.htmlWebpackPluginAlterAssetTags) {
+                    // html webpack 3
+                    console.log('html webpack 3'); // TMP 
+                    compilation.hooks.beforeAssetTagGeneration.tapAsync(PLUGIN_NAME, (data, callback) => {
+                        /** @type {Array<string|RegExp|Function>} */
+                        const filters = [
+                            ...(this.#config.skipAssets || []),
+                            ...(this.#config.excludeAssets || []),
+                            ...(data.plugin.options.skipAssets || []),
+                            ...(data.plugin.options.excludeAssets || []),
+                        ];
+                        data.head = this.#skipAssets(data.head, filters);
+                        data.body = this.#skipAssets(data.body, filters);
+                        return callback(null, data);
+                    });
+                } else if (HtmlWebpackPlugin && HtmlWebpackPlugin.getHooks) {
+                    // html-webpack 4
+                    console.log('html-webpack 4'); // TMP 
+                    const hooks = HtmlWebpackPlugin.getHooks(compilation);
+                    // hooks.alterAssetTags.tapAsync(PLUGIN_NAME, (data, callback) => {
+                    hooks.alterAssetTags.tapAsync(PLUGIN_NAME, (data, callback) => {
+                        // console.log(data.outputName);
+                        if (data.outputName === 'index.html') {
+                            console.log(data); // TMP 
+                            // data.plugin.userOptions.chunks.forEach(c => console.log(c));
+                        }
+                        // data.assetTags.scripts.forEach(s => console.log(s));
+                        // /** @type {Array<string|RegExp|Function>} */
+                        // const filters = [
+                        //     ...(this.#config.skipAssets || []),
+                        //     ...(this.#config.excludeAssets || []),
+                        //     ...(data.plugin['options'].skipAssets || []),
+                        //     ...(data.plugin['options'].excludeAssets || []),
+                        // ];
+                        // data.assetTags.scripts = this.#skipAssets(data.assetTags.scripts, filters);
+                        // data.assetTags.styles = this.#skipAssets(data.assetTags.styles, filters);
+                        // data.assetTags.meta = this.#skipAssets(data.assetTags.meta, filters);
+                        // return callback(null, data);
+                    });
+                } else {
+                    throw new Error('Cannot find appropriate compilation hook');
+                }
+            });
+
+        } else {
+            console.log('WP5'); // TMP 
+            // Hook into the html-webpack-plugin processing
+            compiler.plugin('compilation', (compilation) => {
+                compilation.plugin('html-webpack-plugin-alter-asset-tags', (htmlPluginData, callback) => {
+                    /** @type {Array<string|RegExp|Function>} */
+                    const filters = [
+                        ...(this.#config.skipAssets || []),
+                        ...(this.#config.excludeAssets || []),
+                        ...(htmlPluginData.plugin.options.skipAssets || []),
+                        ...(htmlPluginData.plugin.options.excludeAssets || []),
+                    ];
+                    htmlPluginData.head = this.#skipAssets(htmlPluginData.head, filters);
+                    htmlPluginData.body = this.#skipAssets(htmlPluginData.body, filters);
+                    return callback(null, htmlPluginData);
+                });
+            });
+        }
+
+
+    }
+
+    /**
+     * @param {HtmlWebpackPlugin.HtmlTagObject[]} assets 
+     * @param {Array<string|RegExp|Function>} matchers 
+     * @returns {HtmlWebpackPlugin.HtmlTagObject[]}
+     */
+    #skipAssets(assets, matchers) {
+        return assets.filter((asset) => {
+            const assetUrl = `${(asset.attributes.src ?? asset.attributes.href ?? '')}`;
+            console.log('assetUrl', assetUrl);
+            const skipped = matchers.some((matcher) => {
+                // if (!matcher) {
+                //     return false;
+                // }
+                // const assetUrl = `${(asset.attributes.src ?? asset.attributes.href ?? '')}`;
+                // if (typeof matcher === 'string') {
+                //     return minimatch(assetUrl, matcher);
+                // }
+                // if (matcher.constructor && matcher.constructor.name === 'RegExp') {
+                //     /** @type {RegExp} */
+                //     const regexMatcher = matcher;
+                //     return !!(assetUrl.match(regexMatcher));
+                // }
+                // if (typeof matcher === 'function') {
+                //     const matchesCallback = matcher(asset);
+                //     return !!(matchesCallback);
+                // }
+                return false;
+            });
+            return !skipped;
+        });
+    }
+
+}
+
+/** 
+ * @typedef {object} HtmlWebpackExcludeScriptsPluginFilters
+ */

deploy.js build/deploy.jsdeploy.js renamed to build/deploy.js

@@ -0,0 +1,51 @@
+import path from "path";
+import fs from "fs";
+import url from 'url';
+import dotenv from 'dotenv';
+
+const __filename = url.fileURLToPath(import.meta.url);
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+
+// Load environment variables
+dotenv.config();
+
+
+function run() {
+    makeConfig();
+    makeGoogleAnalyticsConfig();
+}
+
+
+function makeConfig() {
+    const patreonHandle = process.env[`HANDLE_PATREON`] ?? null;
+    const kofiHandle = process.env[`HANDLE_KOFI`] ?? null;
+
+    const config = {
+        patreonHandle: patreonHandle,
+        kofiHandle: kofiHandle
+    };
+    const configString = JSON.stringify(config);
+    const distDir = path.resolve(__dirname, '..', 'dist');
+    const targetDir = path.join(distDir, 'config');
+    if (!fs.existsSync(targetDir)) fs.mkdirSync(targetDir);
+    const filePath = path.join(targetDir, 'config.json');
+    fs.writeFileSync(filePath, configString);
+}
+
+function makeGoogleAnalyticsConfig() {
+    const useGA = (process.env[`GOOGLE_ANALYTICS_USE`] && process.env[`GOOGLE_ANALYTICS_USE`].toLowerCase() === 'true');
+    const gaKey = process.env[`GOOGLE_ANALYTICS_KEY`] ?? null;
+
+    const gaConfig = {
+        useGoogleAnalytics: (useGA && gaKey) ? true : false,
+        key: gaKey ?? 'YOUR_KEY'
+    };
+    const gaString = JSON.stringify(gaConfig);
+    const distDir = path.resolve(__dirname, '..', 'dist');
+    const targetDir = path.join(distDir, 'config');
+    if (!fs.existsSync(targetDir)) fs.mkdirSync(targetDir);
+    const filePath = path.join(targetDir, 'googleAnalytics.json');
+    fs.writeFileSync(filePath, gaString);
+}
+
+run();

build/plugins/HtmlWebpackExcludeScriptsPlugin.js

@@ -0,0 +1,66 @@
+import { exec } from 'node:child_process';
+
+const rxGone = /:\sgone\]/;
+const rxInUse = /^\*\s/;
+const rxBranch = /^\s+([^\s]+)/;
+
+async function pruneAsync() {
+    console.log('> Pruning branches');
+    return new Promise((resolve, reject) => {
+        exec('git remote prune origin', (error, stdout, stderr) => {
+            if (stderr || error) {
+                reject('Error when pruning branches.');
+            } else if (stdout) {
+                resolve();
+            }
+        });
+    });
+}
+
+/**
+ * @returns {Promise<string[]>}
+ */
+async function getBranchesNoLongerOnOriginAsync() {
+    console.log('> Getting branches no longer on origin');
+    return new Promise((resolve, reject) => {
+        exec('git branch -vv', (error, stdout, stderr) => {
+            if (stderr || error) {
+                reject('Error when getting branches.');
+            } else if (stdout) {
+                const lines = stdout.replace('\r', '').split('\n')
+                    .filter((line) => rxGone.test(line))
+                    .filter((line) => !rxInUse.test(line))
+                    .filter((line) => rxBranch.test(line));
+                resolve(lines.map((line) => rxBranch.exec(line)[1]));
+            }
+        });
+    });
+}
+
+/**
+ * @param {string[]} arrayOfBranches 
+ */
+async function deleteBranchesAsync(arrayOfBranches) {
+    console.log('> Removing branches no longer on origin');
+    if (arrayOfBranches.length > 0) {
+        arrayOfBranches.forEach((branchName) => {
+            exec(`git branch -d "${branchName}"`, (error, stdout, stderr) => {
+                if (stderr || error) {
+                    console.error(`  - Error when deleting branch: ${branchName}`, stderr);
+                } else if (stdout) {
+                    console.log(`  - Deleted: ${branchName}`);
+                }
+            });
+        });
+    } else {
+        console.log('> No branches to remove');
+    }
+}
+
+async function runAsync() {
+    await pruneAsync();
+    const branches = await getBranchesNoLongerOnOriginAsync();
+    await deleteBranchesAsync(branches);
+}
+
+runAsync();