Changeset 44262 for trunk/src/wp-includes/script-loader.php

Timestamp:

12/17/2018 03:35:21 PM (8 years ago)

Author:

desrosj

Message:

Block Editor: Update @wordpress dependencies to match Gutenberg 4.5.1.

• Update the annotations, api-fetch, block-library, blocks, components, compose, core-data, data, date, dom, edit-post, editor, element, format-library, html-entities, i18n, jest-console, jest-preset-default, keycodes, list-reusable-blocks, notices, nux, plugins, rich-text, scripts, token-lists, url, viewport packages.
• Upgrades React from 16.5.2 to 16.6.3.
• Adds a missing wp-date dependency to the editor script.
• Updates changed dependencies in script-loader.php.
• Fixes undefined notices in some blocks.
• Removes incorrect gutenberg textdomain.

Merges [43891], [43903], and [43919] to trunk.

Props atimmer, aduth, youknowriad, danielbachhuber.
See #45145.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/script-loader.php (modified) (12 diffs)

trunk/src/wp-includes/script-loader.php

@@ -75 +75 @@
  */
 function wp_default_packages_vendor( &$scripts ) {
+        global $wp_locale;
+
         $dev_suffix = wp_scripts_get_suffix( 'dev' );
 
         $vendor_scripts = array(
-                'react',
+                'react'     => array( 'wp-polyfill' ),
                 'react-dom' => array( 'react' ),
                 'moment',
@@ -101 +103 @@
 
         $scripts->add( 'wp-polyfill', null, array( 'wp-polyfill' ) );
-        did_action( 'init' ) && $scripts->add_data(
+        did_action( 'init' ) && $scripts->add_inline_script(
                 'wp-polyfill',
-                'data',
                 wp_get_script_polyfill(
                         $scripts,
@@ -111 +112 @@
                                 'window.FormData && window.FormData.prototype.keys' => 'wp-polyfill-formdata',
                                 'Element.prototype.matches && Element.prototype.closest' => 'wp-polyfill-element-closest',
+                        ),
+                        'after'
+                )
+        );
+
+        did_action( 'init' ) && $scripts->add_inline_script( 'lodash', 'window.lodash = _.noConflict();' );
+
+        did_action( 'init' ) && $scripts->add_inline_script(
+                'moment',
+                sprintf(
+                        "moment.locale( '%s', %s );",
+                        get_user_locale(),
+                        wp_json_encode(
+                                array(
+                                        'months'         => array_values( $wp_locale->month ),
+                                        'monthsShort'    => array_values( $wp_locale->month_abbrev ),
+                                        'weekdays'       => array_values( $wp_locale->weekday ),
+                                        'weekdaysShort'  => array_values( $wp_locale->weekday_abbrev ),
+                                        'week'           => array(
+                                                'dow' => (int) get_option( 'start_of_week', 0 ),
+                                        ),
+                                        'longDateFormat' => array(
+                                                'LT'   => get_option( 'time_format', __( 'g:i a', 'default' ) ),
+                                                'LTS'  => null,
+                                                'L'    => null,
+                                                'LL'   => get_option( 'date_format', __( 'F j, Y', 'default' ) ),
+                                                'LLL'  => __( 'F j, Y g:i a', 'default' ),
+                                                'LLLL' => null,
+                                        ),
+                                )
                         )
-                )
-        );
-
-        did_action( 'init' ) && $scripts->add_inline_script( 'lodash', 'window.lodash = _.noConflict();' );
+                ),
+                'after'
+        );
 }
 
@@ -184 +214 @@
                         'wp-element',
                         'wp-hooks',
+                        'wp-html-entities',
                         'wp-i18n',
                         'wp-is-shallow-equal',
@@ -202 +233 @@
                         'wp-core-data',
                         'wp-data',
+                        'wp-date',
                         'wp-editor',
                         'wp-element',
@@ -220 +252 @@
                         'wp-api-fetch',
                         'wp-compose',
-                        'wp-deprecated',
                         'wp-dom',
                         'wp-element',
@@ -234 +265 @@
                 'compose'                            => array(
                         'lodash',
-                        'wp-deprecated',
                         'wp-element',
                         'wp-is-shallow-equal',
@@ -243 +273 @@
                         'lodash',
                         'wp-compose',
-                        'wp-deprecated',
                         'wp-element',
                         'wp-is-shallow-equal',
@@ -273 +302 @@
                         'wp-i18n',
                         'wp-keycodes',
+                        'wp-notices',
                         'wp-nux',
                         'wp-plugins',
@@ -345 +375 @@
                 'nux'                                => array(
                         'wp-element',
+                        'lodash',
                         'wp-components',
                         'wp-compose',
                         'wp-data',
-                        'wp-deprecated',
                         'wp-i18n',
                         'wp-polyfill',
@@ -357 +387 @@
                 'rich-text'                          => array(
                         'lodash',
-                        'wp-blocks',
                         'wp-data',
-                        'wp-deprecated',
                         'wp-escape-html',
                         'wp-polyfill',
@@ -1853 +1881 @@
 
         /*
-         * Translators: If there are characters in your language that are not supported
-         * by Noto Serif, translate this to 'off'. Do not translate into your own language.
+         * Translators: Use this to specify the proper Google Font name and variants
+         * to load that is supported by your language. Do not translate.
+         * Set to 'off' to disable loading.
          */
-        if ( 'off' !== _x( 'on', 'Noto Serif font: on or off' ) ) {
-                $fonts_url = 'https://fonts.googleapis.com/css?family=Noto+Serif%3A400%2C400i%2C700%2C700i';
+        $font_family = _x( 'Noto Serif:400,400i,700,700i', 'Google Font Name and Variants' );
+        if ( 'off' !== $font_family ) {
+                $fonts_url = 'https://fonts.googleapis.com/css?family=' . urlencode( $font_family );
         }
         $styles->add( 'wp-editor-font', $fonts_url );