Changeset 13523

Timestamp:

07/22/2023 07:22:41 AM (2 years ago)

Author:

imath

Message:

Completely remove bundled moment.js library

As explained in #8766, after deprecating this library in version 11.0.0,
we are now removing it from the plugin. We now use the moment.js library
already bundled into WordPress since version 5.0.

livestamp.js has been updated to v2.

Fixes #8942
Closes ​https://github.com/buddypress/buddypress/pull/135

Location:

trunk/src/bp-core

Files:

• bp-core-cssjs.php (modified) (3 diffs)
• deprecated/11.0.php (modified) (1 diff)
• js/vendor/livestamp.js (modified) (3 diffs)
• js/vendor/moment-js (deleted)

trunk/src/bp-core/bp-core-cssjs.php

@@ -19 +19 @@
     $min = bp_core_get_minified_asset_suffix();
     $url = buddypress()->plugin_url . 'bp-core/js/';
-
-    // Is WordPress' moment dist library registered?
-    $is_moment_registered = wp_script_is( 'moment', 'registered' );
-    $moment_locale_url    = '';
-
-    /*
-     * In 11.0.0 we are deprecating `bp-moment` in favor of WordPress' already bundled `moment`.
-     * @todo completely remove `bp-moment` in 12.0.0.
-     */
-    if ( ! $is_moment_registered ) {
-        /*
-        * Moment.js locale.
-        *
-        * Try to map current WordPress locale to a moment.js locale file for loading.
-        *
-        * eg. French (France) locale for WP is fr_FR. Here, we try to find fr-fr.js
-        *     (this file doesn't exist).
-        */
-        $wp_locale = sanitize_file_name( strtolower( get_locale() ) );
-
-        // WP uses ISO 639-2 or -3 codes for some locales, which we must translate back to ISO 639-1.
-        $iso_locales = array(
-            'bel' => 'be',
-            'bre' => 'br',
-            'kir' => 'ky',
-            'mri' => 'mi',
-            'ssw' => 'ss',
-        );
-
-        if ( isset( $iso_locales[ $wp_locale ] ) ) {
-            $locale = $iso_locales[ $wp_locale ];
-        } else {
-            $locale = $wp_locale;
-        }
-
-        $locale = str_replace( '_', '-', $locale );
-        if ( file_exists( buddypress()->core->path . "bp-core/js/vendor/moment-js/locale/{$locale}{$min}.js" ) ) {
-            $moment_locale_url = $url . "vendor/moment-js/locale/{$locale}{$min}.js";
-
-        /*
-        * Try to find the short-form locale.
-        *
-        * eg. French (France) locale for WP is fr_FR. Here, we try to find fr.js
-        *     (this exists).
-        */
-        } else {
-            $locale = substr( $locale, 0, strpos( $locale, '-' ) );
-            if ( file_exists( buddypress()->core->path . "bp-core/js/vendor/moment-js/locale/{$locale}{$min}.js" ) ) {
-                $moment_locale_url = $url . "vendor/moment-js/locale/{$locale}{$min}.js";
-            }
-        }
-    }
 
     // Set up default scripts to register.
@@ -95 +43 @@
         'bp-livestamp' => array( 'file' => "{$url}vendor/livestamp{$min}.js", 'dependencies' => array( 'jquery', 'moment' ), 'footer' => true ),
     );
-
-    /*
-     * In 11.0.0 we are deprecating `bp-moment` in favor of WordPress' already bundled `moment`.
-     * @todo completely remove `bp-moment` in 12.0.0.
-     */
-    if ( ! $is_moment_registered ) {
-        $scripts['bp-moment']         = array( 'file' => "{$url}vendor/moment-js/moment{$min}.js", 'dependencies' => array(), 'footer' => true );
-        $bp_livestamp                 = $scripts['bp-livestamp'];
-        $bp_livestamp['dependencies'] = array( 'jquery', 'bp-moment' );
-
-        // Reset 'bp-livestamp' after 'bp-moment'.
-        unset( $scripts['bp-livestamp'] );
-        $scripts['bp-livestamp'] = $bp_livestamp;
-
-        // Version 2.7 - Add Moment.js locale to our $scripts array if we found one.
-        if ( $moment_locale_url ) {
-            $scripts['bp-moment-locale'] = array( 'file' => esc_url( $moment_locale_url ), 'dependencies' => array( 'bp-moment' ), 'footer' => true );
-        }
-    }
 
     if ( bp_support_blocks() ) {
@@ -586 +515 @@
     }
 
