Ticket #26669: modules_without_css.diff

Gruntfile.js

@@ -2 +2 @@
 module.exports = function(grunt) {
         var path = require('path'),
                 SOURCE_DIR = 'src/',
-                BUILD_DIR = 'build/';
+                BUILD_DIR = 'build/',
+                wp_admin_source = [
+                        'toc',
+                        'common',
+                        'text',
+                        'forms',
+                        'actions',
+                        'notifications',
+                        'tinymce',
+                        'header',
+                        'navmenu',
+                        'layoutblocks',
+                        'dashboard',
+                        'lists',
+                        'edit',
+                        'categories',
+                        'tags',
+                        'media',
+                        'comments',
+                        'themes',
+                        'plugins',
+                        'users',
+                        'tools',
+                        'settings',
+                        'footer',
+                        'about',
+                        'overlay_with_sidebar',
+                        'customize_loader',
+                        'tabbed_admin_screen',
+                        'misc',
+                        'localization',
+                        'uncatagorized'
+                ];
 
         // Load tasks.
         require('matchdep').filterDev('grunt-*').forEach( grunt.loadNpmTasks );
@@ -30 +62 @@
                                                 src: [
                                                         '**',
                                                         '!**/.{svn,git}/**', // Ignore version control directories.
-                                                        '!wp-includes/version.php' // Exclude version.php
+                                                        '!wp-includes/version.php'  // Exclude version.php
                                                 ],
                                                 dest: BUILD_DIR
                                         },
@@ -68 +100 @@
                                                 return src.replace( /([^\.])*\.\.\/src/ig , '/../build' );
                                         }
                                 }
+                        },
+                        'wp-admin': {
+                                src: SOURCE_DIR + 'wp-admin/css/wp-admin.css',
+                                dest: BUILD_DIR + 'wp-admin/css/wp-admin.css'
+
                         }
                 },
                 sass: {
@@ -93 +130 @@
                                         'wp-includes/css/*.css',
                                         // Exceptions
                                         '!wp-admin/css/theme.css', // Temporary file
+                                        '!wp-admin/css/wp-admin-*.css',
                                         '!wp-admin/css/farbtastic.css'
                                 ]
                         },
+                        'wp-admin': {
+                                expand: true,
+                                cwd: BUILD_DIR,
+                                dest: BUILD_DIR,
+                                ext: '.min.css',
+                                src: [
+                                        'wp-admin/css/wp-admin.css'
+                                ]
+                        },
                         rtl: {
                                 expand: true,
                                 cwd: BUILD_DIR,
@@ -127 +174 @@
                                 ext: '-rtl.css',
                                 src: [
                                         'wp-admin/css/*.css',
-                                        'wp-includes/css/*.css'
+                                        'wp-includes/css/*.css',
+                                        '!wp-admin/css/wp-admin-*.css'
                                 ]
                         },
+                        'wp-admin': {
+                                options: {
+                                        swapLtrRtlInUrl: false
+                                },
+                                expand: true,
+                                cwd: BUILD_DIR,
+                                dest: BUILD_DIR,
+                                ext: '-rtl.css',
+                                src: [
+                                        'wp-admin/css/wp-admin.css'
+                                ]
+                        },
                         colors: {
                                 options: {
                                         processContent: function( src ) {
@@ -283 +343 @@
                                         BUILD_DIR + 'wp-includes/js/tinymce/plugins/*/plugin.min.js'
                                 ],
                                 dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js'
-                        }
+                        },
+            'wp-admin': {
+                options: {
+                    separator: '\n'
+                },
+                src: wp_admin_source.map(function(file){
+                                        return SOURCE_DIR + 'wp-admin/css/wp-admin-' + file + '.css';
+                                }),
+                dest: BUILD_DIR + 'wp-admin/css/wp-admin.css'
+
+            }
                 },
                 compress: {
                         tinymce: {
@@ -342 +412 @@
         // Color schemes task.
         grunt.registerTask('colors', ['sass:colors']);
 
+        // wp-admin.css
+        grunt.registerTask('build:wpadmincss', ['concat:wp-admin', 'cssmin:wp-admin', 'cssjanus:wp-admin']);
+
         // Build task.
         grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'colors', 'rtl', 'cssmin:rtl', 'cssmin:colors',
-                'uglify:core', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
+                'build:wpadmincss', 'uglify:core', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce']);
 
         // Testing tasks.
         grunt.registerMultiTask('phpunit', 'Runs PHPUnit tests, including the ajax and multisite tests.', function() {

src/wp-includes/script-loader.php

@@ -549 +549 @@
 
         $rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker', 'wp-pointer', 'editor-buttons', 'farbtastic', 'wp-auth-check', 'wp-jquery-ui-dialog', 'media-views', 'buttons', 'install', 'colors-fresh' );
 
-        $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
+        if ( SCRIPT_DEBUG ) {
+        $admin_dependencies = array( 'toc' , 'common' , 'text' , 'forms' , 'actions' , 'notifications' , 'tinymce' , 'header' ,
+                        'navmenu' , 'layoutblocks' , 'dashboard' , 'lists' , 'edit' , 'categories' , 'tags' , 'media' , 'comments' ,
+                        'themes' , 'plugins' , 'users' , 'tools' , 'settings' , 'footer' , 'about' , 'overlay_with_sidebar' , 
+                        'customize_loader' , 'tabbed_admin_screen' , 'misc' , 'localization' , 'uncatagorized' );
+                foreach ( $admin_dependencies as $dependency ) {
+                        $a = $styles->add( $dependency, "/wp-admin/css/wp-admin-$dependency.css" );
+                }
+                // open-sans and dashicons are already registered, but still need to be declared as dependencies
+                array_push( $admin_dependencies, 'open-sans', 'dashicons' );
+        } else {
+                $admin_dependencies = array( 'open-sans', 'dashicons' );
+        }
 
+        $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", $admin_dependencies );
+
         $styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
         $styles->add_data( 'ie', 'conditional', 'lte IE 7' );