Ticket #2848: 2848.diff

Gruntfile.js

@@ -109 +109 @@
                                 src: []
                         }
                 },
-                cssjanus: {
-                        core: {
-                                expand: true,
-                                cwd: BUILD_DIR,
-                                dest: BUILD_DIR,
-                                ext: '-rtl.css',
-                                src: BBP_LTR_CSS,
-                                options: { generateExactDuplicates: true }
-                        },
-                        dynamic: {
-                                expand: true,
-                                cwd: BUILD_DIR,
-                                dest: BUILD_DIR,
-                                ext: '-rtl.css',
-                                src: []
-                        }
-                },
                 cssmin: {
                         ltr: {
                                 cwd: BUILD_DIR,
@@ -248 +231 @@
                                 args: [ '-c', 'tests/phpunit/multisite.xml' ]
                         }
                 },
+                rtlcss: {
+                        options: {
+                                config: {
+                                        swapLeftRightInUrl: false,
+                                        swapLtrRtlInUrl: false,
+                                        autoRename: false,
+                                        preserveDirectives: true
+                                },
+                                saveUnmodified: false
+                        },
+                        core: {
+                                expand: true,
+                                cwd: BUILD_DIR,
+                                dest: BUILD_DIR,
+                                ext: '-rtl.css',
+                                src: BBP_LTR_CSS
+                        },
+                        dynamic: {
+                                expand: true,
+                                cwd: BUILD_DIR,
+                                dest: BUILD_DIR,
+                                ext: '-rtl.css',
+                                src: []
+                        }
+                },
                 sass: {
                         colors: {
                                 expand: true,
@@ -298 +306 @@
                         },
                         colors: {
                                 files: [ SOURCE_DIR + 'includes/admin/styles/*/colors.scss' ],
-                                tasks: [ 'sass:colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl' ]
+                                tasks: [ 'sass:colors', 'rtlcss:core', 'cssmin:ltr', 'cssmin:rtl' ]
                         },
                         config: {
                                 files: 'Gruntfile.js'
@@ -317 +325 @@
                                 files: BBP_LTR_CSS.map( function( path ) {
                                         return SOURCE_DIR + path;
                                 } ),
-                                tasks: [ 'cssjanus:dynamic', 'cssmin:ltr', 'cssmin:rtl' ],
+                                tasks: [ 'rtlcss:dynamic', 'cssmin:ltr', 'cssmin:rtl' ],
                                 options: {
                                         interval: 2000,
                                         spawn: false
@@ -334 +342 @@
         // Build tasks.
         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( 'build',   [ 'commit', 'clean:all', 'copy:files', 'colors', 'rtlcss:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'makepot' ] );
         grunt.registerTask( 'release', [ 'build' ] );
 
         // PHPUnit test task.
@@ -364 +372 @@
         // Add a listener to the watch task.
         //
         // On `watch:all`, automatically updates the `copy:dynamic` and `clean:dynamic` configurations so that only the changed files are updated.
-        // On `watch:rtl`, automatically updates the `cssjanus:dynamic` configuration.
+        // On `watch:rtl`, automatically updates the `rtlcss:dynamic` configuration.
         grunt.event.on( 'watch', function( action, filepath, target ) {
                 if ( target !== 'all' && target !== 'rtl' ) {
                         return;
@@ -376 +384 @@
 
                 grunt.config( [ 'clean', 'dynamic', 'src' ], cleanSrc );
                 grunt.config( [ 'copy', 'dynamic', 'src' ], copySrc );
-                grunt.config( [ 'cssjanus', 'dynamic', 'src' ], copySrc );
+                grunt.config( [ 'rtlcss', 'dynamic', 'src' ], copySrc );
                 grunt.config( [ 'uglify', 'dynamic', 'src' ], copySrc );
         });
 };

package.json

@@ -13 +13 @@
     "grunt-contrib-jshint": "~0.11.2",
     "grunt-contrib-uglify": "~0.9.1",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-cssjanus": "~0.2.3",
     "grunt-exec": "~0.4.6",
     "grunt-jsvalidate": "~0.2.2",
     "grunt-legacy-util": "^0.2.0",
     "grunt-patch-wordpress": "~0.3.0",
+    "grunt-rtlcss": "~1.6.0",
     "grunt-sass": "~1.0.0",
     "grunt-wp-i18n": "~0.5.2",
     "matchdep": "~0.3.0"