Update deps & fix build for latest node

5 files changed, 10 insertions, 7 deletions

diff --git a/tasks/config/cssmin.js b/tasks/config/cssmin.js
index 4f1101a..9ebe6ec 100755
--- a/tasks/config/cssmin.js
+++ b/tasks/config/cssmin.js
@@ -1,4 +1,4 @@
-var randToken = require('rand-token');
+var nanoid = require('nanoid');
 
 module.exports = function(grunt) {
   grunt.config.set('cssmin', {
@@ -9,7 +9,7 @@ module.exports = function(grunt) {
         cwd: 'static/css',
         src: ['style.css'],
         dest: 'static/css',
-        ext: '-' + randToken.generate(60).toLocaleLowerCase() + '.min.css'
+        ext: '-' + nanoid(60).toLocaleLowerCase().replace(/[_-]+/g, "") + '.min.css'
       }]
     }
   });
diff --git a/tasks/config/sass.js b/tasks/config/sass.js
index ff402e0..a20645d 100755
--- a/tasks/config/sass.js
+++ b/tasks/config/sass.js
@@ -1,8 +1,11 @@
+const sass = require('node-sass');
+
 module.exports = function(grunt) {
   grunt.config.set('sass', {
     // Compile `tranquilpeak.scss` file into `tranquilpeak.css`
     dev: {
       options: {
+        implementation: sass,
         sourceMap: false
       },
       files: {
diff --git a/tasks/config/uglify.js b/tasks/config/uglify.js
index 07a955b..44d4baa 100755
--- a/tasks/config/uglify.js
+++ b/tasks/config/uglify.js
@@ -1,15 +1,15 @@
-var randToken = require('rand-token');
+var nanoid = require('nanoid');
 
 module.exports = function(grunt) {
   var website = {};
-  var token = randToken.generate(60).toLocaleLowerCase();
+  var token = nanoid(60).toLocaleLowerCase().replace(/[_-]+/g, "");
   website['static/js/script-' + token + '.min.js'] = ['static/js/script.js'];
   grunt.config.set('uglify', {
     // Minify `script.js` file into `script.min.js`
     prod: {
       options: {
         mangle: {
-          except: [
+          reserved: [
             'jQuery',
             'fancybox'
           ]
diff --git a/tasks/register/linkAssetsProd.js b/tasks/register/linkAssetsProd.js
index 18655ab..ce7d323 100755
--- a/tasks/register/linkAssetsProd.js
+++ b/tasks/register/linkAssetsProd.js
@@ -1,5 +1,5 @@
 module.exports = function(grunt) {
-    // Link all assets (environment : production)
+  // Link all assets (environment : production)
   grunt.registerTask('linkAssetsProd', [
     'sails-linker:prodJs',
     'sails-linker:prodCss',
diff --git a/tasks/register/syncAssets.js b/tasks/register/syncAssets.js
index e03637c..6f05c4e 100755
--- a/tasks/register/syncAssets.js
+++ b/tasks/register/syncAssets.js
@@ -1,5 +1,5 @@
 module.exports = function(grunt) {
-    // Synchronize all assets (css, js and images) after changes
+  // Synchronize all assets (css, js and images) after changes
   grunt.registerTask('syncAssets', [
     'compileAssets',
     'sync:dev'