Ticket #25117: 25117.2.diff

.gitignore

@@ -15 +15 @@
 /npm-debug.log
 /build
 /tests/phpunit/build
+
 
 # Files and folders that get created in wp-content
 /src/wp-content/blogs.dir

Gruntfile.js

@@ -42 +42 @@
                                 src: []
                         },
                         tinymce: ['<%= concat.tinymce.dest %>'],
-                        qunit: ['tests/qunit/compiled.html']
+                        qunit: ['tests/qunit/compiled.html'],
+                        packages: ['packages/**']
                 },
                 copy: {
                         files: {
@@ -377 +378 @@
                                 },
                                 src: '<%= concat.tinymce.dest %>',
                                 dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                         }
                 },
                 jsvalidate:{
@@ -466 +507 @@
         grunt.registerTask('build', ['clean:all', 'copy:all', 'cssmin:core', 'colors', 'rtl', 'cssmin:rtl', 'cssmin:colors',
                 'uglify:core', 'concat:tinymce', 'compress:tinymce', 'clean:tinymce', 'jsvalidate:build']);
 
+
+
+
+
         // Testing tasks.
         grunt.registerMultiTask('phpunit', 'Runs PHPUnit tests, including the ajax and multisite tests.', function() {
                 grunt.util.spawn({