Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minify more JS #8329

Merged
merged 24 commits into from Dec 7, 2017
Merged

Minify more JS #8329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
1bb4776
Minify widget JS
gravityrail Dec 7, 2017
16b5058
Minify AtD
gravityrail Dec 7, 2017
ab748bb
Minify widget-visibility
gravityrail Dec 7, 2017
35e9e8a
Minify Custom CSS
gravityrail Dec 7, 2017
0ab066d
Minify publicize
gravityrail Dec 7, 2017
20dc747
Minify custom-post-types
gravityrail Dec 7, 2017
a4fe85b
Minify sharedaddy
gravityrail Dec 7, 2017
468e668
Minify contact-form
gravityrail Dec 7, 2017
cf0bd89
Minify photon
gravityrail Dec 7, 2017
e3f1d76
Minify carousel
gravityrail Dec 7, 2017
d3c6819
Minify related-posts
gravityrail Dec 7, 2017
83b9550
Minify tiled-gallery
gravityrail Dec 7, 2017
2955455
Minify likes
gravityrail Dec 7, 2017
e5879e8
Minify minileven
gravityrail Dec 7, 2017
fa5a1d5
Minify infinite-scroll
gravityrail Dec 7, 2017
e24bf86
Minify masterbar
gravityrail Dec 7, 2017
d0e2a23
Minify videopress
gravityrail Dec 7, 2017
db1155c
Minify comment-likes
gravityrail Dec 7, 2017
279b8aa
Minify lazy-images
gravityrail Dec 7, 2017
5584201
Fix non-minified paths
gravityrail Dec 7, 2017
597855d
One more fix for non-minified paths
gravityrail Dec 7, 2017
f1b3cd3
Photon: Fix path for non-minified file
ebinnion Dec 7, 2017
e2bed1a
Custom CSS: Fix non-minified paths
ebinnion Dec 7, 2017
ed77178
Custom CSS: Fix more non-minified paths
ebinnion Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion class.photon.php
View file
Open in desktop
Expand Up @@ -1014,6 +1014,15 @@ function filter_open_graph_tags( $tags, $parameters ) {
* @return null
*/
public function action_wp_enqueue_scripts() {
wp_enqueue_script( 'jetpack-photon', plugins_url( 'modules/photon/photon.js', JETPACK__PLUGIN_FILE ), array( 'jquery' ), 20130122, true );
wp_enqueue_script(
'jetpack-photon',
Jetpack::get_file_url_for_environment(
'_inc/build/photon/photon.min.js',
'modules/photon/photon.js'
),
array( 'jquery' ),
20130122,
true
);
}
}
21 changes: 20 additions & 1 deletion gulpfile.babel.js
View file
Open in desktop
Expand Up @@ -80,7 +80,26 @@ function onBuild( done ) {
const is_prod = 'production' === process.env.NODE_ENV;

const supportedModules = [
'shortcodes'
'shortcodes',
'widgets',
'after-the-deadline',
'widget-visibility',
'custom-css',
'publicize',
'custom-post-types',
'sharedaddy',
'contact-form',
'photon',
'carousel',
'related-posts',
'tiled-gallery',
'likes',
'minileven',
'infinite-scroll',
'masterbar',
'videopress',
'comment-likes',
'lazy-images'
];

// Source any JS for whitelisted modules, which will minimize us shipping much
Expand Down
40 changes: 36 additions & 4 deletions modules/after-the-deadline.php
View file
Open in desktop
Expand Up @@ -196,11 +196,43 @@ function AtD_settings() {

function AtD_load_javascripts() {
if ( AtD_should_load_on_page() ) {
wp_enqueue_script( 'AtD_core', plugins_url( '/after-the-deadline/atd.core.js', __FILE__ ), array(), ATD_VERSION );
wp_enqueue_script( 'AtD_quicktags', plugins_url( '/after-the-deadline/atd-nonvis-editor-plugin.js', __FILE__ ), array('quicktags'), ATD_VERSION );
wp_enqueue_script( 'AtD_jquery', plugins_url( '/after-the-deadline/jquery.atd.js', __FILE__ ), array('jquery'), ATD_VERSION );
wp_enqueue_script(
'AtD_core',
Jetpack::get_file_url_for_environment(
'_inc/build/after-the-deadline/atd.core.min.js',
'modules/after-the-deadline/atd.core.js'
),
array(),
ATD_VERSION
);
wp_enqueue_script(
'AtD_quicktags',
Jetpack::get_file_url_for_environment(
'_inc/build/after-the-deadline/atd-nonvis-editor-plugin.min.js',
'modules/after-the-deadline/atd-nonvis-editor-plugin.js'
),
array('quicktags'),
ATD_VERSION
);
wp_enqueue_script(
'AtD_jquery',
Jetpack::get_file_url_for_environment(
'_inc/build/after-the-deadline/jquery.atd.min.js',
'modules/after-the-deadline/jquery.atd.js'
),
array('jquery'),
ATD_VERSION
);
wp_enqueue_script( 'AtD_settings', admin_url() . 'admin-ajax.php?action=atd_settings', array('AtD_jquery'), ATD_VERSION );
wp_enqueue_script( 'AtD_autoproofread', plugins_url( '/after-the-deadline/atd-autoproofread.js', __FILE__ ), array('AtD_jquery'), ATD_VERSION );
wp_enqueue_script(
'AtD_autoproofread',
Jetpack::get_file_url_for_environment(
'_inc/build/after-the-deadline/atd-autoproofread.min.js',
'modules/after-the-deadline/atd-autoproofread.js'
),
array('AtD_jquery'),
ATD_VERSION
);

/* load localized strings for AtD */
wp_localize_script( 'AtD_core', 'AtD_l10n_r0ar', array (
Expand Down
11 changes: 10 additions & 1 deletion modules/carousel/jetpack-carousel.php
View file
Open in desktop
Expand Up @@ -197,7 +197,16 @@ function check_if_shortcode_processed_and_enqueue_assets( $output ) {

function enqueue_assets() {
if ( $this->first_run ) {
wp_enqueue_script( 'jetpack-carousel', plugins_url( 'jetpack-carousel.js', __FILE__ ), array( 'jquery.spin' ), $this->asset_version( '20170209' ), true );
wp_enqueue_script(
'jetpack-carousel',
Jetpack::get_file_url_for_environment(
'_inc/build/carousel/jetpack-carousel.min.js',
'modules/carousel/jetpack-carousel.js'
),
array( 'jquery.spin' ),
$this->asset_version( '20170209' ),
true
);

// Note: using home_url() instead of admin_url() for ajaxurl to be sure to get same domain on wpcom when using mapped domains (also works on self-hosted)
// Also: not hardcoding path since there is no guarantee site is running on site root in self-hosted context.
Expand Down
10 changes: 9 additions & 1 deletion modules/comment-likes.php
View file
Open in desktop
Expand Up @@ -103,7 +103,15 @@ class="comment-like-count"

function enqueue_admin_styles_scripts() {
wp_enqueue_style( 'comment-like-count', plugins_url( 'comment-likes/admin-style.css', __FILE__ ), array(), JETPACK__VERSION );
wp_enqueue_script( 'comment-like-count', plugins_url( 'comment-likes/comment-like-count.js', __FILE__ ), array( 'jquery' ), JETPACK__VERSION );
wp_enqueue_script(
'comment-like-count',
Jetpack::get_file_url_for_environment(
'_inc/build/comment-likes/comment-like-count.min.js',
'modules/comment-likes/comment-like-count.js'
),
array( 'jquery' ),
JETPACK__VERSION
);
}

public function add_like_count_column( $columns ) {
Expand Down
9 changes: 8 additions & 1 deletion modules/contact-form/admin.php
View file
Open in desktop
Expand Up @@ -787,7 +787,14 @@ function grunion_enable_spam_recheck() {
}

// Add the scripts that handle the spam check event.
wp_register_script( 'grunion-admin', plugin_dir_url( __FILE__ ) . 'js/grunion-admin.js', array( 'jquery' ) );
wp_register_script(
'grunion-admin',
Jetpack::get_file_url_for_environment(
'_inc/build/contact-form/js/grunion-admin.min.js',
'modules/contact-form/js/grunion-admin.js'
),
array( 'jquery' )
);
wp_enqueue_script( 'grunion-admin' );

wp_enqueue_style( 'grunion.css' );
Expand Down
9 changes: 8 additions & 1 deletion modules/contact-form/grunion-contact-form.php
View file
Open in desktop
Expand Up @@ -2683,7 +2683,14 @@ function render() {
$r .= "\t\t<input type='text' name='" . esc_attr( $field_id ) . "' id='" . esc_attr( $field_id ) . "' value='" . esc_attr( $field_value ) . "' " . $field_class . ( $field_required ? "required aria-required='true'" : '' ) . "/>\n";
$r .= "\t</div>\n";

wp_enqueue_script( 'grunion-frontend', plugins_url( 'js/grunion-frontend.js', __FILE__ ), array( 'jquery', 'jquery-ui-datepicker' ) );
wp_enqueue_script(
'grunion-frontend',
Jetpack::get_file_url_for_environment(
'_inc/build/contact-form/js/grunion-frontend.min.js',
'modules/contact-form/js/grunion-frontend.js'
),
array( 'jquery', 'jquery-ui-datepicker' )
);
wp_enqueue_style( 'jp-jquery-ui-datepicker', plugins_url( 'css/jquery-ui-datepicker.css', __FILE__ ), array( 'dashicons' ), '1.0' );

// Using Core's built-in datepicker localization routine
Expand Down
16 changes: 14 additions & 2 deletions modules/contact-form/grunion-editor-view.php
View file
Open in desktop
Expand Up @@ -39,7 +39,10 @@ public static function grunion_media_button() {
}

public static function mce_external_plugins( $plugin_array ) {
$plugin_array['grunion_form'] = plugins_url( 'js/tinymce-plugin-form-button.js', __FILE__ );
$plugin_array['grunion_form'] = Jetpack::get_file_url_for_environment(
'_inc/build/contact-form/js/tinymce-plugin-form-button.min.js',
'modules/contact-form/js/tinymce-plugin-form-button.js'
);
return $plugin_array;
}

Expand All @@ -64,7 +67,16 @@ public static function handle_editor_view_js() {

wp_enqueue_style( 'grunion-editor-ui', plugins_url( 'css/editor-ui.css', __FILE__ ) );
wp_style_add_data( 'grunion-editor-ui', 'rtl', 'replace' );
wp_enqueue_script( 'grunion-editor-view', plugins_url( 'js/editor-view.js', __FILE__ ), array( 'wp-util', 'jquery', 'quicktags' ), false, true );
wp_enqueue_script(
'grunion-editor-view',
Jetpack::get_file_url_for_environment(
'_inc/build/contact-form/js/editor-view.min.js',
'modules/contact-form/js/editor-view.js'
),
array( 'wp-util', 'jquery', 'quicktags' ),
false,
true
);
wp_localize_script( 'grunion-editor-view', 'grunionEditorView', array(
'inline_editing_style' => plugins_url( 'css/editor-inline-editing-style.css', __FILE__ ),
'inline_editing_style_rtl' => plugins_url( 'css/editor-inline-editing-style-rtl.css', __FILE__ ),
Expand Down
11 changes: 10 additions & 1 deletion modules/contact-form/grunion-form-view.php
View file
Open in desktop
Expand Up @@ -14,7 +14,16 @@
*/
$max_new_fields = apply_filters( 'grunion_max_new_fields', 5 );

wp_register_script( 'grunion', GRUNION_PLUGIN_URL . 'js/grunion.js', array( 'jquery-ui-sortable', 'jquery-ui-draggable' ), JETPACK__VERSION );
wp_register_script(
'grunion',
Jetpack::get_file_url_for_environment(
'_inc/build/contact-form/js/grunion.min.js',
'modules/contact-form/js/grunion.js'
),
array( 'jquery-ui-sortable', 'jquery-ui-draggable' ),
JETPACK__VERSION
);

wp_localize_script( 'grunion', 'GrunionFB_i18n', array(
'nameLabel' => esc_attr( _x( 'Name', 'Label for HTML form "Name" field in contact form builder', 'jetpack' ) ),
'emailLabel' => esc_attr( _x( 'Email', 'Label for HTML form "Email" field in contact form builder', 'jetpack' ) ),
Expand Down
21 changes: 18 additions & 3 deletions modules/custom-css/custom-css-4.7.php
View file
Open in desktop
Expand Up @@ -67,15 +67,30 @@ public static function init() {
wp_register_style( 'jetpack-customizer-css', plugins_url( 'custom-css/css/customizer-control.css', __FILE__ ), $deps, '20140728' );
wp_register_script( 'jetpack-codemirror', plugins_url( 'custom-css/js/codemirror.min.js', __FILE__ ), array(), '3.16', true );
$deps = array( 'customize-controls', 'underscore' );
$src = plugins_url( 'custom-css/js/core-customizer-css.core-4.9.js', __FILE__ );
$src = Jetpack::get_file_url_for_environment(
'_inc/build/custom-css/custom-css/js/core-customizer-css.core-4.9.min.js',
'modules/custom-css/custom-css/js/core-customizer-css.core-4.9.js'
);
if ( ! function_exists( 'wp_enqueue_code_editor' ) ) {
// If Core < 4.9
$deps[] = 'jetpack-codemirror';
$src = plugins_url( 'custom-css/js/core-customizer-css.js', __FILE__ );
$src = Jetpack::get_file_url_for_environment(
'_inc/build/custom-css/custom-css/js/core-customizer-css.min.js',
'modules/custom-css/custom-css/js/core-customizer-css.js'
);
}
wp_register_script( 'jetpack-customizer-css', $src, $deps, JETPACK__VERSION, true );

wp_register_script( 'jetpack-customizer-css-preview', plugins_url( 'custom-css/js/core-customizer-css-preview.js', __FILE__ ), array( 'customize-selective-refresh' ), JETPACK__VERSION, true );
wp_register_script(
'jetpack-customizer-css-preview',
Jetpack::get_file_url_for_environment(
'_inc/build/custom-css/custom-css/js/core-customizer-css-preview.min.js',
'modules/custom-css/custom-css/js/core-customizer-css-preview.js'
),
array( 'customize-selective-refresh' ),
JETPACK__VERSION,
true
);

remove_action( 'wp_head', 'wp_custom_css_cb', 11 ); // 4.7.0 had it at 11, 4.7.1 moved it to 101.
remove_action( 'wp_head', 'wp_custom_css_cb', 101 );
Expand Down
22 changes: 20 additions & 2 deletions modules/custom-css/custom-css.php
View file
Open in desktop
Expand Up @@ -930,15 +930,33 @@ static function enqueue_scripts( $hook ) {
return;

wp_enqueue_script( 'postbox' );
wp_enqueue_script( 'custom-css-editor', plugins_url( 'custom-css/js/css-editor.js', __FILE__ ), 'jquery', '20130325', true );
wp_enqueue_script(
'custom-css-editor',
Jetpack::get_file_url_for_environment(
'_inc/build/custom-css/custom-css/js/css-editor.min.js',
'modules/custom-css/custom-css/js/css-editor.js'
),
'jquery',
'20130325',
true
);
wp_enqueue_style( 'custom-css-editor', plugins_url( 'custom-css/css/css-editor.css', __FILE__ ) );

if ( defined( 'SAFECSS_USE_ACE' ) && SAFECSS_USE_ACE ) {
wp_register_style( 'jetpack-css-codemirror', plugins_url( 'custom-css/css/codemirror.css', __FILE__ ), array(), '20120905' );
wp_enqueue_style( 'jetpack-css-use-codemirror', plugins_url( 'custom-css/css/use-codemirror.css', __FILE__ ), array( 'jetpack-css-codemirror' ), '20120905' );

wp_register_script( 'jetpack-css-codemirror', plugins_url( 'custom-css/js/codemirror.min.js', __FILE__ ), array(), '3.16', true );
wp_enqueue_script( 'jetpack-css-use-codemirror', plugins_url( 'custom-css/js/use-codemirror.js', __FILE__ ), array( 'jquery', 'underscore', 'jetpack-css-codemirror' ), '20131009', true );
wp_enqueue_script(
'jetpack-css-use-codemirror',
Jetpack::get_file_url_for_environment(
'_inc/build/custom-css/custom-css/js/use-codemirror.min.js',
'modules/custom-css/custom-css/js/use-codemirror.js'
),
array( 'jquery', 'underscore', 'jetpack-css-codemirror' ),
'20131009',
true
);
}
}

Expand Down
9 changes: 8 additions & 1 deletion modules/custom-post-types/comics.php
View file
Open in desktop
Expand Up @@ -176,7 +176,14 @@ public function register_scripts() {
wp_enqueue_style( 'jetpack-comics-style', plugins_url( 'comics/comics.css', __FILE__ ) );
wp_style_add_data( 'jetpack-comics-style', 'rtl', 'replace' );

wp_enqueue_script( 'jetpack-comics', plugins_url( 'comics/comics.js', __FILE__ ), array( 'jquery', 'jquery.spin' ) );
wp_enqueue_script(
'jetpack-comics',
Jetpack::get_file_url_for_environment(
'_inc/build/custom-post-types/comics/comics.min.js',
'modules/custom-post-types/comics/comics.js'
),
array( 'jquery', 'jquery.spin' )
);

$options = array(
'nonce' => wp_create_nonce( 'jetpack_comic_upload_nonce' ),
Expand Down
34 changes: 31 additions & 3 deletions modules/custom-post-types/nova.php
View file
Open in desktop
Expand Up @@ -442,7 +442,16 @@ function add_admin_menus() {

$this->setup_menu_item_columns();

wp_register_script( 'nova-menu-checkboxes', plugins_url( 'js/menu-checkboxes.js', __FILE__ ), array( 'jquery' ), $this->version, true );
wp_register_script(
'nova-menu-checkboxes',
Jetpack::get_file_url_for_environment(
'_inc/build/custom-post-types/js/menu-checkboxes.min.js',
'modules/custom-post-types/js/menu-checkboxes.js'
),
array( 'jquery' ),
$this->version,
true
);
}


Expand Down Expand Up @@ -610,7 +619,17 @@ function edit_menu_items_page_load() {

$this->maybe_reorder_menu_items();

wp_enqueue_script( 'nova-drag-drop', plugins_url( 'js/nova-drag-drop.js', __FILE__ ), array( 'jquery-ui-sortable' ), $this->version, true );
wp_enqueue_script(
'nova-drag-drop',
Jetpack::get_file_url_for_environment(
'_inc/build/custom-post-types/js/nova-drag-drop.min.js',
'modules/custom-post-types/js/nova-drag-drop.js'
),
array( 'jquery-ui-sortable' ),
$this->version,
true
);

wp_localize_script( 'nova-drag-drop', '_novaDragDrop', array(
'nonce' => wp_create_nonce( 'drag-drop-reorder' ),
'nonceName' => 'drag-drop-reorder',
Expand Down Expand Up @@ -847,7 +866,16 @@ function add_many_new_items_page_load() {
}

function enqueue_many_items_scripts() {
wp_enqueue_script( 'nova-many-items', plugins_url( 'js/many-items.js', __FILE__ ), array( 'jquery' ), $this->version, true );
wp_enqueue_script(
'nova-many-items',
Jetpack::get_file_url_for_environment(
'_inc/build/custom-post-types/js/many-items.min.js',
'modules/custom-post-types/js/many-items.js'
),
array( 'jquery' ),
$this->version,
true
);
}

function process_form_request() {
Expand Down
11 changes: 10 additions & 1 deletion modules/infinite-scroll/infinity.php
View file
Open in desktop
Expand Up @@ -406,7 +406,16 @@ function action_template_redirect() {
return;

// Add our scripts.
wp_register_script( 'the-neverending-homepage', plugins_url( 'infinity.js', __FILE__ ), array( 'jquery' ), '4.0.0', true );
wp_register_script(
'the-neverending-homepage',
Jetpack::get_file_url_for_environment(
'_inc/build/infinite-scroll/infinity.min.js',
'modules/infinite-scroll/infinity.js'
),
array( 'jquery' ),
'4.0.0',
true
);

// Add our default styles.
wp_register_style( 'the-neverending-homepage', plugins_url( 'infinity.css', __FILE__ ), array(), '20140422' );
Expand Down
5 changes: 4 additions & 1 deletion modules/lazy-images/lazy-images.php
View file
Open in desktop
Expand Up @@ -171,7 +171,10 @@ private static function build_attributes_string( $attributes ) {
public function enqueue_assets() {
wp_enqueue_script(
'jetpack-lazy-images',
plugins_url( 'modules/lazy-images/js/lazy-images.js', JETPACK__PLUGIN_FILE ),
Jetpack::get_file_url_for_environment(
'_inc/build/lazy-images/js/lazy-images.min.js',
'modules/lazy-images/js/lazy-images.js'
),
array( 'jquery' ),
JETPACK__VERSION,
true
Expand Down