@caweb/cli 1.3.13 → 1.3.15

package/commands/blocks/update-block.js

@@ -44,9 +44,6 @@ export default async function updateBlock({
 			// make tmp directory
 			fs.ensureDir( `${slug}.tmp`);
 
-			// move inc directory to tmp directory
-			fs.copySync(`${slug}/inc/`, `${slug}.tmp/inc/`);
-			
 			// move src directory to tmp directory
 			fs.copySync(`${slug}/src/`, `${slug}.tmp/src/`);
 
@@ -62,9 +59,6 @@ export default async function updateBlock({
 			// Recreate the block.
 			await createBlock({spinner, debug, slug});
 
-			// move inc directory back to block directory
-			fs.copySync(`${slug}.tmp/inc/`, `${slug}/inc/` );
-			
 			// move src directory back to block directory
 			fs.copySync(`${slug}.tmp/src/`, `${slug}/src/`);
 
@@ -73,7 +67,7 @@ export default async function updateBlock({
 			let newPkg = JSON.parse( fs.readFileSync(path.join(slug, 'package.json')) )			
 			
 			/**
-			 * 
+			 * package.json changes
 			 * @since 1.3.0 Gulp is no longer used.
 			 */
 			if( oldPkg.version < '1.3.0' ){

package/configs/webpack.config.js

@@ -74,6 +74,10 @@ baseConfig.module.rules.forEach((rule, i) => {
           baseConfig.module.rules[i].generator = {
             filename: 'fonts/[name][ext]'
           };
+
+          // we don't care who the issuer is
+          delete baseConfig.module.rules[i].issuer;
+
         }
   }
 })
@@ -86,7 +90,7 @@ let webpackConfig = {
   output: {
     ...baseConfig.output,
     publicPath: `./`,
-    clean: false
+    clean: true
   },
   plugins: [
     ...baseConfig.plugins,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",

package/template/block/edit.js.mustache

@@ -16,6 +16,14 @@ import { __ } from '@wordpress/i18n';
  */
 import { useBlockProps, RichText, InnerBlocks } from '@wordpress/block-editor';
 
+/**
+ * This package includes a library of generic WordPress components to be used for creating 
+ * common UI elements shared between screens and features of the WordPress dashboard.
+ * 
+ * @see https://developer.wordpress.org/block-editor/reference-guides/packages/packages-components/
+ */
+import { Button } from '@wordpress/components';
+
 /**
  * Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
  * Those files can contain any CSS code that gets applied to the editor.

package/template/block/frontend.js.mustache

@@ -0,0 +1,5 @@
+/**
+ * The following scripts get applied on the front of your site
+ *
+ * Add your own scripts.
+ */

package/template/block/render.php.mustache

@@ -0,0 +1,15 @@
+<?php
+/**
+ * {{title}} Dynamic Renderer Functions
+ *
+ * @package {{namespace}}
+ *
+ * @see https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/creating-dynamic-blocks/
+ *
+ * @param array         $attributes Block attributes.
+ * @param string        $content    Block content.
+ * @param  WP_Block_Type $block Current Block Type.
+ */
+ ?>
+ 
+<p>Render Block Output</p>

package/template/index.cjs

@@ -13,14 +13,13 @@ const blockSlugTitle = capitalCase( blockSlug );
 const customScripts = {};
 
 const npmDependencies = [ 
-	'@wordpress/icons@9.44.0' 
+	'@wordpress/icons@9.45.0' 
 ];
 
 const npmDevDependencies = [
 	'@wordpress/scripts@27.6.0'
 ];
 
-// assetsPath: join( __dirname, 'assets' ),
 module.exports = {
 	pluginTemplatesPath: join( __dirname, 'plugin' ),
 	blockTemplatesPath: join( __dirname, 'block' ),
@@ -47,4 +46,8 @@ module.exports = {
 		npmDependencies: npmDependencies,
 		npmDevDependencies: npmDevDependencies,
 	},
+	customBlockJSON: {
+		viewScript: "file:./frontend.js",
+		render: "file:./render.php"
+	}
 };

package/template/plugin/$slug.php.mustache

@@ -44,11 +44,6 @@ foreach ( glob( __DIR__ . '/core/*.php' ) as $file ) {
 	require_once $file;
 }
 
-// Include {{title}} Functionality.
-foreach ( glob( __DIR__ . '/inc/*.php' ) as $file ) {
-	require_once $file;
-}
-
 /**
  * Plugin API/Action Reference
  * Actions Run During a Typical Request
@@ -56,7 +51,6 @@ foreach ( glob( __DIR__ . '/inc/*.php' ) as $file ) {
  * @link https://codex.wordpress.org/Plugin_API/Action_Reference#Actions_Run_During_a_Typical_Request
  */
 add_action( 'init', 'cagov_design_system_{{slugSnakeCase}}_init' );
-add_action( 'wp_enqueue_scripts', 'cagov_design_system_{{slugSnakeCase}}_wp_enqueue_scripts' );
 
 if ( ! function_exists( 'cagov_design_system_{{slugSnakeCase}}_init' ) ) {
 	/**
@@ -71,12 +65,6 @@ if ( ! function_exists( 'cagov_design_system_{{slugSnakeCase}}_init' ) ) {
 	function cagov_design_system_{{slugSnakeCase}}_init() {
 		global $pagenow;
 
-		if ( ! function_exists( 'get_plugin_data' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/plugin.php';
-		}
-
-		$version = get_plugin_data( __FILE__ )['Version'];
-
 		/**
 		* Enqueues the default ThickBox js and css. (if not on the login page or customizer page)
 		*
@@ -86,16 +74,6 @@ if ( ! function_exists( 'cagov_design_system_{{slugSnakeCase}}_init' ) ) {
 			add_thickbox();
 		}
 
-		// if editing a page/post register compiled Gutenberg Block bundles.
-		if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ), true ) ) {
-
-			wp_enqueue_style( 'cagov-design-system-{{slug}}', cagov_design_system_{{slugSnakeCase}}_get_min_file( '/css/{{slug}}.css' ), array(), $version );
-		}
-
-		$block_args = array(
-			'render_callback' => 'cagov_design_system_{{slugSnakeCase}}_block_renderer',
-		);
-
 		/**
 		 * Registers the block using the metadata loaded from the `block.json` file.
 		 * Behind the scenes, it registers also all assets so they can be enqueued
@@ -103,33 +81,7 @@ if ( ! function_exists( 'cagov_design_system_{{slugSnakeCase}}_init' ) ) {
 		 *
 		 * @see https://developer.wordpress.org/reference/functions/register_block_type/
 		*/
-		register_block_type( __DIR__ . '/build', $block_args );
+		register_block_type( __DIR__ . '/build' );
 	}
 }
 
-if ( ! function_exists( 'cagov_design_system_{{slugSnakeCase}}_wp_enqueue_scripts' ) ) {
-	/**
-	 * Register {{title}} scripts/styles
-	 *
-	 * Fires when scripts and styles are enqueued.
-	 *
-	 * @category add_action( 'wp_enqueue_scripts', 'cagov_design_system_{{slugSnakeCase}}_wp_enqueue_scripts' );
-	 * @link https://developer.wordpress.org/reference/hooks/wp_enqueue_scripts/
-	 *
-	 * @return void
-	 */
-	function cagov_design_system_{{slugSnakeCase}}_wp_enqueue_scripts() {
-
-		if ( ! function_exists( 'get_plugin_data' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/plugin.php';
-		}
-
-		$version = get_plugin_data( __FILE__ )['Version'];
-
-		// Register compiled Gutenberg Block bundles.
-		wp_enqueue_script( 'cagov-design-system-{{slug}}', cagov_design_system_{{slugSnakeCase}}_get_min_file( '/js/{{slug}}.js', 'js' ), array(), $version, true );
-
-		wp_enqueue_style( 'cagov-design-system-{{slug}}', cagov_design_system_{{slugSnakeCase}}_get_min_file( '/css/{{slug}}.css' ), array(), $version );
-
-	}
-}

package/template/plugin/core/filters.php.mustache

@@ -11,7 +11,6 @@ $cagov_design_system_is_under_5_8 = version_compare( $wp_version, '5.8', '<' ) ?
 
 add_filter( "block_categories$cagov_design_system_is_under_5_8", 'cagov_design_system_block_categories', 10, 2 );
 add_filter( 'script_loader_tag', 'cagov_design_system_{{slugSnakeCase}}_script_loader_tag', 10, 3 );
-add_filter( "allowed_block_types$cagov_design_system_is_under_5_8", 'cagov_design_system_allowed_block_types' );
 
 if ( ! function_exists( 'cagov_design_system_block_categories' ) ) {
 	/**
@@ -31,65 +30,11 @@ if ( ! function_exists( 'cagov_design_system_block_categories' ) ) {
 					'title' => 'CA Design System',
 				),
 			),
-			array(
-				array(
-					'slug'  => 'cagov-data-viz',
-					'title' => 'CA Data Visualization',
-				),
-			),
 			$categories
 		);
 	}
 }
 
-if ( ! function_exists( 'cagov_design_system_allowed_block_types' ) ) {
-	/**
-	 * {{title}} Allowed Block Types
-	 *
-	 * Removes all blocks or patterns from Gutenberg and returns {{title}} Blocks.
-	 *
-	 * @link https://developer.wordpress.org/reference/hooks/allowed_block_types_all/
-	 *
-	 * @param  bool|array $allowed_blocks Array of block type slugs, or boolean to enable/disable all. Default true (all registered block types supported).
-	 * @return array
-	 */
-	function cagov_design_system_allowed_block_types( $allowed_blocks ) {
-
-		// if not debugging, return all blocks.
-		if ( ! CAGOV_DESIGN_SYSTEM_DEBUG ) {
-			return $allowed_blocks;
-		}
-
-		remove_theme_support( 'core-block-patterns' );
-
-		// Core Components.
-		$core = array(
-			'core/image',
-			'core/paragraph',
-			'core/button',
-			'core/table',
-			'core/heading',
-			'core/list',
-			'core/custom-html',
-			'core/classic',
-		);
-
-		// Dynamically get a list of the cagov-design-system blocks.
-		$cagov_blocks = array();
-		/*
-		array_map(
-			function( $b ) {
-				return 'cagov-design-system/' . basename( $b );
-			},
-			glob( '/blocks/*' )
-		);
-		*/
-
-		// Return the desired components.
-		return array_merge( $core, $cagov_blocks );
-	}
-}
-
 if ( ! function_exists( 'cagov_design_system_{{slugSnakeCase}}_script_loader_tag' ) ) {
 	/**
 	 * Filters the HTML script tag of an enqueued script.

package/template/assets/css/popover.css

@@ -1,80 +0,0 @@
-
-  .popover-content {
-    position: absolute;
-    display: flex;
-    flex-direction: column-reverse;
-    row-gap: .5rem;
-    left: -10000px;
-    top: auto;
-    width: 1px;
-    height: 1px;
-    background-color: white;
-    padding: 1rem;
-    z-index: 100;
-    outline: 0;
-    border-radius: .5rem;
-    overflow: visible;
-    pointer-events: none;
-    --shadow-color: 220 3% 15%;
-    --shadow-strength: 1%;
-    box-shadow:  5px 7px 15px grey;
-  }
-  .popover-content:focus {
-    outline: 2px solid var(--highlight-color, #fec02f);
-  }
-  
-  .popover-container {
-    position: relative;
-    width: fit-content;
-  }
-  
-  .popover-content::before {
-    content: '';
-    position: absolute;
-    width: 1rem;
-    height: 1rem;
-    left: 0;
-    top: 50%;
-    background-color: white;
-    transform: translate(-50%, -50%) rotate(45deg);
-  }
-  .popover-revealed {
-    width: max-content;
-    height: max-content;
-    left: var(--x);
-    top: var(--y);
-    transform: translateY(-50%);
-  }
-  @media screen and (max-width: 950px) {
-    .popover-content::before {
-      content: none;
-    }
-    .popover-revealed {
-      left: calc(50% + var(--x-offset-m, 0%));
-      transform: translate(-50%, 0);
-    }
-  }
-  
-  .popover-legend {
-    display: flex;
-    flex-direction: row;
-    gap: .75rem;
-    align-items: flex-start;
-  }
-  
-  .popover-legend svg {
-    height: 1.5em;
-  }
-
-  .popover-revealed p {
-    font-weight: 400;
-    font-size: 1em;
-  }
-  
-  .popover-header {
-    margin: 0;
-  }
-  
-  .popover-stat {
-    margin: 0 0 .5rem 0;
-  }

package/template/assets/js/popover.js

@@ -1,30 +0,0 @@
-jQuery( document ).ready( function ( $ ) { // eslint-disable-line
-	$( document ).on( 'mouseover', '.popover', function ( ele ) {
-		togglePopover( ele.currentTarget.id );
-	} );
-
-	$( document ).on( 'mouseout', '.popover', function ( ele ) {
-		togglePopover( ele.currentTarget.id, false );
-	} );
-
-	function togglePopover( id, popin = true ) {
-		if ( undefined !== id ) {
-			const current = $( '#' + id );
-			const popver = $( '#' + id + '-popover' );
-
-			if ( popin ) {
-				current.addClass( 'highlighted' );
-
-				if ( undefined !== popver ) {
-					$( popver ).addClass( 'popover-revealed' );
-				}
-			} else {
-				current.removeClass( 'highlighted' );
-
-				if ( undefined !== popver ) {
-					$( popver ).removeClass( 'popover-revealed' );
-				}
-			}
-		}
-	}
-} );

package/template/plugin/core/cdec-api.php.mustache

@@ -1,44 +0,0 @@
-<?php
-/**
- * {{title}} CDEC REST API
- *
- * @see https://cdec.water.ca.gov/resapp/
- *
- * @package cagov-design-system
- */
-
-if ( ! function_exists( 'cagov_design_system_cdec_reservoir_conditions_api' ) ) {
-	/**
-	 * Retrieve data from the CDEC Reservoir API
-	 *
-	 * @see https://cdec.water.ca.gov/resapp/service/res/conditions
-	 * @param  string $station_id Major reservoirs station that were recommended by CDEC.
-	 * @return string
-	 */
-	function cagov_design_system_cdec_reservoir_conditions_api( $station_id = '' ) {
-		$result = 'No Results';
-
-		if ( empty( $station_id ) ) {
-			return $result;
-		}
-
-		$date = gmdate( 'Y-m-d' );
-
-		$url = "https://cdec.water.ca.gov/resapp/service/res/conditions?date=$date&stationIds=$station_id";
-
-		$args = array(
-			'headers' => array(
-				'Content-Type' => 'application/json',
-			),
-		);
-
-		$response = wp_remote_get( $url, $args );
-
-		if ( 200 === wp_remote_retrieve_response_code( $response ) ) {
-			$result = wp_remote_retrieve_body( $response );
-
-			return json_decode( $result, true )[0];
-		}
-
-	}
-}

package/template/plugin/inc/renderer.php.mustache

@@ -1,25 +0,0 @@
-<?php
-/**
- * {{title}} Dynamic Renderer Functions
- *
- * @package {{namespace}}
- */
-
-if ( ! function_exists( 'cagov_design_system_{{slugSnakeCase}}_block_renderer' ) ) {
-	/**
-	 * Dynamic Renderer for {{title}} Block
-	 *
-	 * @see https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/creating-dynamic-blocks/
-	 *
-	 * @param array         $attributes Block attributes.
-	 * @param string        $content    Block content.
-	 * @param  WP_Block_Type $block Current Block Type.
-	 * @return string Rendered block type output.
-	 */
-	function cagov_design_system_{{slugSnakeCase}}_block_renderer( $attributes, $content, $block ) {
-
-		$output = sprintf( '<p>Render Block Output</p>' );
-
-		return $output;
-	}
-}