Build: Fix requirejs task and add CSS concat task back in

diff --git a/Gruntfile.js b/Gruntfile.js
index 0c9bf44473e7f48a53f4fb88e6425242fa6d50d4..8a5affe01546cc4b8032a1fa80672490083db8e3 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -24,6 +24,31 @@ var
 
        allI18nFiles = expandFiles( "ui/i18n/*.js" ),
 
+       cssFiles = [
+               "core",
+               "accordion",
+               "autocomplete",
+               "button",
+               "checkboxradio",
+               "controlgroup",
+               "datepicker",
+               "dialog",
+               "draggable",
+               "menu",
+               "progressbar",
+               "resizable",
+               "selectable",
+               "selectmenu",
+               "sortable",
+               "slider",
+               "spinner",
+               "tabs",
+               "tooltip",
+               "theme"
+       ].map(function( component ) {
+               return "themes/base/" + component + ".css";
+       }),
+
        // minified files
        minify = {
                options: {
@@ -113,6 +138,18 @@ grunt.initConfig({
                dist: "<%= pkg.name %>-<%= pkg.version %>"
        },
        compare_size: compareFiles,
+       concat: {
+               css: {
+                       options: {
+                               banner: createBanner( cssFiles ),
+                               stripBanners: {
+                                       block: true
+                               }
+                       },
+                       src: cssFiles,
+                       dest: "dist/jquery-ui.css"
+               }
+       },
        requirejs: {
                js: {
                        options: {
@@ -126,7 +163,7 @@ grunt.initConfig({
                                findNestedDependencies: true,
                                skipModuleInsertion: true,
                                exclude: [ "jquery" ],
-                               include: expandFiles( [ "ui/**/*.js", "!ui/i18n/*" ] ),
+                               include: expandFiles( [ "ui/**/*.js", "!ui/core.js", "!ui/i18n/*" ] ),
                                out: "dist/jquery-ui.js",
                                wrap: {
                                        start: createBanner( uiFiles ),

diff --git a/package.json b/package.json
index 599efbb5a6f9853aae6d54e598915105b4a3cabb..61fbf13f8cc938454a00569ede44f151a7382c89 100644 (file)
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
                "grunt": "0.4.2",
                "grunt-bowercopy": "1.1.0",
                "grunt-compare-size": "0.4.0",
+               "grunt-contrib-concat": "0.5.1",
                "grunt-contrib-csslint": "0.2.0",
                "grunt-contrib-jshint": "0.7.1",
                "grunt-contrib-qunit": "0.6.0",