Changeset 26145

Timestamp:

11/13/2013 11:37:30 PM (11 years ago)

Author:

nacin

Message:

Move to grunt-sass, which which has less bells and whistles than grunt-contrib-sass but also no Ruby dependency.

see #25858, #22862, [26143].

Location:

trunk

Files:

• Gruntfile.js (modified) (4 diffs)
• package.json (modified) (1 diff)

trunk/Gruntfile.js

@@ -79 +79 @@
         sass: {
             colors: {
-                options: {
-                    style: 'expanded',
-                    sourcemap: true,
-                    noCache: true
-                },
-                files : [{
-                    expand: true,
-                    cwd: SOURCE_DIR,
-                    dest: BUILD_DIR,
-                    ext: '.css',
-                    src: ['wp-admin/css/color-schemes/*/colors.scss']
-                }]
+                expand: true,
+                cwd: SOURCE_DIR,
+                dest: BUILD_DIR,
+                ext: '.css',
+                src: ['wp-admin/css/color-schemes/*/colors.scss'],
+                options: {
+                    outputStyle: 'expanded'
+                }
             }
         },
@@ -329 +325 @@
                 }
             },
+            colors: {
+                files: [SOURCE_DIR + 'wp-admin/css/color-schemes/**'],
+                tasks: ['sass:colors']
+            },
             rtl: {
                 files: [
@@ -343 +343 @@
                 files: ['tests/qunit/**'],
                 tasks: ['qunit']
-            },
-            colors: {
-                files: [SOURCE_DIR + 'wp-admin/css/color-schemes/**'],
-                tasks: ['sass:colors']
             }
         }
@@ -359 +355 @@
     grunt.registerTask('rtl', ['cssjanus:core']);
 
-    grunt.registerTask('colors', ['sass:colors', 'cssmin:colors']);
+    // Color schemes task.
+    grunt.registerTask('colors', ['sass:colors']);
 
     // Build task.
-    grunt.registerTask('build', ['clean:all', 'copy:all', 'rtl', 'cssmin:core', 'cssmin:rtl',
+    grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'colors', 'cssmin:colors', 'rtl', 'cssmin:rtl',
         'uglify:core', 'uglify:tinymce', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
 

trunk/package.json

@@ -21 +21 @@
     "grunt-contrib-jshint": "~0.7.0",
     "grunt-cssjanus": "~0.1.0",
+    "grunt-sass": "~0.8.0",
     "matchdep": "~0.1.2"
   }