Bladeren bron

Update cssmerger.

Lee Morgan 5 jaren geleden
bovenliggende
commit
2e032f2dfb
3 gewijzigde bestanden met toevoegingen van 16 en 10 verwijderingen
  1. 8 2
      app.js
  2. 7 7
      package-lock.json
  3. 1 1
      package.json

+ 8 - 2
app.js

@@ -24,6 +24,11 @@ let sessionOptions = {
     resave: false,
 };
 
+let cssOptions = {
+    recursive: true,
+    miminize: false
+};
+
 app.use(express.static(__dirname + "/views"));
 let httpsServer = {};
 if(process.env.NODE_ENV === "production"){
@@ -42,6 +47,7 @@ if(process.env.NODE_ENV === "production"){
 
     sessionOptions.domain = process.env.COOKIE_DOMAIN;
     sessionOptions.secure = true;
+    cssOptions.minimize = true;
 }
 
 app.use(compression());
@@ -54,12 +60,12 @@ cssmerger([
     "./views/shared/css/general.css",
     "./views/shared/css/loader.css",
     "./views/dashboardPage/css"
-], "./views/dashboardPage/bundle.css");
+], "./views/dashboardPage/bundle.css", cssOptions);
 
 cssmerger([
     "./views/shared/css/",
     "./views/otherPages/style.css"
-], "./views/otherPages/bundle.css");
+], "./views/otherPages/bundle.css", cssOptions);
 
 if(process.env.NODE_ENV === "production"){
     httpsServer.listen(process.env.HTTPS_PORT, ()=>{});

+ 7 - 7
package-lock.json

@@ -13,7 +13,7 @@
         "bcryptjs": "^2.4.3",
         "compression": "^1.7.4",
         "cookie-session": "^1.4.0",
-        "cssmerger": "^1.0.2",
+        "cssmerger": "^1.1.0",
         "ejs": "^2.7.4",
         "express": "^4.17.1",
         "mailgun-js": "^0.6.7",
@@ -1349,9 +1349,9 @@
       }
     },
     "node_modules/cssmerger": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cssmerger/-/cssmerger-1.0.2.tgz",
-      "integrity": "sha512-zTlZIw+PdzrEiF46ydZvzUsBpEtTRmc3nT+bLnPZBnrAJORhmFKY9SulxTq/XKJ3eHYrBX/v8uArrhQGTb1HnA=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/cssmerger/-/cssmerger-1.1.0.tgz",
+      "integrity": "sha512-dCssT7WYieDuXADhLILYm2ZpXFMTisr1bAfJKKn0YZEoww9X9La8pBh9VEPU/tdoQOW3Vi4pwe5hY0r8fN7hDw=="
     },
     "node_modules/d": {
       "version": "1.0.1",
@@ -6569,9 +6569,9 @@
       }
     },
     "cssmerger": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cssmerger/-/cssmerger-1.0.2.tgz",
-      "integrity": "sha512-zTlZIw+PdzrEiF46ydZvzUsBpEtTRmc3nT+bLnPZBnrAJORhmFKY9SulxTq/XKJ3eHYrBX/v8uArrhQGTb1HnA=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/cssmerger/-/cssmerger-1.1.0.tgz",
+      "integrity": "sha512-dCssT7WYieDuXADhLILYm2ZpXFMTisr1bAfJKKn0YZEoww9X9La8pBh9VEPU/tdoQOW3Vi4pwe5hY0r8fN7hDw=="
     },
     "d": {
       "version": "1.0.1",

+ 1 - 1
package.json

@@ -25,7 +25,7 @@
     "bcryptjs": "^2.4.3",
     "compression": "^1.7.4",
     "cookie-session": "^1.4.0",
-    "cssmerger": "^1.0.2",
+    "cssmerger": "^1.1.0",
     "ejs": "^2.7.4",
     "express": "^4.17.1",
     "mailgun-js": "^0.6.7",