-    /*
-     * Only enqueue Moment.js locale if we registered it in
-     * bp_core_register_common_scripts().
-     */
-    if ( wp_script_is( 'bp-moment-locale', 'registered' ) ) {
-        wp_enqueue_script( 'bp-moment-locale' );
-        wp_add_inline_script( 'bp-livestamp', bp_core_moment_js_config() );
-    } else {
-        wp_add_inline_script(
-            'moment',
-            sprintf(
-                "moment.updateLocale( '%s', %s );",
-                get_user_locale(),
-                wp_json_encode(
-                    array(
-                        'relativeTime' => array(
-                            /* Translators: %s is the relative time (eg: in a few seconds). */
-                            'future' => __( 'in %s', 'buddypress' ),
-                            /* translators: %s: the human time diff. */
-                            'past'   => __( '%s ago', 'buddypress' ),
-                            's'      => __( 'a few seconds', 'buddypress' ),
-                            'm'      => __( 'a minute', 'buddypress' ),
-                            /* Translators: %d is the amount of minutes. */
-                            'mm'     => __( '%d minutes', 'buddypress' ),
-                            'h'      => __( 'an hour', 'buddypress' ),
-                            /* Translators: %d is the amount of hours. */
-                            'hh'     => __( '%d hours', 'buddypress' ),
-                            'd'      => __( 'a day', 'buddypress' ),
-                            /* Translators: %d is the amount of days. */
-                            'dd'     => __( '%d days', 'buddypress' ),
-                            'M'      => __( 'a month', 'buddypress' ),
-                            /* Translators: %d is the amount of months. */
-                            'MM'     => __( '%d months', 'buddypress' ),
-                            'y'      => __( 'a year', 'buddypress' ),
-                            /* Translators: %d is the amount of years. */
-                            'yy'     => __( '%d years', 'buddypress' ),
-                        ),
-                    )
+    wp_add_inline_script(
+        'moment',
+        sprintf(
+            "moment.updateLocale( '%s', %s );",
+            get_user_locale(),
+            wp_json_encode(
+                array(
+                    'relativeTime' => array(
+                        /* Translators: %s is the relative time (eg: in a few seconds). */
+                        'future' => __( 'in %s', 'buddypress' ),
+                        /* translators: %s: the human time diff. */
+                        'past'   => __( '%s ago', 'buddypress' ),
+                        's'      => __( 'a few seconds', 'buddypress' ),
+                        'm'      => __( 'a minute', 'buddypress' ),
+                        /* Translators: %d is the amount of minutes. */
+                        'mm'     => __( '%d minutes', 'buddypress' ),
+                        'h'      => __( 'an hour', 'buddypress' ),
+                        /* Translators: %d is the amount of hours. */
+                        'hh'     => __( '%d hours', 'buddypress' ),
+                        'd'      => __( 'a day', 'buddypress' ),
+                        /* Translators: %d is the amount of days. */
+                        'dd'     => __( '%d days', 'buddypress' ),
+                        'M'      => __( 'a month', 'buddypress' ),
+                        /* Translators: %d is the amount of months. */
+                        'MM'     => __( '%d months', 'buddypress' ),
+                        'y'      => __( 'a year', 'buddypress' ),
+                        /* Translators: %d is the amount of years. */
+                        'yy'     => __( '%d years', 'buddypress' ),
+                    ),
                 )
             )
-        );
-    }
+        )
+    );
 
     wp_enqueue_script( 'bp-livestamp' );
 }
-
-/**
- * Return moment.js config.
- *
- * @since 2.7.0
- * @deprecated 11.0.0 Soflty deprecated as we're keeping the function into this file
- *                    to avoid fatal errors if deprecated code is ignored.
- *
- * @return string
- */
-function bp_core_moment_js_config() {
-    _deprecated_function( __FUNCTION__, '11.0.0' );
-
-    // Grab the locale from the enqueued JS.
-    $moment_locale = wp_scripts()->query( 'bp-moment-locale' );
-    $moment_locale = substr( $moment_locale->src, strpos( $moment_locale->src, '/moment-js/locale/' ) + 18 );
-    $moment_locale = str_replace( '.js', '', $moment_locale );
-
-    $inline_js = <<<EOD
-jQuery(function() {
-    moment.locale( '{$moment_locale}' );
-});
-EOD;
-
-    return $inline_js;
-}

trunk/src/bp-core/deprecated/11.0.php

@@ -92 +92 @@
     return bp_attachments_get_mime_type( $file );
 }
+
+/**
+ * Return moment.js config.
+ *
+ * @since 2.7.0
+ * @deprecated 11.0.0
+ */
+function bp_core_moment_js_config() {
+    _deprecated_function( __FUNCTION__, '11.0.0' );
+}

trunk/src/bp-core/js/vendor/livestamp.js

@@ -1 @@
-// Livestamp.js / v1.1.2 / (c) 2012 Matt Bradley / MIT License
-(function($, moment) {
+// Livestamp.js / v2.0.0 / (c) 2015 Matt Bradley / MIT License
+(function (plugin) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery', 'moment'], plugin);
+  } else {
+    // Browser globals
+    plugin(jQuery, moment);
+  }
+}(function($, moment) {
   var updateInterval = 1e3,
       paused = false,
@@ -61 +69 @@
 
       $livestamps = $livestamps.not(toRemove);
+      delete $livestamps.prevObject
     },
 
@@ -127 +136 @@
     return livestampLocal[method](this, options);
   };
-})(jQuery, moment);
+}));