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

Script Modules API: Add import map polyfill #58263

Merged
merged 13 commits into from
Feb 1, 2024
Merged

Script Modules API: Add import map polyfill #58263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e39293d
Add import map polyfill
cbravobernal Jan 25, 2024
114fc15
Update issue number
cbravobernal Jan 25, 2024
e7a65ae
Update WP folder for the polyfill file
cbravobernal Jan 25, 2024
018264c
Update the function with dom injection
cbravobernal Jan 25, 2024
bc0642f
Load it on the footer
cbravobernal Jan 25, 2024
e092186
Remove unwanted comma
cbravobernal Jan 25, 2024
88423e5
Update WP Core folder to be like other polyfills
cbravobernal Jan 25, 2024
bad9d36
Do not load polyfill if there are no modules
cbravobernal Jan 26, 2024
a97c57e
Add an id to the script
cbravobernal Jan 26, 2024
ac91ce9
Use WP default functions
cbravobernal Jan 26, 2024
fc17b71
Use load id
cbravobernal Jan 26, 2024
cb5beae
Use stable version
cbravobernal Jan 26, 2024
114c495
Sync function with Core
cbravobernal Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions lib/compat/wordpress-6.5/class-wp-script-modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,37 @@ public function print_script_module_preloads() {
* Prints the import map using a script tag with a type="importmap" attribute.
*
* @since 6.5.0
*
* @global WP_Scripts $wp_scripts The WP_Scripts object for printing the polyfill.
*/
public function print_import_map() {
$import_map = $this->get_import_map();
if ( ! empty( $import_map['imports'] ) ) {
global $wp_scripts;
if ( isset( $wp_scripts ) ) {
/*
* In Core, the polyfill is registered with a different approach.
* See: https://github.com/WordPress/wordpress-develop/blob/4b23ba81ddb067110e41d05550de7f2a4f09dad3/src/wp-includes/script-loader.php#L99
*/
wp_register_script(
'wp-polyfill-importmap',
gutenberg_url( '/build/modules/importmap-polyfill.min.js' ),
array(),
'1.8.2',
true
);
wp_print_inline_script_tag(
wp_get_script_polyfill(
$wp_scripts,
array(
'HTMLScriptElement.supports && HTMLScriptElement.supports("importmap")' => 'wp-polyfill-importmap',
)
),
array(
'id' => 'wp-load-polyfill-importmap',
)
);
}
wp_print_inline_script_tag(
wp_json_encode( $import_map, JSON_HEX_TAG | JSON_HEX_AMP ),
array(
Expand Down
11 changes: 6 additions & 5 deletions lib/compat/wordpress-6.5/scripts-modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@
* @return WP_Script_Modules The main WP_Script_Modules instance.
*/
function wp_script_modules(): WP_Script_Modules {
static $instance = null;
if ( is_null( $instance ) ) {
$instance = new WP_Script_Modules();
$instance->add_hooks();
global $wp_script_modules;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change addressed in: WordPress/wordpress-develop#5945


if ( ! ( $wp_script_modules instanceof WP_Script_Modules ) ) {
$wp_script_modules = new WP_Script_Modules();
}
return $instance;
return $wp_script_modules;
}
wp_script_modules()->add_hooks();
}

if ( ! function_exists( 'wp_register_script_module' ) ) {
Expand Down
Loading