Remove shared assets

mu-plugins/10up-plugin/.eslintignore

@@ -1,6 +1,5 @@
 assets/js/vendor
 assets/js/admin/vendor
 assets/js/frontend/vendor
-assets/js/shared/vendor
 tests
 dist

mu-plugins/10up-plugin/package.json

@@ -23,9 +23,7 @@
   },
   "10up-toolkit": {
     "entry": {
-      "admin": "./assets/js/admin/admin.js",
-      "frontend": "./assets/js/frontend/frontend.js",
-      "shared": "./assets/js/shared/shared.js"
+      "admin": "./assets/js/admin/admin.js"
     },
     "paths": {
       "globalStylesDir": "../../themes/10up-theme/assets/css/globals/",

mu-plugins/10up-plugin/src/Assets.php

@@ -36,8 +36,6 @@ public function can_register() {
 	 * @return void
 	 */
 	public function register() {
-		add_action( 'wp_enqueue_scripts', [ $this, 'scripts' ] );
-		add_action( 'wp_enqueue_scripts', [ $this, 'styles' ] );
 		add_action( 'admin_enqueue_scripts', [ $this, 'admin_scripts' ] );
 		add_action( 'admin_enqueue_scripts', [ $this, 'admin_styles' ] );
 
@@ -47,147 +45,30 @@ public function register() {
 		add_filter( 'script_loader_tag', [ $this, 'script_loader_tag' ], 10, 2 );
 	}
 
-	/**
-	 * The list of knows contexts for enqueuing scripts/styles.
-	 *
-	 * @return array<string>
-	 */
-	protected function get_enqueue_contexts() {
-		return [ 'admin', 'frontend', 'shared' ];
-	}
-
-	/**
-	 * Generate an URL to a script, taking into account whether SCRIPT_DEBUG is enabled.
-	 *
-	 * @param string $script  Script file name (no .js extension)
-	 * @param string $context Context for the script ('admin', 'frontend', or 'shared')
-	 *
-	 * @return string URL
-	 * @throws \RuntimeException If an invalid $context is specified.
-	 */
-	public function script_url( $script, $context ) {
-
-		if ( ! in_array( $context, $this->get_enqueue_contexts(), true ) ) {
-			throw new \RuntimeException( 'Invalid $context specified in TenUpPlugin script loader.' );
-		}
-
-		return TENUP_PLUGIN_URL . "dist/js/{$script}.js";
-	}
-
-	/**
-	 * Generate an URL to a stylesheet, taking into account whether SCRIPT_DEBUG is enabled.
-	 *
-	 * @param string $stylesheet Stylesheet file name (no .css extension)
-	 * @param string $context    Context for the script ('admin', 'frontend', or 'shared')
-	 *
-	 * @return string URL
-	 * @throws \RuntimeException If an invalid $context is specified.
-	 */
-	public function style_url( $stylesheet, $context ) {
-
-		if ( ! in_array( $context, $this->get_enqueue_contexts(), true ) ) {
-			throw new \RuntimeException( 'Invalid $context specified in TenUpPlugin stylesheet loader.' );
-		}
-
-		return TENUP_PLUGIN_URL . "dist/css/{$stylesheet}.css";
-	}
-
-	/**
-	 * Enqueue scripts for front-end.
-	 *
-	 * @return void
-	 */
-	public function scripts() {
-
-		wp_enqueue_script(
-			'tenup_plugin_shared',
-			$this->script_url( 'shared', 'shared' ),
-			$this->get_asset_info( 'shared', 'dependencies' ),
-			$this->get_asset_info( 'shared', 'version' ),
-			true
-		);
-
-		wp_enqueue_script(
-			'tenup_plugin_frontend',
-			$this->script_url( 'frontend', 'frontend' ),
-			$this->get_asset_info( 'frontend', 'dependencies' ),
-			$this->get_asset_info( 'frontend', 'version' ),
-			true
-		);
-	}
-
 	/**
 	 * Enqueue scripts for admin.
 	 *
 	 * @return void
 	 */
 	public function admin_scripts() {
-
-		wp_enqueue_script(
-			'tenup_plugin_shared',
-			$this->script_url( 'shared', 'shared' ),
-			$this->get_asset_info( 'shared', 'dependencies' ),
-			$this->get_asset_info( 'shared', 'version' ),
-			true
-		);
-
 		wp_enqueue_script(
 			'tenup_plugin_admin',
-			$this->script_url( 'admin', 'admin' ),
+			TENUP_PLUGIN_URL . 'dist/js/admin.js',
 			$this->get_asset_info( 'admin', 'dependencies' ),
 			$this->get_asset_info( 'admin', 'version' ),
 			true
 		);
 	}
 
-	/**
-	 * Enqueue styles for front-end.
-	 *
-	 * @return void
-	 */
-	public function styles() {
-
-		wp_enqueue_style(
-			'tenup_plugin_shared',
-			$this->style_url( 'shared', 'shared' ),
-			[],
-			$this->get_asset_info( 'shared', 'version' ),
-		);
-
-		if ( is_admin() ) {
-			wp_enqueue_style(
-				'tenup_plugin_admin',
-				$this->style_url( 'admin', 'admin' ),
-				[],
-				$this->get_asset_info( 'admin', 'version' ),
-			);
-		} else {
-			wp_enqueue_style(
-				'tenup_plugin_frontend',
-				$this->style_url( 'frontend', 'frontend' ),
-				[],
-				$this->get_asset_info( 'frontend', 'version' ),
-			);
-		}
-	}
-
 	/**
 	 * Enqueue styles for admin.
 	 *
 	 * @return void
 	 */
 	public function admin_styles() {
-
-		wp_enqueue_style(
-			'tenup_plugin_shared',
-			$this->style_url( 'shared', 'shared' ),
-			[],
-			$this->get_asset_info( 'shared', 'version' ),
-		);
-
 		wp_enqueue_style(
 			'tenup_plugin_admin',
-			$this->style_url( 'admin', 'admin' ),
+			TENUP_PLUGIN_URL . 'dist/css/admin-style.css',
 			[],
 			$this->get_asset_info( 'admin', 'version' ),
 		);

themes/10up-theme/.eslintignore

@@ -1,6 +1,5 @@
 assets/js/vendor
 assets/js/admin/vendor
 assets/js/frontend/vendor
-assets/js/shared/vendor
 tests
 dist

themes/10up-theme/package.json

@@ -26,10 +26,8 @@
     "useBlockAssets": true,
     "loadBlockSpecificStyles": true,
     "entry": {
-      "admin": "./assets/js/admin/admin.js",
-      "editor-style-overrides": "./assets/js/admin/editor-style-overrides.js",
+      "editor-style-overrides": "./assets/js/frontend/editor-style-overrides.js",
       "frontend": "./assets/js/frontend/frontend.js",
-      "shared": "./assets/js/shared/shared.js",
       "block-editor-script": "./assets/js/block-editor/block-editor-script.js"
     },
     "paths": {

themes/10up-theme/src/Assets.php

@@ -37,8 +37,6 @@ public function can_register() {
 	 */
 	public function register() {
 		add_action( 'wp_enqueue_scripts', [ $this, 'scripts' ] );
-		add_action( 'admin_enqueue_scripts', [ $this, 'admin_styles' ] );
-		add_action( 'admin_enqueue_scripts', [ $this, 'admin_scripts' ] );
 		add_action( 'enqueue_block_editor_assets', [ $this, 'enqueue_block_editor_scripts' ] );
 		add_action( 'wp_enqueue_scripts', [ $this, 'styles' ] );
 		add_action( 'wp_head', [ $this, 'js_detection' ], 0 );
@@ -65,48 +63,6 @@ public function scripts() {
 			$this->get_asset_info( 'frontend', 'version' ),
 			true
 		);
-
-		/**
-		 * Enqueuing shared.js is required to get css hot reloading working in the frontend
-		 * If you're not shipping any shared js wrap this enqueue in a SCRIPT_DEBUG check.
-		 */
-
-		/*
-		 * Uncoment this to use the shared.js file.
-			wp_enqueue_script(
-				'shared',
-				TENUP_THEME_TEMPLATE_URL . '/dist/js/shared.js',
-				$this->get_asset_info( 'shared', 'dependencies' ),
-				$this->get_asset_info( 'shared', 'version' ),
-				true
-			);
-		*/
-	}
-
-	/**
-	 * Enqueue scripts for admin
-	 *
-	 * @return void
-	 */
-	public function admin_scripts() {
-		wp_enqueue_script(
-			'admin',
-			TENUP_THEME_TEMPLATE_URL . '/dist/js/admin.js',
-			$this->get_asset_info( 'admin', 'dependencies' ),
-			$this->get_asset_info( 'admin', 'version' ),
-			true
-		);
-
-		/*
-		 * Uncoment this to use the shared.js file.
-			wp_enqueue_script(
-				'shared',
-				TENUP_THEME_TEMPLATE_URL . '/dist/js/shared.js',
-				$this->get_asset_info( 'shared', 'dependencies' ),
-				$this->get_asset_info( 'shared', 'version' ),
-				true
-			);
-		*/
 	}
 
 	/**
@@ -124,30 +80,6 @@ public function enqueue_block_editor_scripts() {
 		);
 	}
 
-	/**
-	 * Enqueue styles for admin
-	 *
-	 * @return void
-	 */
-	public function admin_styles() {
-		wp_enqueue_style(
-			'admin-style',
-			TENUP_THEME_TEMPLATE_URL . '/dist/css/admin.css',
-			[],
-			$this->get_asset_info( 'admin-style', 'version' )
-		);
-
-		/*
-		 * Uncoment this to use the shared.css file.
-			wp_enqueue_style(
-				'shared-style',
-				TENUP_THEME_TEMPLATE_URL . '/dist/css/shared.css',
-				[],
-				$this->get_asset_info( 'shared', 'version' )
-			);
-		*/
-	}
-
 	/**
 	 * Enqueue styles for front-end.
 	 *