From 5c285eaee751a9257e01b6ae4fcff70305e34d56 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 19 Nov 2015 11:34:49 -0500 Subject: [PATCH] Add grunt check task to verify npm modules are up to date --- client/GruntFile.js | 3 ++- client/grunt-tasks/style.js | 3 ++- client/package.json | 3 ++- static/maps/galaxy-app-base.js.map | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/client/GruntFile.js b/client/GruntFile.js index 469e9849755..42ad164fadf 100644 --- a/client/GruntFile.js +++ b/client/GruntFile.js @@ -20,8 +20,9 @@ module.exports = function(grunt) { grunt.config.set( 'paths', TOOLSHED_PATHS ); } + grunt.loadNpmTasks('grunt-check-modules'); // see the sub directory grunt-tasks/ for individual task definitions grunt.loadTasks( 'grunt-tasks' ); // note: 'handlebars' *not* 'templates' since handlebars doesn't call uglify - grunt.registerTask( 'default', [ 'handlebars', 'uglify' ] ); + grunt.registerTask( 'default', [ 'check-modules', 'handlebars', 'uglify' ] ); }; diff --git a/client/grunt-tasks/style.js b/client/grunt-tasks/style.js index 968f3be24c1..484a5ac151f 100644 --- a/client/grunt-tasks/style.js +++ b/client/grunt-tasks/style.js @@ -77,10 +77,11 @@ module.exports = function( grunt ){ grunt.loadNpmTasks( 'grunt-spritesmith' ); grunt.loadNpmTasks( 'grunt-contrib-clean' ); + // Write theme variable for less grunt.registerTask( 'less-site-config', 'Write site configuration for less', function() { grunt.file.write( fmt( '%s/tmp-site-config.less', lessPath ), fmt( "@theme-name: %s;", theme ) ); }); - grunt.registerTask( 'style', [ 'sprite', 'less-site-config', 'less', 'clean' ] ); + grunt.registerTask( 'style', [ 'check-modules', 'sprite', 'less-site-config', 'less', 'clean' ] ); }; diff --git a/client/package.json b/client/package.json index dba938a7f2b..1f9124955c2 100644 --- a/client/package.json +++ b/client/package.json @@ -8,11 +8,12 @@ "devDependencies": { "grunt": "^0.4.5", "grunt-bower-install-simple": "^1.1.0", + "grunt-check-modules": "^1.0.0", "grunt-cli": "^0.1.13", "grunt-contrib-clean": "^0.6.0", "grunt-contrib-copy": "^0.5.0", "grunt-contrib-handlebars": "^0.10.2", - "grunt-contrib-less": "^1.0.1", + "grunt-contrib-less": "^1.1.0", "grunt-contrib-uglify": "^0.8.0", "grunt-contrib-watch": "^0.6.1", "grunt-exec": "^0.4.6", diff --git a/static/maps/galaxy-app-base.js.map b/static/maps/galaxy-app-base.js.map index a029917a55f..4eb9400fb25 100644 --- a/static/maps/galaxy-app-base.js.map +++ b/static/maps/galaxy-app-base.js.map @@ -1 +1 @@ -{"version":3,"file":"galaxy-app-base.js","sources":["../src/galaxy-app-base.js"],"names":["define","userModel","metricsLogger","addLogging","localize","BASE_MVC","bootstrapped","GalaxyApp","options","self","this","_init","DEBUGGING_KEY","NAMESPACE_KEY","localDebugging","localStorage","getItem","storageErr","console","log","prototype","_","extend","Backbone","Events","logger","_processOptions","debug","_initConfig","config","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","_initLocale","_initUser","user","root","trigger","_setUpListeners","defaultOptions","patchExisting","defaults","k","hasOwnProperty","patchWith","consoleLogger","consoleLevel","MetricsLogger","ALL","consoleNamespaceWhitelist","split","emit","map","i","arguments","Array","slice","call","LoggableMixin","_l","userJSON","User","currUser","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","debugging","setting","undefined","setItem","removeItem","debuggingNamespaces","namespaces","csv","newSettings","toString","userEmail","get"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"galaxy-app-base.js","sources":["../src/galaxy-app-base.js"],"names":["define","userModel","metricsLogger","addLogging","localize","BASE_MVC","bootstrapped","GalaxyApp","options","self","this","_init","DEBUGGING_KEY","NAMESPACE_KEY","localDebugging","localStorage","getItem","storageErr","console","log","prototype","_","extend","Backbone","Events","logger","_processOptions","debug","_initConfig","config","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","_initLocale","_initUser","user","root","trigger","_setUpListeners","defaultOptions","patchExisting","defaults","k","hasOwnProperty","patchWith","consoleLogger","consoleLevel","MetricsLogger","ALL","consoleNamespaceWhitelist","split","emit","map","i","arguments","Array","slice","call","LoggableMixin","_l","userJSON","User","currUser","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","debugging","setting","undefined","setItem","removeItem","debuggingNamespaces","namespaces","csv","newSettings","toString","userEmail","get"],"mappings":"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"} \ No newline at end of file