From 246c9ddd3528f9ddf8c741ab91a2f0ddd96f32f9 Mon Sep 17 00:00:00 2001 From: Roman Axelrod Date: Mon, 6 Nov 2023 15:51:26 +0200 Subject: [PATCH 1/4] Fix capitalization function --- helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers.js b/helpers.js index 2bef0ed..34d3135 100644 --- a/helpers.js +++ b/helpers.js @@ -101,7 +101,7 @@ export function capitalize(str) { return str .toLowerCase() - .split(/[ -_]/g) + .split(/[-_ ]/g) .filter((word) => !!word) .map((word) => { return word.charAt(0).toUpperCase() + word.slice(1); From 11152dda874d37a708c1fcbc05c4ca0fe04f12e4 Mon Sep 17 00:00:00 2001 From: Roman Axelrod Date: Mon, 6 Nov 2023 15:51:40 +0200 Subject: [PATCH 2/4] 1.0.28 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 955cff1..7cf9035 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@axe-web/block-dev-tool", - "version": "1.0.27", + "version": "1.0.28", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@axe-web/block-dev-tool", - "version": "1.0.27", + "version": "1.0.28", "license": "ISC", "dependencies": { "@braintree/sanitize-url": "^6.0.0", diff --git a/package.json b/package.json index 057da1a..d520f67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@axe-web/block-dev-tool", - "version": "1.0.27", + "version": "1.0.28", "author": { "name": "AXE-WEB", "email": "office@axe-web.com", From 0a4fd3608fbf5a98789715eb77460cd8f5faa215 Mon Sep 17 00:00:00 2001 From: Roman Axelrod Date: Mon, 13 Nov 2023 01:01:35 +0200 Subject: [PATCH 3/4] Updated path of assets files. --- package-lock.json | 4 ++-- package.json | 2 +- platforms/wordpress/templates/Template_Component.php | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7cf9035..d4ad9b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@axe-web/block-dev-tool", - "version": "1.0.28", + "version": "1.0.29", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@axe-web/block-dev-tool", - "version": "1.0.28", + "version": "1.0.29", "license": "ISC", "dependencies": { "@braintree/sanitize-url": "^6.0.0", diff --git a/package.json b/package.json index d520f67..1fb710e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@axe-web/block-dev-tool", - "version": "1.0.28", + "version": "1.0.29", "author": { "name": "AXE-WEB", "email": "office@axe-web.com", diff --git a/platforms/wordpress/templates/Template_Component.php b/platforms/wordpress/templates/Template_Component.php index c7b0aa5..675593d 100644 --- a/platforms/wordpress/templates/Template_Component.php +++ b/platforms/wordpress/templates/Template_Component.php @@ -22,8 +22,8 @@ class <%= blockClassModel %>_Component extends \Core\Component { // $version = \Core\Global_Functions::get_current_version_number(); // In Theme // $base_path = get_template_directory_uri() . '/components/partials/<%= blockFilename %>/'; - wp_enqueue_style( 'block-<%= blockFilename %>', plugins_url( 'templates/styles/<%= blockFilename %>.min.css', __FILE__ ), ['assets-style'], self::VERSION );<% if (include_script) { %> - wp_enqueue_script( 'block-<%= blockFilename %>', plugins_url( 'templates/scripts/<%= blockFilename %>.min.js', __FILE__ ), ['assets-script'], self::VERSION, true );<% } %> + wp_enqueue_style( 'block-<%= blockFilename %>', $this->get_assets_path_url( 'templates/styles/<%= blockFilename %>.min.css' ), ['assets-style'], self::VERSION );<% if (include_script) { %> + wp_enqueue_script( 'block-<%= blockFilename %>', $this->get_assets_path_url( 'templates/scripts/<%= blockFilename %>.min.js' ), ['assets-script'], self::VERSION, true );<% } %> wp_enqueue_script( 'script-block-<%= blockFilename %>' ); }<% } %> @@ -32,13 +32,13 @@ class <%= blockClassModel %>_Component extends \Core\Component { 'style_assets' => [ [ 'name' => '<%= blockFilename %>', - 'url' => plugins_url( 'templates/styles/<%= blockFilename %>.min.css', __FILE__ ), + 'url' => $this->get_assets_path_url( 'templates/styles/<%= blockFilename %>.min.css' ), ] ], 'script_assets' => [ [ 'name' => '<%= blockFilename %>', - 'url' => plugins_url( 'templates/scripts/<%= blockFilename %>.min.js', __FILE__ ), + 'url' => $this->get_assets_path_url( 'templates/scripts/<%= blockFilename %>.min.js' ), ] ] ] ); @@ -50,7 +50,7 @@ class <%= blockClassModel %>_Component extends \Core\Component { $asset_file_front = include( plugin_dir_path( __FILE__ ) . '/templates/gutenberg-block/build/front.asset.php' ); wp_enqueue_script( 'gutenberg-<%= blockFilename %>-scripts-front', - plugins_url( 'templates/gutenberg-block/build/front.js', __FILE__ ), + $this->get_assets_path_url( 'templates/gutenberg-block/build/front.js' ), $asset_file_front['dependencies'], $asset_file_front['version'], true From 0e91c42e892ff2bfcd1854137d3feefb0ab4bc92 Mon Sep 17 00:00:00 2001 From: Roman Axelrod Date: Fri, 15 Dec 2023 12:33:26 +0200 Subject: [PATCH 4/4] Update $base_url parameter since the block location changed. --- platforms/php/build.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/php/build.php b/platforms/php/build.php index cd4fd62..bdf92cf 100644 --- a/platforms/php/build.php +++ b/platforms/php/build.php @@ -71,8 +71,8 @@ class Component_Builder { $this->register_default_handlebar_helpers(); $this->add_handlebar( 'base_url', function ( $context ) { - $path = join( '/', [ 'blocks', $this->block_project, $this->block_name, 'templates' ] ); - return plugins_url( $path . '/', 'axeweb-blocks-library/axeweb-blocks-library.php' ); + $path = join( '/', [ $this->block_project, $this->block_name, 'templates' ] ); + return join( '/', [ get_site_url(),'wp-content', 'axe-web-blocks', $path, '' ] ); } ); }