Changeset 5649

Timestamp:

03/23/2015 08:28:40 AM (12 years ago)

Author:

netweb

Message:

Bring Gruntfile.js tasks up to speed with BuddyPress

• Adds a src target for jsvalidate to validate JavaScript files in the /src folder
• WordPress JavaScript coding standards improvements
• See also r5614

Props netweb. Fixes #2766

File:

• trunk/Gruntfile.js (modified) (10 diffs)

trunk/Gruntfile.js

@@ -24 +24 @@
 
                 BBP_EXCLUDED_FILES = [
+
                         // Ignore these
                         '!**/.{svn,git}/**',
@@ -53 +54 @@
         // Project configuration.
         grunt.initConfig({
-                pkg: grunt.file.readJSON('package.json'),
+                pkg: grunt.file.readJSON( 'package.json' ),
                 checktextdomain: {
                         options: {
@@ -205 +206 @@
                                         src: BUILD_DIR + '/**/*.js'
                                 }
+                        },
+                        src: {
+                                files: {
+                                        src: SOURCE_DIR + '/**/*.js'
+                                }
                         }
                 },
@@ -232 +238 @@
                         'default': {
                                 cmd: 'phpunit',
-                                args: ['-c', 'phpunit.xml.dist']
+                                args: [ '-c', 'phpunit.xml.dist' ]
                         },
                         multisite: {
                                 cmd: 'phpunit',
-                                args: ['-c', 'tests/phpunit/multisite.xml']
+                                args: [ '-c', 'tests/phpunit/multisite.xml' ]
                         }
                 },
@@ -245 +251 @@
                                 dest: BUILD_DIR,
                                 ext: '.css',
-                                src: ['includes/admin/styles/*/colors.scss'],
+                                src: [ 'includes/admin/styles/*/colors.scss' ],
                                 options: {
                                         outputStyle: 'expanded'
@@ -276 +282 @@
                                 files: [
                                         SOURCE_DIR + '**',
+
                                         // Ignore version control directories.
                                         '!' + SOURCE_DIR + '**/.{svn,git}/**'
@@ -287 +294 @@
                         },
                         colors: {
-                                files: [SOURCE_DIR + 'includes/admin/styles/*/colors.scss'],
-                                tasks: ['sass:colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl']
+                                files: [ SOURCE_DIR + 'includes/admin/styles/*/colors.scss' ],
+                                tasks: [ 'sass:colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl' ]
                         },
                         config: {
@@ -319 +326 @@
 
         // Color schemes task.
-        grunt.registerTask( 'colors', ['sass:colors'] );
+        grunt.registerTask( 'colors', [ 'sass:colors' ] );
 
         // Build tasks.
-        grunt.registerTask( 'src',     ['jsvalidate', 'jshint', 'cssjanus'] );
-        grunt.registerTask( 'commit',  ['src', 'checktextdomain'] );
-        grunt.registerTask( 'build',   [ 'clean:all', 'copy:files', 'colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'makepot' ] );
-        grunt.registerTask( 'release', [ 'build', 'checktextdomain' ] );
+        grunt.registerTask( 'src',     [ 'jsvalidate:src', 'jshint' ] );
+        grunt.registerTask( 'commit',  [ 'src', 'checktextdomain' ] );
+        grunt.registerTask( 'build',   [ 'commit', 'clean:all', 'copy:files', 'colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'makepot' ] );
+        grunt.registerTask( 'release', [ 'build' ] );
 
         // PHPUnit test task.
@@ -337 +344 @@
 
         // PHPUnit test task.
-        grunt.registerTask( 'test', 'Run all PHPUnit test tasks.', ['phpunit'] );
+        grunt.registerTask( 'test', 'Run all PHPUnit test tasks.', [ 'phpunit' ] );
 
         // JavaScript test task.
-        grunt.registerTask( 'jstest', 'Runs all JavaScript tasks.', [ 'jsvalidate', 'jshint' ] );
+        grunt.registerTask( 'jstest', 'Runs all JavaScript tasks.', [ 'jsvalidate:src', 'jshint' ] );
 
         // Travis CI Task
-        grunt.registerTask( 'travis', ['jsvalidate', 'jshint', 'checktextdomain', 'test'] );
+        grunt.registerTask( 'travis', [ 'jsvalidate:src', 'jshint', 'checktextdomain', 'test' ] );
 
         // Patch task.
@@ -349 +356 @@
 
         // Default task.
-        grunt.registerTask( 'default', ['src'] );
+        grunt.registerTask( 'default', [ 'src' ] );
 
         // Add a listener to the watch task.