Merge branch 'update-depends'

2 files changed, 17 insertions, 21 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index c32faa0..43c6dad 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,23 +4,20 @@ module.exports = function (grunt) {
     swig: {
       dist: {
         init: {
-          root: "pages/",
-          allowErrors: false,
-          autoescape: true
+          allowErrors: false
         },
         banners: grunt.file.readJSON('pages/banners.json'),
         max_upload_size: 120,
-        dest: "dist/",
-        cwd: "pages/",
+        dest: 'dist',
         generateSitemap: false,
         generateRobotstxt: false,
         src: [
-          'index.swig',
-          'faq.swig',
-          'tools.swig',
-          'other.swig',
-          'nojs.swig',
-          'ca.swig'
+          'pages/index.swig',
+          'pages/faq.swig',
+          'pages/tools.swig',
+          'pages/other.swig',
+          'pages/nojs.swig',
+          'pages/ca.swig'
         ],
         siteUrl: 'https://pantsu.cat/',
         production: false,
@@ -31,13 +28,12 @@ module.exports = function (grunt) {
         options: {
           removeComments: true,
           collapseWhitespace: true,
-          conservativeCollapse: true,
           removeEmptyAttributes: true
         },
         files: [{
           expand: true,
           cwd: 'dist/',
-          src: '**/*.html',
+          src: '*.html',
           dest: 'dist/'
         }]
       }
diff --git a/package.json b/package.json
index d779035..799c80e 100644
--- a/package.json
+++ b/package.json
@@ -13,14 +13,14 @@
     "url": "https://github.com/pantsucat/pomf/issues"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-cssmin": "~0.6.2",
-    "grunt-contrib-htmlmin": "~0.1.3",
-    "grunt-contrib-imagemin": "~0.3.0",
+    "grunt": "^0.4.1",
+    "grunt-contrib-copy": "^0.8.1",
+    "grunt-contrib-cssmin": "^0.14.0",
+    "grunt-contrib-htmlmin": "^0.4.0",
+    "grunt-contrib-imagemin": "^0.9.4",
     "grunt-contrib-jshint": "^0.11.3",
-    "grunt-contrib-uglify": "~0.2.5",
-    "grunt-mkdir": "~0.1.1",
-    "grunt-swig": "~0.1.2"
+    "grunt-contrib-uglify": "^0.9.2",
+    "grunt-mkdir": "^0.1.1",
+    "grunt-swig": "^0.2.1"
   }
 }