Merge pull request #48 from ItzNotABug/sample-update

Sample Update
ItzNotABug · Oct 5, 2024 · 72c5286 · 72c5286
2 parents 346ad4e + 6a115c2
commit 72c5286
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 36 deletions.
diff --git a/function/package.json b/function/package.json
@@ -22,11 +22,11 @@
     "express-hbs": "2.5.0",
     "@itznotabug/appexpress": "^1.6.2",
     "@itznotabug/appexpress-jsx": "^0.0.4",
-    "@itznotabug/appexpress-cors": "^0.0.1",
-    "@itznotabug/appexpress-favicon": "^0.0.2",
-    "@itznotabug/appexpress-minifier": "^0.0.4",
-    "@itznotabug/appexpress-apicache": "^0.0.3",
-    "@itznotabug/appexpress-nocookies": "^0.0.3"
+    "@itznotabug/appexpress-cors": "^0.0.2",
+    "@itznotabug/appexpress-favicon": "^0.0.3",
+    "@itznotabug/appexpress-minifier": "^0.0.5",
+    "@itznotabug/appexpress-apicache": "^0.0.5",
+    "@itznotabug/appexpress-nocookies": "^0.0.4"
   },
   "devDependencies": {
     "prettier": "3.2.5",

diff --git a/function/utils/middlewares.js b/function/utils/middlewares.js
@@ -1,18 +1,18 @@
 import cors from '@itznotabug/appexpress-cors';
 import favIcon from '@itznotabug/appexpress-favicon';
-import apiCache from '@itznotabug/appexpress-apicache';
 import minifier from '@itznotabug/appexpress-minifier';
+import * as cache from '@itznotabug/appexpress-apicache';
 import noCookies from '@itznotabug/appexpress-nocookies';
 import { authUserForConsoleMiddleware } from '../middlewares/auth.js';
 
 export default (express) => {
     logEverything(express);
-    cacheEverything(express);
-    favIconMiddleware(express);
     minifierMiddleware(express);
-    express.middleware(cors.middleware);
-    express.middleware(noCookies.middleware);
+    express.middleware(cors());
+    express.middleware(noCookies());
     express.middleware(authUserForConsoleMiddleware);
+    express.middleware(cache.createApiCache({ timeout: 0 }));
+    express.middleware(favIcon({ iconPath: 'icons/favicon.ico' }));
 };
 
 const logEverything = (express) => {
@@ -21,36 +21,23 @@ const logEverything = (express) => {
 
         // these won't be marked unsupported!
         console.log(`Requested Path: ${url}`);
-        if (apiCache.hasCache(url)) {
+        if (cache.hasCache(url)) {
             console.log(`This url (${url}) is cached!`);
         }
     });
 };
 
-const cacheEverything = (express) => {
-    apiCache.options({ timeout: 0 });
-    express.middleware(apiCache.middleware);
-};
-
-const favIconMiddleware = (express) => {
-    favIcon.options({
-        iconPath: 'icons/favicon.ico',
-    });
-
-    express.middleware(favIcon.middleware);
-};
-
 const minifierMiddleware = (express) => {
-    minifier.options({
-        excludes: ['/robots.txt'],
-        htmlOptions: {
-            minifyJS: true,
-            minifyCSS: true,
-            removeComments: true,
-            collapseWhitespace: true,
-            preserveLineBreaks: false,
-        },
-    });
-
-    express.middleware(minifier.middleware);
+    express.middleware(
+        minifier({
+            excludes: ['/robots.txt'],
+            htmlOptions: {
+                minifyJS: true,
+                minifyCSS: true,
+                removeComments: true,
+                collapseWhitespace: true,
+                preserveLineBreaks: false,
+            },
+        }),
+    );
 };