From 2734aa3da01cf5872176b1c6f1bfdc9815cdf500 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Mon, 1 Apr 2019 13:46:08 +0200 Subject: [PATCH] fix grunt ci error --- Gruntfile.ts => gruntfile.js | 16 ++++++++++------ package-lock.json | 6 ------ package.json | 7 +++---- 3 files changed, 13 insertions(+), 16 deletions(-) rename Gruntfile.ts => gruntfile.js (91%) diff --git a/Gruntfile.ts b/gruntfile.js similarity index 91% rename from Gruntfile.ts rename to gruntfile.js index 597ede1..edebddd 100644 --- a/Gruntfile.ts +++ b/gruntfile.js @@ -1,6 +1,6 @@ -/* global module:false */ -module.exports = function(grunt) { - const sass = require('node-sass'); +const sass = require('node-sass'); + +module.exports = grunt => { require('load-grunt-tasks')(grunt); @@ -93,10 +93,11 @@ module.exports = function(grunt) { console: false, unescape: false, define: false, - exports: false + exports: false, + require: false } }, - files: [ 'Gruntfile.js', 'js/reveal.js' ] + files: [ 'gruntfile.js', 'js/reveal.js' ] }, connect: { @@ -128,7 +129,7 @@ module.exports = function(grunt) { watch: { js: { - files: [ 'Gruntfile.js', 'js/reveal.js' ], + files: [ 'gruntfile.js', 'js/reveal.js' ], tasks: 'js' }, theme: { @@ -161,6 +162,9 @@ module.exports = function(grunt) { }); + grunt.loadNpmTasks('grunt-contrib-clean'); + grunt.loadNpmTasks('grunt-contrib-nodeunit'); + // Default task grunt.registerTask( 'default', [ 'css', 'js' ] ); diff --git a/package-lock.json b/package-lock.json index ba506a7..9d36c31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5441,12 +5441,6 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, - "typescript": { - "version": "3.3.3333", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz", - "integrity": "sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==", - "dev": true - }, "uglify-js": { "version": "3.3.8", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz", diff --git a/package.json b/package.json index cd6ccbe..877f2e4 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "express": "^4.16.2", - "grunt": "^1.0.3", + "grunt": "^1.0.4", "grunt-cli": "^1.3.2", "grunt-autoprefixer": "^3.0.4", "grunt-contrib-connect": "^2.0.0", @@ -36,10 +36,9 @@ "grunt-sass": "^3.0.2", "grunt-zip": "~0.17.1", "load-grunt-tasks": "^4.0.0", - "node-sass": "4.11.0", + "node-sass": "^4.11.0", "mustache": "^2.3.0", - "socket.io": "^2.2.0", - "typescript": "^3.3.3333" + "socket.io": "^2.2.0" }, "license": "MIT" }