Hakim El Hattab 5 лет назад
Родитель
Сommit
5ae2d3eb1e
2 измененных файлов с 15 добавлено и 23 удалено
  1. 7 16
      Gruntfile.js
  2. 8 7
      package.json

+ 7 - 16
Gruntfile.js

@@ -1,9 +1,11 @@
-const sass = require('node-sass');
-
 /* global module:false */
 module.exports = function(grunt) {
-	var port = grunt.option('port') || 8000;
-	var root = grunt.option('root') || '.';
+	const sass = require('node-sass');
+
+	require('load-grunt-tasks')(grunt);
+
+	let port = grunt.option('port') || 8000;
+	let root = grunt.option('root') || '.';
 
 	if (!Array.isArray(root)) root = [root];
 
@@ -39,6 +41,7 @@ module.exports = function(grunt) {
 		sass: {
 			options: {
 				implementation: sass,
+				sourceMap: false
 			},
 			core: {
 				src: 'css/reveal.scss',
@@ -159,18 +162,6 @@ module.exports = function(grunt) {
 
 	});
 
-	// Dependencies
-	grunt.loadNpmTasks( 'grunt-contrib-connect' );
-	grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
-	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-	grunt.loadNpmTasks( 'grunt-contrib-qunit' );
-	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
-	grunt.loadNpmTasks( 'grunt-contrib-watch' );
-	grunt.loadNpmTasks( 'grunt-autoprefixer' );
-	grunt.loadNpmTasks( 'grunt-retire' );
-	grunt.loadNpmTasks( 'grunt-sass' );
-	grunt.loadNpmTasks( 'grunt-zip' );
-
 	// Default task
 	grunt.registerTask( 'default', [ 'css', 'js' ] );
 

+ 8 - 7
package.json

@@ -24,21 +24,22 @@
   },
   "devDependencies": {
     "express": "^4.16.2",
-    "grunt": "^1.0.1",
+    "grunt": "^1.0.3",
+    "grunt-cli": "^1.3.2",
     "grunt-autoprefixer": "^3.0.4",
-    "grunt-cli": "^1.2.0",
-    "grunt-contrib-connect": "^1.0.2",
+    "grunt-contrib-connect": "^2.0.0",
     "grunt-contrib-cssmin": "^2.2.1",
-    "grunt-contrib-jshint": "^1.1.0",
+    "grunt-contrib-jshint": "^2.0.0",
     "grunt-contrib-qunit": "^2.0.0",
     "grunt-contrib-uglify": "^3.3.0",
-    "grunt-contrib-watch": "^1.0.0",
-    "grunt-sass": "^3.0.2",
+    "grunt-contrib-watch": "^1.1.0",
     "grunt-retire": "^1.0.7",
+    "grunt-sass": "^1.0.0",
     "grunt-zip": "~0.17.1",
+    "load-grunt-tasks": "^4.0.0",
     "mustache": "^2.3.0",
     "socket.io": "^2.2.0",
-    "node-sass": "^4.11.0"
+    "typescript": "^3.3.3333"
   },
   "license": "MIT"
 }