Merge pull request #162 from xtremespb/core_110821

Bugfixes and UX improvements
xtremespb · Nov 5, 2021 · 7cbc997 · 7cbc997
2 parents 00790fb + a0e82f6
commit 7cbc997
Show file tree

Hide file tree

Showing 26 changed files with 2,342 additions and 2,032 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -38,5 +38,8 @@
     ],
     "cSpell.ignoreWords": [
         "div"
+    ],
+    "cSpell.enableFiletypes": [
+        "marko"
     ]
 }
diff --git a/dev/build.js b/dev/build.js
@@ -3,6 +3,7 @@ const commandLineArgs = require("command-line-args");
 const fs = require("fs-extra");
 const path = require("path");
 const NPMI = require("./npmi");
+const systemConfig = require("../etc/system.json");
 
 const options = commandLineArgs([{
     name: "dev",
@@ -132,7 +133,7 @@ const buildAnimation = () => {
         });
         // Start building
         loading = buildAnimation();
-        await npmi.execCommand(`node node_modules/webpack-cli/bin/cli ${params[command]}`);
+        await npmi.execCommand(`node${systemConfig.opensslLegacyProvider ? " --openssl-legacy-provider" : ""} node_modules/webpack-cli/bin/cli ${params[command]}`);
         // Remove backups
         fs.removeSync(path.resolve(`${__dirname}/../build/bin/zoia.js.bak`));
         fs.removeSync(path.resolve(`${__dirname}/../build/bin/test.js.bak`));

diff --git a/dev/cli.js b/dev/cli.js
@@ -29,6 +29,7 @@ module.exports = (argv) => ({
         ]
     } : {},
     output: {
+        hashFunction: "xxhash64",
         libraryTarget: "commonjs2",
         path: path.resolve(`${__dirname}/../build/bin`),
         filename: argv.update ? "cli_update.js" : "cli.js",

diff --git a/dev/client.js b/dev/client.js
@@ -93,6 +93,7 @@ module.exports = (moduleDirs, markoPlugin, argv) => ({
         ] : []
     },
     output: {
+        hashFunction: "xxhash64",
         filename: "[contenthash:8].js",
         path: path.resolve(`${__dirname}/../build/public/${argv.update ? "update_" : "zoia_"}`),
         publicPath: `/zoia/`,

diff --git a/dev/server.js b/dev/server.js
@@ -30,6 +30,7 @@ module.exports = (markoPlugin, argv) => ({
         ]
     } : {},
     output: {
+        hashFunction: "xxhash64",
         libraryTarget: "commonjs2",
         path: path.resolve(`${__dirname}/../build/bin`),
         filename: argv.update ? "zoia_update.js" : "zoia.js",

diff --git a/dev/test.js b/dev/test.js
@@ -29,6 +29,7 @@ module.exports = (argv) => ({
         ]
     } : {},
     output: {
+        hashFunction: "xxhash64",
         libraryTarget: "commonjs2",
         path: path.resolve(`${__dirname}/../build/bin`),
         filename: argv.update ? "test_update.js" : "test.js",

diff --git a/package-core.json b/package-core.json
@@ -6,13 +6,13 @@
 		"@node-minify/terser": "^6.2.0",
 		"activedirectory": "^0.7.2",
 		"archiver": "^5.3.0",
-		"axios": "^0.23.0",
+		"axios": "^0.24.0",
 		"busboy": "^0.3.1",
 		"colors": "^1.4.0",
 		"command-line-args": "^5.2.0",
 		"date-fns": "^2.25.0",
 		"extract-zip": "^2.0.1",
-		"fastify": "^3.22.0",
+		"fastify": "^3.22.1",
 		"fastify-cookie": "^5.3.1",
 		"fastify-cors": "^6.0.2",
 		"fastify-formbody": "^5.1.0",
@@ -30,61 +30,61 @@
 		"lodash.clonedeep": "^4.5.0",
 		"lodash.debounce": "^4.0.8",
 		"lodash.throttle": "^4.1.1",
-		"marko": "^5.15.12",
+		"marko": "^5.17.3",
 		"mime-types": "^2.1.33",
 		"mongodb": "^4.1.3",
 		"nodemailer": "^6.7.0",
-		"pino": "^7.0.1",
+		"pino": "^7.0.5",
 		"pm2": "^5.1.2",
 		"postcss-csso": "^5.0.1",
-		"socket.io": "^4.3.0",
-		"socket.io-client": "^4.3.0",
+		"socket.io": "^4.3.1",
+		"socket.io-client": "^4.3.2",
 		"socket.io-redis": "^6.1.1",
 		"telegraf": "^4.4.2",
-		"tippy.js": "^6.3.2",
+		"tippy.js": "^6.3.3",
 		"uuid": "^8.3.2"
 	},
 	"devDependencies": {
-		"@babel/code-frame": "^7.15.8",
-		"@babel/core": "^7.15.8",
-		"@babel/eslint-parser": "^7.15.8",
-		"@babel/plugin-proposal-class-properties": "^7.14.5",
-		"@babel/plugin-proposal-object-rest-spread": "^7.15.6",
-		"@babel/plugin-transform-async-to-generator": "^7.14.5",
-		"@babel/plugin-transform-runtime": "^7.15.8",
-		"@babel/preset-env": "^7.15.8",
-		"@ckeditor/ckeditor5-build-classic": "^30.0.0",
-		"@marko/compiler": "^5.16.0",
+		"@babel/code-frame": "^7.16.0",
+		"@babel/core": "^7.16.0",
+		"@babel/eslint-parser": "^7.16.0",
+		"@babel/plugin-proposal-class-properties": "^7.16.0",
+		"@babel/plugin-proposal-object-rest-spread": "^7.16.0",
+		"@babel/plugin-transform-async-to-generator": "^7.16.0",
+		"@babel/plugin-transform-runtime": "^7.16.0",
+		"@babel/preset-env": "^7.16.0",
+		"@ckeditor/ckeditor5-build-classic": "^31.0.0",
+		"@marko/compiler": "^5.17.3",
 		"@marko/prettyprint": "^3.0.1",
-		"@marko/webpack": "^9.2.0",
-		"@mdi/font": "^6.2.95",
+		"@marko/webpack": "^9.2.1",
+		"@mdi/font": "^6.4.95",
 		"ace-builds": "^1.4.13",
-		"autoprefixer": "^10.3.7",
-		"babel-loader": "^8.2.2",
+		"autoprefixer": "^10.4.0",
+		"babel-loader": "^8.2.3",
 		"bulma": "^0.9.3",
 		"chai": "^4.3.4",
 		"clean-webpack-plugin": "^4.0.0",
-		"core-js": "^3.18.3",
-		"css-loader": "^6.4.0",
+		"core-js": "^3.19.1",
+		"css-loader": "^6.5.0",
 		"eslint": "^7.32.0",
 		"eslint-config-airbnb-base": "^14.2.1",
 		"eslint-plugin-import": "^2.25.2",
 		"file-loader": "^6.2.0",
 		"imask": "^6.2.2",
-		"mini-css-extract-plugin": "^2.4.2",
-		"postcss": "^8.3.9",
+		"mini-css-extract-plugin": "^2.4.3",
+		"postcss": "^8.3.11",
 		"postcss-loader": "^6.2.0",
 		"postcss-preset-env": "^6.7.0",
 		"postcss-url": "^10.1.3",
 		"pretty-checkbox": "^3.0.3",
-		"puppeteer": "^10.4.0",
+		"puppeteer": "^11.0.0",
 		"router5": "^8.0.1",
 		"router5-plugin-browser": "^8.0.1",
-		"sass": "^1.43.2",
-		"sass-loader": "^12.2.0",
+		"sass": "^1.43.4",
+		"sass-loader": "^12.3.0",
 		"svg-url-loader": "^7.1.1",
-		"webpack": "^5.58.2",
-		"webpack-cli": "^4.9.0",
+		"webpack": "^5.61.0",
+		"webpack-cli": "^4.9.1",
 		"webpack-fix-style-only-entries": "^0.6.1",
 		"webpack-sources": "^3.2.1"
 	}