Skip to content

Commit e6b9b7c

Browse files
committed
Build: Fix requirejs task and add CSS concat task back in
1 parent d573232 commit e6b9b7c

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

Gruntfile.js

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,31 @@ var
2424

2525
allI18nFiles = expandFiles( "ui/i18n/*.js" ),
2626

27+
cssFiles = [
28+
"core",
29+
"accordion",
30+
"autocomplete",
31+
"button",
32+
"checkboxradio",
33+
"controlgroup",
34+
"datepicker",
35+
"dialog",
36+
"draggable",
37+
"menu",
38+
"progressbar",
39+
"resizable",
40+
"selectable",
41+
"selectmenu",
42+
"sortable",
43+
"slider",
44+
"spinner",
45+
"tabs",
46+
"tooltip",
47+
"theme"
48+
].map(function( component ) {
49+
return "themes/base/" + component + ".css";
50+
}),
51+
2752
// minified files
2853
minify = {
2954
options: {
@@ -113,6 +138,18 @@ grunt.initConfig({
113138
dist: "<%= pkg.name %>-<%= pkg.version %>"
114139
},
115140
compare_size: compareFiles,
141+
concat: {
142+
css: {
143+
options: {
144+
banner: createBanner( cssFiles ),
145+
stripBanners: {
146+
block: true
147+
}
148+
},
149+
src: cssFiles,
150+
dest: "dist/jquery-ui.css"
151+
}
152+
},
116153
requirejs: {
117154
js: {
118155
options: {
@@ -126,7 +163,7 @@ grunt.initConfig({
126163
findNestedDependencies: true,
127164
skipModuleInsertion: true,
128165
exclude: [ "jquery" ],
129-
include: expandFiles( [ "ui/**/*.js", "!ui/i18n/*" ] ),
166+
include: expandFiles( [ "ui/**/*.js", "!ui/core.js", "!ui/i18n/*" ] ),
130167
out: "dist/jquery-ui.js",
131168
wrap: {
132169
start: createBanner( uiFiles ),

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"grunt": "0.4.2",
5757
"grunt-bowercopy": "1.1.0",
5858
"grunt-compare-size": "0.4.0",
59+
"grunt-contrib-concat": "0.5.1",
5960
"grunt-contrib-csslint": "0.2.0",
6061
"grunt-contrib-jshint": "0.7.1",
6162
"grunt-contrib-qunit": "0.6.0",

0 commit comments

Comments
 (0)