Assets: remove redundant registrations, prefix registered scritps

Author: priethor

includes/admin/admin-commands.php

@@ -75,12 +75,12 @@ function acf_commands_init() {
 				'customPostTypes' => $custom_post_types,
 			)
 		);
-		wp_enqueue_script( 'commands-custom-post-types' );
+		wp_enqueue_script( 'scf-commands-custom-post-types' );
 	}
 
 	// Only load admin commands if user has SCF admin capabilities.
 	if ( current_user_can( acf_get_setting( 'capability' ) ) ) {
-		wp_enqueue_script( 'commands-admin' );
+		wp_enqueue_script( 'scf-commands-admin' );
 	}
 }
 

includes/assets.php

@@ -243,17 +243,9 @@ public function register_scripts() {
 				);
 			}
 
-			// Register core scripts
-			wp_register_script( 'acf', acf_get_url( 'assets/build/js/acf' . $suffix . '.js' ), array( 'jquery' ), $version, false );
-			wp_register_script( 'acf-input', acf_get_url( 'assets/build/js/acf-input' . $suffix . '.js' ), array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-resizable', 'acf', 'wp-a11y' ), $version, false );
-			wp_register_script( 'acf-field-group', acf_get_url( 'assets/build/js/acf-field-group' . $suffix . '.js' ), array( 'acf-input' ), $version, false );
-			wp_register_script( 'acf-internal-post-type', acf_get_url( 'assets/build/js/acf-internal-post-type' . $suffix . '.js' ), array( 'acf-input' ), $version, false );
-			wp_register_script( 'acf-escaped-html-notice', acf_get_url( 'assets/build/js/acf-escaped-html-notice' . $suffix . '.js' ), array( 'jquery' ), $version, true );
-
-			// Register WordPress commands integration
 			wp_register_script(
-				'commands-admin',
-				acf_get_url( 'assets/build/js/commands/admin' . $suffix . '.js' ),
+				'scf-commands-admin',
+				acf_get_url( 'assets/build/js/commands/scf-admin' . $suffix . '.js' ),
 				array( 'acf', 'wp-plugins', 'wp-element', 'wp-components', 'wp-data', 'wp-commands', 'wp-i18n', 'wp-dom-ready' ),
 				$version,
 				array(
@@ -263,8 +255,8 @@ public function register_scripts() {
 			);
 
 			wp_register_script(
-				'commands-custom-post-types',
-				acf_get_url( 'assets/build/js/commands/custom-post-types' . $suffix . '.js' ),
+				'scf-commands-custom-post-types',
+				acf_get_url( 'assets/build/js/commands/scf-custom-post-types' . $suffix . '.js' ),
 				array( 'acf', 'wp-plugins', 'wp-element', 'wp-components', 'wp-data', 'wp-commands', 'wp-i18n', 'wp-dom-ready' ),
 				$version,
 				array(

webpack.config.js

@@ -15,8 +15,8 @@ const commonConfig = {
 		'js/acf-input': './assets/src/js/acf-input.js',
 		'js/acf-internal-post-type':
 			'./assets/src/js/acf-internal-post-type.js',
-		'js/commands/admin': './assets/src/js/commands/admin-commands.js',
-		'js/commands/custom-post-types': './assets/src/js/commands/custom-post-type-commands.js',
+		'js/commands/scf-admin': './assets/src/js/commands/admin-commands.js',
+		'js/commands/scf-custom-post-types': './assets/src/js/commands/custom-post-type-commands.js',
 		'js/acf': './assets/src/js/acf.js',
 		'js/pro/acf-pro-blocks': './assets/src/js/pro/acf-pro-blocks.js',
 		'js/pro/acf-pro-field-group':