Changeset 7428

Timestamp:

07/11/2018 09:05:30 PM (7 years ago)

Author:

obenland

Message:

WPorg: Use compressed scripts.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg

Files:

• Gruntfile.js (modified) (2 diffs)
• functions.php (modified) (1 diff)
• js/navigation.min.js (added)
• js/skip-link-focus-fix.min.js (added)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg/Gruntfile.js

@@ -39 +39 @@
             files: [ 'Gruntfile.js', 'js/**/*.js' ],
             options: grunt.file.readJSON( '.jshintrc' )
+        },
+        uglify: {
+            options: {
+                ASCIIOnly: true,
+                screwIE8: false
+            },
+            js: {
+                expand: true,
+                cwd: 'js/',
+                dest: 'js/',
+                ext: '.min.js',
+                src: '**/*.js',
+            }
         },
         sass: {
@@ -157 +170 @@
     grunt.loadNpmTasks( 'grunt-contrib-watch' );
     grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+    grunt.loadNpmTasks( 'grunt-contrib-uglify' );
 
     grunt.registerTask( 'css', ['sass_globbing', 'sass', 'postcss', 'rtlcss:dynamic'] );
     grunt.registerTask( 'default', ['jshint', 'css'] );
-    grunt.registerTask( 'build', ['css'] );
+    grunt.registerTask( 'build', ['css', 'uglify:js'] );
 };

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg/functions.php

@@ -100 +100 @@
  */
 function scripts() {
+    $script_debug = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG;
+    $suffix       = $script_debug ? '' : '.min';
+
+    // Concatenates core scripts when possible.
+    if ( ! $script_debug ) {
+        $GLOBALS['concatenate_scripts'] = true;
+    }
+
     wp_enqueue_style( 'wporg-style', get_theme_file_uri( '/css/style.css' ), [ 'dashicons', 'open-sans' ], '20180702' );
     wp_style_add_data( 'wporg-style', 'rtl', 'replace' );
 
     // phpcs:ignore Squiz.PHP.CommentedOutCode.Found, Squiz.Commenting.InlineComment.InvalidEndChar
-    // wp_enqueue_script( 'wporg-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20151215', true );
-    wp_enqueue_script( 'wporg-plugins-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20151215', true );
+    // wp_enqueue_script( 'wporg-navigation', get_template_directory_uri() . "/js/navigation$suffix.js", array(), '20151215', true );
+    wp_enqueue_script( 'wporg-plugins-skip-link-focus-fix', get_template_directory_uri() . "/js/skip-link-focus-fix$suffix.js", array(), '20151215', true );
 
     if ( ! is_front_page() && is_singular() && comments_open() && get_option( 'thread_comments' ) ) {