Changeset 5294

Timestamp:

02/25/2014 05:13:30 AM (10 years ago)

Author:

netweb

Message:

More Grunt updates, fixes grunt watch task not RTL'ing or minifying CSS files.

• Use explicit CSS file names, avoids ambiguous LTR CSS (avoids LTR = *.css including bbpress-rtl.css)
• Remove cssmin:colors and include Mint and Evergreen CSS minification in cssmin:core
• Remove cssjanus:colors and include Mint and Evergreen RTL CSS in cssjanus:core
• Use BUILD_DIR (not SOURCE_DIR) to compile RTL CSS cssjanus
• Use BUILD_DIR (not SOURCE_DIR) to compile and LTR & RTL minified CSS with cssmin
• Add Grunt tasks cssjanus:core, cssmin:ltr and cssmin:rtl to grunt watch -> watch:colors task
• Add Grunt tasks cssmin:ltr and cssmin:rtl to grunt watch -> watch:rtl task
• Reorders grunt build and grunt build-release tasks to firstly copy bbpress.css, and admin.css, then create Mint and Evergreen CSS using colors , then RTL all the CSS with cssjanus:core, then minify all the CSS with cssmin:ltr and cssmin:rtl
• Props netweb. See #2542

File:

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

trunk/Gruntfile.js

@@ -6 +6 @@
 
     BBP_RTL_CSS = [
-        'includes/admin/css/*-rtl.css',
-        'includes/admin/styles/*-rtl.css',
-        'templates/default/css/*-rtl.css'
+        'includes/admin/css/admin-rtl.css',
+        'includes/admin/styles/*/colors-rtl.css',
+        'templates/default/css/bbpress-rtl.css'
     ],
 
     BBP_LTR_CSS = [
-        'includes/admin/css/*.css',
-        'includes/admin/styles/*.css',
-        'templates/default/css/*.css'
+        'includes/admin/css/admin.css',
+        'includes/admin/styles/*/colors.css',
+        'templates/default/css/bbpress.css'
     ],
 
@@ -99 +99 @@
         cssmin: {
             ltr: {
-                cwd: SOURCE_DIR,
+                cwd: BUILD_DIR,
                 dest: BUILD_DIR,
                 expand: true,
@@ -113 +113 @@
                 src: BBP_RTL_CSS,
                 options: { banner: '/*! https://wordpress.org/plugins/bbpress/ */' }
-            },
-            colors: {
-                cwd: BUILD_DIR,
-                dest: BUILD_DIR,
-                expand: true,
-                ext: '.min.css',
-                src: [
-                    'includes/admin/styles/*/*.css'
-                ]
             }
         },
@@ -127 +118 @@
             core: {
                 expand: true,
-                cwd: SOURCE_DIR,
+                cwd: BUILD_DIR,
                 dest: BUILD_DIR,
                 ext: '-rtl.css',
@@ -133 +124 @@
                 options: { generateExactDuplicates: true }
             },
-            colors: {
-                options: {
-                    processContent: function( src ) {
-                        return src.replace( /([^/]+)\.css/gi, '$1-rtl.css' );
-                    }
-                },
-                expand: true,
-                cwd: BUILD_DIR,
-                dest: BUILD_DIR,
-                ext: '-rtl.css',
-                src: [
-                    'includes/admin/styles/*/colors.css'
-                ]
-            },
             dynamic: {
                 expand: true,
-                cwd: SOURCE_DIR,
+                cwd: BUILD_DIR,
                 dest: BUILD_DIR,
                 ext: '-rtl.css',
@@ -294 +271 @@
             },
             colors: {
-                files: [SOURCE_DIR + 'includes/admin/styles/**'],
-                tasks: ['sass:colors']
+                files: [SOURCE_DIR + 'includes/admin/styles/*/colors.scss'],
+                tasks: ['sass:colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl']
             },
             rtl: {
@@ -301 +278 @@
                     return SOURCE_DIR + path;
                 } ),
-                tasks: [ 'cssjanus:dynamic' ],
+                tasks: [ 'cssjanus:dynamic', 'cssmin:ltr', 'cssmin:rtl' ],
                 options: {
                     interval: 2000,
@@ -316 +293 @@
 
     // Build tasks.
-    grunt.registerTask( 'build',         [ 'clean:all', 'copy:files', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'colors', 'cssjanus:colors', 'cssmin:colors','uglify:core', 'jsvalidate:build', 'pot' ] );
-    grunt.registerTask( 'build-release', [ 'clean:all', 'copy:files', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'colors', 'cssjanus:colors', 'cssmin:colors','uglify:core', 'jsvalidate:build', 'checktextdomain', 'pot', 'phpunit' ] );
+    grunt.registerTask( 'build',         [ 'clean:all', 'copy:files', 'colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'pot' ] );
+    grunt.registerTask( 'build-release', [ 'clean:all', 'copy:files', 'colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'checktextdomain', 'pot', 'phpunit' ] );
 
     // Testing tasks.