Statically access asset tools (#12744)

Automattic · Jun 21, 2019 · 89a9af9 · 89a9af9
1 parent 5f09806
commit 89a9af9
Show file tree

Hide file tree

Showing 62 changed files with 516 additions and 316 deletions.
diff --git a/_inc/client/components/settings-card/index.jsx b/_inc/client/components/settings-card/index.jsx
@@ -150,7 +150,9 @@ export const SettingsCard = props => {
 				return (
 					<JetpackBanner
 						callToAction={ upgradeLabel }
-						title={ __( 'Connect your site to Google Analytics in seconds with Jetpack Premium or Professional.' ) }
+						title={ __(
+							'Connect your site to Google Analytics in seconds with Jetpack Premium or Professional.'
+						) }
 						plan={ PLAN_JETPACK_PREMIUM }
 						feature={ feature }
 						onClick={ handleClickForTracking( feature ) }

diff --git a/_inc/client/my-plan/my-plan-header/index.js b/_inc/client/my-plan/my-plan-header/index.js
@@ -58,8 +58,8 @@ class MyPlanHeader extends React.Component {
 									'Worried about security? Get backups, automated security fixes and more: {{a}}Upgrade now{{/a}}',
 									{
 										components: {
-											a: <UpgradeLink source="myplan-header-free-plan-text-link" />
-										}
+											a: <UpgradeLink source="myplan-header-free-plan-text-link" />,
+										},
 									}
 								) }
 							</p>

diff --git a/_inc/lib/admin-pages/class.jetpack-settings-page.php b/_inc/lib/admin-pages/class.jetpack-settings-page.php
@@ -1,6 +1,7 @@
 <?php
 
 use Automattic\Jetpack\Tracking;
+use Automattic\Jetpack\Assets;
 
 include_once( 'class.jetpack-admin-page.php' );
 include_once( JETPACK__PLUGIN_DIR . 'class.jetpack-modules-list-table.php' );
@@ -137,7 +138,7 @@ function additional_styles() {
 	function page_admin_scripts() {
 		wp_enqueue_script(
 			'jetpack-admin-js',
-			Jetpack::get_file_url_for_environment( '_inc/build/jetpack-admin.min.js', '_inc/jetpack-admin.js' ),
+			Assets::get_file_url_for_environment( '_inc/build/jetpack-admin.min.js', '_inc/jetpack-admin.js' ),
 			array( 'jquery' ),
 			JETPACK__VERSION
 		);

diff --git a/class.jetpack-connection-banner.php b/class.jetpack-connection-banner.php
@@ -1,6 +1,7 @@
 <?php
 
 use Automattic\Jetpack\Assets\Logo;
+use Automattic\Jetpack\Assets;
 
 class Jetpack_Connection_Banner {
 	/**
@@ -105,7 +106,7 @@ function maybe_initialize_hooks( $current_screen ) {
 	public static function enqueue_banner_scripts() {
 		wp_enqueue_script(
 			'jetpack-connection-banner-js',
-			Jetpack::get_file_url_for_environment(
+			Assets::get_file_url_for_environment(
 				'_inc/build/jetpack-connection-banner.min.js',
 				'_inc/jetpack-connection-banner.js'
 			),

diff --git a/class.jetpack-idc.php b/class.jetpack-idc.php
@@ -1,5 +1,6 @@
 <?php
 
+use Automattic\Jetpack\Assets;
 use Automattic\Jetpack\Logo as Jetpack_Logo;
 
 /**
@@ -256,7 +257,7 @@ function enqueue_idc_notice_files() {
 
 		wp_enqueue_script(
 			'jetpack-idc-js',
-			Jetpack::get_file_url_for_environment( '_inc/build/idc-notice.min.js', '_inc/idc-notice.js' ),
+			Assets::get_file_url_for_environment( '_inc/build/idc-notice.min.js', '_inc/idc-notice.js' ),
 			array( 'jquery' ),
 			JETPACK__VERSION,
 			true

diff --git a/class.jetpack-modules-list-table.php b/class.jetpack-modules-list-table.php
@@ -1,5 +1,7 @@
 <?php
 
+use Automattic\Jetpack\Assets;
+
 if ( ! class_exists( 'WP_List_Table' ) )
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 
@@ -29,7 +31,7 @@ function __construct() {
 
 		wp_register_script(
 			'models.jetpack-modules',
-			Jetpack::get_file_url_for_environment(
+			Assets::get_file_url_for_environment(
 				'_inc/build/jetpack-modules.models.min.js',
 				'_inc/jetpack-modules.models.js'
 			),
@@ -38,7 +40,7 @@ function __construct() {
 		);
 		wp_register_script(
 			'views.jetpack-modules',
-			Jetpack::get_file_url_for_environment(
+			Assets::get_file_url_for_environment(
 				'_inc/build/jetpack-modules.views.min.js',
 				'_inc/jetpack-modules.views.js'
 			),
@@ -47,7 +49,7 @@ function __construct() {
 		);
 		wp_register_script(
 			'jetpack-modules-list-table',
-			Jetpack::get_file_url_for_environment(
+			Assets::get_file_url_for_environment(
 				'_inc/build/jetpack-modules.min.js',
 				'_inc/jetpack-modules.js'
 			),

diff --git a/class.jetpack.php b/class.jetpack.php
@@ -10,6 +10,7 @@
 use Automattic\Jetpack\Sync\Sender;
 use Automattic\Jetpack\Sync\Users;
 use Automattic\Jetpack\Tracking;
+use Automattic\Jetpack\Assets;
 
 /*
 Options:
@@ -1086,7 +1087,7 @@ public function register_assets() {
 		if ( ! wp_script_is( 'spin', 'registered' ) ) {
 			wp_register_script(
 				'spin',
-				self::get_file_url_for_environment( '_inc/build/spin.min.js', '_inc/spin.js' ),
+				Assets::get_file_url_for_environment( '_inc/build/spin.min.js', '_inc/spin.js' ),
 				false,
 				'1.3'
 			);
@@ -1095,7 +1096,7 @@ public function register_assets() {
 		if ( ! wp_script_is( 'jquery.spin', 'registered' ) ) {
 			wp_register_script(
 				'jquery.spin',
-				self::get_file_url_for_environment( '_inc/build/jquery.spin.min.js', '_inc/jquery.spin.js' ),
+				Assets::get_file_url_for_environment( '_inc/build/jquery.spin.min.js', '_inc/jquery.spin.js' ),
 				array( 'jquery', 'spin' ),
 				'1.3'
 			);
@@ -1104,7 +1105,7 @@ public function register_assets() {
 		if ( ! wp_script_is( 'jetpack-gallery-settings', 'registered' ) ) {
 			wp_register_script(
 				'jetpack-gallery-settings',
-				self::get_file_url_for_environment( '_inc/build/gallery-settings.min.js', '_inc/gallery-settings.js' ),
+				Assets::get_file_url_for_environment( '_inc/build/gallery-settings.min.js', '_inc/gallery-settings.js' ),
 				array( 'media-views' ),
 				'20121225'
 			);
@@ -1113,7 +1114,7 @@ public function register_assets() {
 		if ( ! wp_script_is( 'jetpack-twitter-timeline', 'registered' ) ) {
 			wp_register_script(
 				'jetpack-twitter-timeline',
-				self::get_file_url_for_environment( '_inc/build/twitter-timeline.min.js', '_inc/twitter-timeline.js' ),
+				Assets::get_file_url_for_environment( '_inc/build/twitter-timeline.min.js', '_inc/twitter-timeline.js' ),
 				array( 'jquery' ),
 				'4.0.0',
 				true
@@ -1123,7 +1124,7 @@ public function register_assets() {
 		if ( ! wp_script_is( 'jetpack-facebook-embed', 'registered' ) ) {
 			wp_register_script(
 				'jetpack-facebook-embed',
-				self::get_file_url_for_environment( '_inc/build/facebook-embed.min.js', '_inc/facebook-embed.js' ),
+				Assets::get_file_url_for_environment( '_inc/build/facebook-embed.min.js', '_inc/facebook-embed.js' ),
 				array( 'jquery' ),
 				null,
 				true
@@ -6993,11 +6994,7 @@ public static function is_function_in_backtrace( $names ) {
 	 * @return string The URL to the file
 	 */
 	public static function get_file_url_for_environment( $min_path, $non_min_path ) {
-		$path = ( Constants::is_defined( 'SCRIPT_DEBUG' ) && Constants::get_constant( 'SCRIPT_DEBUG' ) )
-			? $non_min_path
-			: $min_path;
-
-		return plugins_url( $path, JETPACK__PLUGIN_FILE );
+		return Assets::get_file_url_for_environment( $min_path, $non_min_path );
 	}
 
 	/**

diff --git a/class.photon.php b/class.photon.php
@@ -1,5 +1,7 @@
 <?php
 
+use Automattic\Jetpack\Assets;
+
 class Jetpack_Photon {
 	/**
 	 * Class variables
@@ -1184,7 +1186,7 @@ public function action_wp_enqueue_scripts() {
 		}
 		wp_enqueue_script(
 			'jetpack-photon',
-			Jetpack::get_file_url_for_environment(
+			Assets::get_file_url_for_environment(
 				'_inc/build/photon/photon.min.js',
 				'modules/photon/photon.js'
 			),

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
 		"automattic/jetpack-logo": "@dev",
 		"automattic/jetpack-constants": "@dev",
 		"automattic/jetpack-jitm": "@dev",
-		"automattic/jetpack-asset-tools": "@dev",
+		"automattic/jetpack-assets": "@dev",
 		"automattic/jetpack-sync": "@dev",
 		"automattic/jetpack-tracking": "@dev",
 		"automattic/jetpack-autoloader": "@dev"