diff --git a/class.photon.php b/class.photon.php index 636217d736950..58a3e11d6f335 100644 --- a/class.photon.php +++ b/class.photon.php @@ -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 + ); } } diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 21435e1360fb1..362abcefc32ca 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -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 diff --git a/modules/after-the-deadline.php b/modules/after-the-deadline.php index 47af703f53154..a30b38be0bef0 100644 --- a/modules/after-the-deadline.php +++ b/modules/after-the-deadline.php @@ -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 ( diff --git a/modules/carousel/jetpack-carousel.php b/modules/carousel/jetpack-carousel.php index e75b94cd1b952..8d4cd56b6671a 100644 --- a/modules/carousel/jetpack-carousel.php +++ b/modules/carousel/jetpack-carousel.php @@ -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. diff --git a/modules/comment-likes.php b/modules/comment-likes.php index c6e5ae8e95f99..00c5a0bfe34a8 100644 --- a/modules/comment-likes.php +++ b/modules/comment-likes.php @@ -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 ) { diff --git a/modules/contact-form/admin.php b/modules/contact-form/admin.php index 834c95c19bd71..7df46a1349435 100644 --- a/modules/contact-form/admin.php +++ b/modules/contact-form/admin.php @@ -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' ); diff --git a/modules/contact-form/grunion-contact-form.php b/modules/contact-form/grunion-contact-form.php index 3323f5e8f5465..7bb7c47a34ee7 100644 --- a/modules/contact-form/grunion-contact-form.php +++ b/modules/contact-form/grunion-contact-form.php @@ -2683,7 +2683,14 @@ function render() { $r .= "\t\t\n"; $r .= "\t\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 diff --git a/modules/contact-form/grunion-editor-view.php b/modules/contact-form/grunion-editor-view.php index ecdcf76ecc7b1..e012894f20be4 100644 --- a/modules/contact-form/grunion-editor-view.php +++ b/modules/contact-form/grunion-editor-view.php @@ -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; } @@ -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__ ), diff --git a/modules/contact-form/grunion-form-view.php b/modules/contact-form/grunion-form-view.php index e9c9a736abdf9..7417965ec82d4 100644 --- a/modules/contact-form/grunion-form-view.php +++ b/modules/contact-form/grunion-form-view.php @@ -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' ) ), diff --git a/modules/custom-css/custom-css-4.7.php b/modules/custom-css/custom-css-4.7.php index 259bb79a5208c..9e8fe4d8c7edd 100644 --- a/modules/custom-css/custom-css-4.7.php +++ b/modules/custom-css/custom-css-4.7.php @@ -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 ); diff --git a/modules/custom-css/custom-css.php b/modules/custom-css/custom-css.php index f5e91f09a1cad..77570e9b1feee 100644 --- a/modules/custom-css/custom-css.php +++ b/modules/custom-css/custom-css.php @@ -930,7 +930,16 @@ 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 ) { @@ -938,7 +947,16 @@ static function enqueue_scripts( $hook ) { 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 + ); } } diff --git a/modules/custom-post-types/comics.php b/modules/custom-post-types/comics.php index a1d8bf78dab60..6ff4fbad0a7a4 100644 --- a/modules/custom-post-types/comics.php +++ b/modules/custom-post-types/comics.php @@ -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' ), diff --git a/modules/custom-post-types/nova.php b/modules/custom-post-types/nova.php index 33d5bce909656..8024825c0e6b9 100644 --- a/modules/custom-post-types/nova.php +++ b/modules/custom-post-types/nova.php @@ -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 + ); } @@ -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', @@ -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() { diff --git a/modules/infinite-scroll/infinity.php b/modules/infinite-scroll/infinity.php index 06223d1585e06..4d3f05f600d95 100644 --- a/modules/infinite-scroll/infinity.php +++ b/modules/infinite-scroll/infinity.php @@ -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' ); diff --git a/modules/lazy-images/lazy-images.php b/modules/lazy-images/lazy-images.php index 38610bab98e72..ca7d6419f0613 100644 --- a/modules/lazy-images/lazy-images.php +++ b/modules/lazy-images/lazy-images.php @@ -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 diff --git a/modules/likes.php b/modules/likes.php index 84204cc3951e2..deaaa6765f363 100644 --- a/modules/likes.php +++ b/modules/likes.php @@ -296,7 +296,16 @@ function register_scripts() { JETPACK__VERSION, false ); - wp_register_script( 'jetpack_likes_queuehandler', plugins_url( 'likes/queuehandler.js' , __FILE__ ), array( 'jquery', 'postmessage', 'jetpack_resize' ), JETPACK__VERSION, true ); + wp_register_script( + 'jetpack_likes_queuehandler', + Jetpack::get_file_url_for_environment( + '_inc/build/likes/queuehandler.min.js', + 'modules/likes/queuehandler.js' + ), + array( 'jquery', 'postmessage', 'jetpack_resize' ), + JETPACK__VERSION, + true + ); } /** @@ -348,8 +357,24 @@ function load_admin_css() { function enqueue_admin_scripts() { if ( empty( $_GET['post_type'] ) || 'post' == $_GET['post_type'] || 'page' == $_GET['post_type'] ) { if ( $this->in_jetpack ) { - wp_enqueue_script( 'likes-post-count', plugins_url( 'modules/likes/post-count.js', dirname( __FILE__ ) ), array( 'jquery' ), JETPACK__VERSION ); - wp_enqueue_script( 'likes-post-count-jetpack', plugins_url( 'modules/likes/post-count-jetpack.js', dirname( __FILE__ ) ), array( 'likes-post-count' ), JETPACK__VERSION ); + wp_enqueue_script( + 'likes-post-count', + Jetpack::get_file_url_for_environment( + '_inc/build/likes/post-count.min.js', + 'modules/likes/post-count.js' + ), + array( 'jquery' ), + JETPACK__VERSION + ); + wp_enqueue_script( + 'likes-post-count-jetpack', + Jetpack::get_file_url_for_environment( + '_inc/build/likes/post-count-jetpack.min.js', + 'modules/likes/post-count-jetpack.js' + ), + array( 'likes-post-count' ), + JETPACK__VERSION + ); } else { wp_enqueue_script( 'jquery.wpcom-proxy-request', "/wp-content/js/jquery/jquery.wpcom-proxy-request.js", array('jquery'), NULL, true ); wp_enqueue_script( 'likes-post-count', plugins_url( 'likes/post-count.js', dirname( __FILE__ ) ), array( 'jquery' ), JETPACK__VERSION ); diff --git a/modules/masterbar/masterbar.php b/modules/masterbar/masterbar.php index c634c9f8ee09c..3cc51943bd271 100644 --- a/modules/masterbar/masterbar.php +++ b/modules/masterbar/masterbar.php @@ -138,7 +138,15 @@ public function add_styles_and_scripts() { array(), JETPACK__VERSION ); - wp_enqueue_script( 'a8c_wpcom_masterbar_tracks_events', plugins_url( 'tracks-events.js', __FILE__ ), array( 'jquery' ), JETPACK__VERSION ); + wp_enqueue_script( + 'a8c_wpcom_masterbar_tracks_events', + Jetpack::get_file_url_for_environment( + '_inc/build/masterbar/tracks-events.min.js', + 'modules/masterbar/tracks-events.js' + ), + array( 'jquery' ), + JETPACK__VERSION + ); wp_enqueue_script( 'a8c_wpcom_masterbar_overrides', $this->wpcom_static_url( '/wp-content/mu-plugins/admin-bar/masterbar-overrides/masterbar.js' ), array( 'jquery' ), JETPACK__VERSION ); } diff --git a/modules/minileven/theme/pub/minileven/functions.php b/modules/minileven/theme/pub/minileven/functions.php index 5e0119e753d27..657d0db2f636c 100644 --- a/modules/minileven/theme/pub/minileven/functions.php +++ b/modules/minileven/theme/pub/minileven/functions.php @@ -79,7 +79,16 @@ function minileven_scripts() { wp_enqueue_style( 'style', get_stylesheet_uri() ); - wp_enqueue_script( 'small-menu', get_template_directory_uri() . '/js/small-menu.js', array( 'jquery' ), '20120206', true ); + wp_enqueue_script( + 'small-menu', + Jetpack::get_file_url_for_environment( + '_inc/build/minileven/theme/pub/minileven/js/small-menu.min.js', + 'modules/minileven/theme/pub/minileven/js/small-menu.js' + ), + array( 'jquery' ), + '20120206', + true + ); if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { wp_enqueue_script( 'comment-reply' ); diff --git a/modules/publicize/ui.php b/modules/publicize/ui.php index 7d5e3f36f6b98..9d347e357d9ea 100644 --- a/modules/publicize/ui.php +++ b/modules/publicize/ui.php @@ -78,7 +78,10 @@ function management_page() { ?> function load_assets() { wp_enqueue_script( 'publicize', - plugins_url( 'assets/publicize.js', __FILE__ ), + Jetpack::get_file_url_for_environment( + '_inc/build/publicize/assets/publicize.min.js', + 'modules/publicize/assets/publicize.js' + ), array( 'jquery', 'thickbox' ), '20121019' ); diff --git a/modules/related-posts/class.related-posts-customize.php b/modules/related-posts/class.related-posts-customize.php index 4b937396d6885..76a2e49420c0f 100644 --- a/modules/related-posts/class.related-posts-customize.php +++ b/modules/related-posts/class.related-posts-customize.php @@ -235,7 +235,15 @@ function get_options( $wp_customize ) { * @since 4.4.0 */ function customize_controls_enqueue_scripts() { - wp_enqueue_script( 'jetpack_related-posts-customizer', plugins_url( 'related-posts-customizer.js', __FILE__ ), array( 'customize-controls' ), JETPACK__VERSION); + wp_enqueue_script( + 'jetpack_related-posts-customizer', + Jetpack::get_file_url_for_environment( + '_inc/build/related-posts/related-posts-customizer.min.js', + 'modules/related-posts/related-posts-customizer.js' + ), + array( 'customize-controls' ), + JETPACK__VERSION + ); } } // class end diff --git a/modules/related-posts/jetpack-related-posts.php b/modules/related-posts/jetpack-related-posts.php index c9255afdcf5bf..131d6a9368505 100644 --- a/modules/related-posts/jetpack-related-posts.php +++ b/modules/related-posts/jetpack-related-posts.php @@ -1449,7 +1449,15 @@ protected function _action_frontend_init_page() { protected function _enqueue_assets( $script, $style ) { $dependencies = is_customize_preview() ? array( 'customize-base' ) : array( 'jquery' ); if ( $script ) { - wp_enqueue_script( 'jetpack_related-posts', plugins_url( 'related-posts.js', __FILE__ ), $dependencies, self::VERSION ); + wp_enqueue_script( + 'jetpack_related-posts', + Jetpack::get_file_url_for_environment( + '_inc/build/related-posts/related-posts.min.js', + 'modules/related-posts/related-posts.js' + ), + $dependencies, + self::VERSION + ); $related_posts_js_options = array( /** * Filter each Related Post Heading structure. diff --git a/modules/sharedaddy/sharing-service.php b/modules/sharedaddy/sharing-service.php index 21e42836528ac..2a056991d8ad7 100644 --- a/modules/sharedaddy/sharing-service.php +++ b/modules/sharedaddy/sharing-service.php @@ -791,7 +791,15 @@ function sharing_display( $text = '', $echo = false ) { } else { $ver = '20141212'; } - wp_register_script( 'sharing-js', plugin_dir_url( __FILE__ ).'sharing.js', array( 'jquery' ), $ver ); + wp_register_script( + 'sharing-js', + Jetpack::get_file_url_for_environment( + '_inc/build/sharedaddy/sharing.min.js', + 'modules/sharedaddy/sharing.js' + ), + array( 'jquery' ), + $ver + ); // Enqueue scripts for the footer add_action( 'wp_footer', 'sharing_add_footer' ); diff --git a/modules/sharedaddy/sharing.php b/modules/sharedaddy/sharing.php index b147b81a9be19..f6a6bebdb33d1 100644 --- a/modules/sharedaddy/sharing.php +++ b/modules/sharedaddy/sharing.php @@ -23,7 +23,15 @@ public function __construct() { } public function sharing_head() { - wp_enqueue_script( 'sharing-js', WP_SHARING_PLUGIN_URL . 'admin-sharing.js', array( 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-form' ), 2 ); + wp_enqueue_script( + 'sharing-js', + Jetpack::get_file_url_for_environment( + '_inc/build/sharedaddy/admin-sharing.min.js', + 'modules/sharedaddy/admin-sharing.js' + ), + array( 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-form' ), + 2 + ); $postfix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; if ( is_rtl() ) { wp_enqueue_style( 'sharing-admin', WP_SHARING_PLUGIN_URL . 'admin-sharing-rtl' . $postfix . '.css', false, JETPACK__VERSION ); @@ -376,10 +384,10 @@ public function management_page() { $label = $post_type_object->labels->name; } ?> - '; - } + } ?> should_override_media_uploader() ) { wp_enqueue_script( 'videopress-plupload', - plugins_url( 'js/videopress-plupload.js', __FILE__ ), + Jetpack::get_file_url_for_environment( + '_inc/build/videopress/js/videopress-plupload.min.js', + 'modules/videopress/js/videopress-plupload.js' + ), array( 'jquery', 'wp-plupload' @@ -140,7 +143,10 @@ public function enqueue_admin_scripts() { wp_enqueue_script( 'videopress-uploader', - plugins_url( 'js/videopress-uploader.js', __FILE__ ), + Jetpack::get_file_url_for_environment( + '_inc/build/videopress/js/videopress-uploader.min.js', + 'modules/videopress/js/videopress-uploader.js' + ), array( 'videopress-plupload' ), @@ -149,7 +155,10 @@ public function enqueue_admin_scripts() { wp_enqueue_script( 'media-video-widget-extensions', - plugins_url( 'js/media-video-widget-extensions.js', __FILE__ ), + Jetpack::get_file_url_for_environment( + '_inc/build/videopress/js/media-video-widget-extensions.min.js', + 'modules/videopress/js/media-video-widget-extensions.js' + ), array(), $this->version, true diff --git a/modules/videopress/editor-media-view.php b/modules/videopress/editor-media-view.php index 427c355217e5f..559eed3ac404d 100644 --- a/modules/videopress/editor-media-view.php +++ b/modules/videopress/editor-media-view.php @@ -13,7 +13,16 @@ function videopress_handle_editor_view_js() { add_action( 'admin_print_footer_scripts', 'videopress_editor_view_js_templates' ); wp_enqueue_style( 'videopress-editor-ui', plugins_url( 'css/editor.css', __FILE__ ) ); - wp_enqueue_script( 'videopress-editor-view', plugins_url( 'js/editor-view.js', __FILE__ ), array( 'wp-util', 'jquery' ), false, true ); + wp_enqueue_script( + 'videopress-editor-view', + Jetpack::get_file_url_for_environment( + '_inc/build/videopress/js/editor-view.min.js', + 'modules/videopress/js/editor-view.js' + ), + array( 'wp-util', 'jquery' ), + false, + true + ); wp_localize_script( 'videopress-editor-view', 'vpEditorView', array( 'home_url_host' => parse_url( home_url(), PHP_URL_HOST ), 'min_content_width' => VIDEOPRESS_MIN_WIDTH, diff --git a/modules/widget-visibility/widget-conditions.php b/modules/widget-visibility/widget-conditions.php index e85b25aeb64da..de4a063a5bce0 100644 --- a/modules/widget-visibility/widget-conditions.php +++ b/modules/widget-visibility/widget-conditions.php @@ -23,7 +23,16 @@ public static function init() { public static function widget_admin_setup() { wp_enqueue_style( 'widget-conditions', plugins_url( 'widget-conditions/widget-conditions.css', __FILE__ ) ); wp_style_add_data( 'widget-conditions', 'rtl', 'replace' ); - wp_enqueue_script( 'widget-conditions', plugins_url( 'widget-conditions/widget-conditions.js', __FILE__ ), array( 'jquery', 'jquery-ui-core' ), 20140721, true ); + wp_enqueue_script( + 'widget-conditions', + Jetpack::get_file_url_for_environment( + '_inc/build/widget-visibility/widget-conditions/widget-conditions.min.js', + 'modules/widget-visibility/widget-conditions/widget-conditions.js' + ), + array( 'jquery', 'jquery-ui-core' ), + 20140721, + true + ); // Set up a single copy of all of the data that Widget Visibility needs. // This allows all widget conditions to reuse the same data, keeping page size down diff --git a/modules/widgets/contact-info.php b/modules/widgets/contact-info.php index d994f20ba60be..3705e9752e38e 100644 --- a/modules/widgets/contact-info.php +++ b/modules/widgets/contact-info.php @@ -246,7 +246,15 @@ function update( $new_instance, $old_instance ) { */ function form( $instance ) { $instance = wp_parse_args( $instance, $this->defaults() ); - wp_enqueue_script( 'contact-info-admin', plugins_url( 'contact-info/contact-info-admin.js', __FILE__ ), array( 'jquery' ), 20160727 ); + wp_enqueue_script( + 'contact-info-admin', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/contact-info/contact-info-admin.min.js', + 'modules/widgets/contact-info/contact-info-admin.js' + ), + array( 'jquery' ), + 20160727 + ); ?>

diff --git a/modules/widgets/eu-cookie-law.php b/modules/widgets/eu-cookie-law.php index 14bb946062cb5..a5e37dba0a826 100644 --- a/modules/widgets/eu-cookie-law.php +++ b/modules/widgets/eu-cookie-law.php @@ -94,7 +94,16 @@ function __construct() { */ function enqueue_frontend_scripts() { wp_enqueue_style( 'eu-cookie-law-style', plugins_url( 'eu-cookie-law/style.css', __FILE__ ), array(), '20170403' ); - wp_enqueue_script( 'eu-cookie-law-script', plugins_url( 'eu-cookie-law/eu-cookie-law.js', __FILE__ ), array( 'jquery' ), '20170404', true ); + wp_enqueue_script( + 'eu-cookie-law-script', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/eu-cookie-law/eu-cookie-law.min.js', + 'modules/widgets/eu-cookie-law/eu-cookie-law.js' + ), + array( 'jquery' ), + '20170404', + true + ); } /** diff --git a/modules/widgets/gallery.php b/modules/widgets/gallery.php index ca68dd03fb9ce..a0422ada3d688 100644 --- a/modules/widgets/gallery.php +++ b/modules/widgets/gallery.php @@ -394,7 +394,13 @@ public function defaults() { } public function enqueue_frontend_scripts() { - wp_register_script( 'gallery-widget', plugins_url( '/gallery/js/gallery.js', __FILE__ ) ); + wp_register_script( + 'gallery-widget', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/gallery/js/gallery.min.js', + 'modules/widgets/gallery/js/gallery.js' + ) + ); wp_enqueue_script( 'gallery-widget' ); } @@ -405,7 +411,13 @@ public function enqueue_admin_scripts() { if ( 'widgets.php' == $pagenow || 'customize.php' == $pagenow ) { wp_enqueue_media(); - wp_enqueue_script( 'gallery-widget-admin', plugins_url( '/gallery/js/admin.js', __FILE__ ), array( + wp_enqueue_script( + 'gallery-widget-admin', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/gallery/js/admin.min.js', + 'modules/widgets/gallery/js/admin.js' + ), + array( 'media-models', 'media-views' ), diff --git a/modules/widgets/google-translate.php b/modules/widgets/google-translate.php index a57871128e1c6..6bb8c7e69a686 100644 --- a/modules/widgets/google-translate.php +++ b/modules/widgets/google-translate.php @@ -44,7 +44,13 @@ function __construct() { * Enqueue frontend JS scripts. */ public function enqueue_scripts() { - wp_register_script( 'google-translate-init', plugins_url( 'google-translate/google-translate.js', __FILE__ ) ); + wp_register_script( + 'google-translate-init', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/google-translate/google-translate.min.js', + 'modules/widgets/google-translate/google-translate.js' + ) + ); wp_register_script( 'google-translate', '//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit', array( 'google-translate-init' ) ); // Admin bar is also displayed on top of the site which causes google translate bar to hide beneath. // This is a hack to show google translate bar a bit lower. diff --git a/modules/widgets/googleplus-badge.php b/modules/widgets/googleplus-badge.php index 1a0ff1af7663e..7f1f7693f13c8 100644 --- a/modules/widgets/googleplus-badge.php +++ b/modules/widgets/googleplus-badge.php @@ -71,7 +71,14 @@ function enqueue_admin_scripts() { global $pagenow; if ( 'widgets.php' == $pagenow || 'customize.php' == $pagenow ) { - wp_enqueue_script( 'googleplus-widget-admin', plugins_url( '/google-plus/js/admin.js', __FILE__ ), array( 'jquery' ) ); + wp_enqueue_script( + 'googleplus-widget-admin', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/google-plus/js/admin.min.js', + 'modules/widgets/google-plus/js/admin.js' + ), + array( 'jquery' ) + ); } } diff --git a/modules/widgets/milestone/milestone.php b/modules/widgets/milestone/milestone.php index 2364d7fac637b..2dd38361b9fd5 100644 --- a/modules/widgets/milestone/milestone.php +++ b/modules/widgets/milestone/milestone.php @@ -60,12 +60,30 @@ function __construct() { public static function enqueue_admin( $hook_suffix ) { if ( 'widgets.php' == $hook_suffix ) { wp_enqueue_style( 'milestone-admin', self::$url . 'style-admin.css', array(), '20161215' ); - wp_enqueue_script( 'milestone-admin-js', self::$url . 'admin.js', array( 'jquery' ), '20170915', true ); + wp_enqueue_script( + 'milestone-admin-js', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/milestone/admin.min.js', + 'modules/widgets/milestone/admin.js' + ), + array( 'jquery' ), + '20170915', + true + ); } } public static function enqueue_template() { - wp_enqueue_script( 'milestone', self::$url . 'milestone.js', array( 'jquery' ), '20160520', true ); + wp_enqueue_script( + 'milestone', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/milestone/milestone.min.js', + 'modules/widgets/milestone/milestone.js' + ), + array( 'jquery' ), + '20160520', + true + ); } public static function styles_template() { diff --git a/modules/widgets/twitter-timeline.php b/modules/widgets/twitter-timeline.php index 9b4283b0f0b0b..72e9242fcd2a2 100644 --- a/modules/widgets/twitter-timeline.php +++ b/modules/widgets/twitter-timeline.php @@ -63,7 +63,13 @@ public function library() { public function admin_scripts( $hook ) { // This is still 'widgets.php' when managing widgets via the Customizer. if ( 'widgets.php' === $hook ) { - wp_enqueue_script( 'twitter-timeline-admin', plugins_url( 'twitter-timeline-admin.js', __FILE__ ) ); + wp_enqueue_script( + 'twitter-timeline-admin', + Jetpack::get_file_url_for_environment( + '_inc/build/widgets/twitter-timeline-admin.min.js', + 'modules/widgets/twitter-timeline-admin.js' + ) + ); } }