@@ -150,16 +150,6 @@ grunt.initConfig({
150
150
} ,
151
151
compare_size : compareFiles ,
152
152
concat : {
153
- ui : {
154
- options : {
155
- banner : createBanner ( uiFiles ) ,
156
- stripBanners : {
157
- block : true
158
- }
159
- } ,
160
- src : uiFiles ,
161
- dest : "dist/jquery-ui.js"
162
- } ,
163
153
i18n : {
164
154
options : {
165
155
banner : createBanner ( allI18nFiles )
@@ -178,6 +168,27 @@ grunt.initConfig({
178
168
dest : "dist/jquery-ui.css"
179
169
}
180
170
} ,
171
+ requirejs : {
172
+ js : {
173
+ options : {
174
+ baseUrl : "./" ,
175
+ paths : {
176
+ jquery : "./external/jquery/jquery" ,
177
+ external : "./external/"
178
+ } ,
179
+ preserveLicenseComments : false ,
180
+ optimize : "none" ,
181
+ findNestedDependencies : true ,
182
+ skipModuleInsertion : true ,
183
+ exclude : [ "jquery" ] ,
184
+ include : expandFiles ( [ "ui/**/*.js" , "!ui/i18n/*" ] ) ,
185
+ out : "dist/jquery-ui.js" ,
186
+ wrap : {
187
+ start : createBanner ( uiFiles ) ,
188
+ }
189
+ }
190
+ }
191
+ } ,
181
192
182
193
// Remove the requireSpacesInsideParentheses override once everything is fixed
183
194
jscs : {
@@ -455,10 +466,10 @@ grunt.registerTask( "update-authors", function() {
455
466
} ) ;
456
467
} ) ;
457
468
458
- grunt . registerTask ( "default" , [ "lint" , "test" ] ) ;
469
+ grunt . registerTask ( "default" , [ "lint" , "requirejs" , " test" ] ) ;
459
470
grunt . registerTask ( "lint" , [ "asciilint" , "jshint" , "jscs" , "csslint" , "htmllint" ] ) ;
460
471
grunt . registerTask ( "test" , [ "qunit" ] ) ;
461
- grunt . registerTask ( "sizer" , [ "concat:ui " , "uglify:main" , "compare_size:all" ] ) ;
462
- grunt . registerTask ( "sizer_all" , [ "concat:ui " , "uglify" , "compare_size" ] ) ;
472
+ grunt . registerTask ( "sizer" , [ "requirejs:js " , "uglify:main" , "compare_size:all" ] ) ;
473
+ grunt . registerTask ( "sizer_all" , [ "requirejs:js " , "uglify" , "compare_size" ] ) ;
463
474
464
475
} ;
0 commit comments