chore: tweaks

Author: Soare-Robert-Daniel

Diff for: Gruntfile.js

@@ -85,7 +85,18 @@ module.exports = function( grunt ) {
 					flags: ''
 				},
 				src: [ 'plugins/otter-pro/otter-pro.php' ]
-			}
+			},
+			readmetxt: {
+				options: {
+					prefix: 'Stable tag:\\s*'
+				},
+				src: [
+					'readme.txt',
+					'plugins/blocks-animation/readme.txt',
+					'plugins/blocks-css/readme.txt',
+					'plugins/blocks-export-import/readme.txt',
+				]
+			},
 		},
 		wp_readme_to_markdown: {
 			plugin: {

Diff for: bin/dist.sh

@@ -25,8 +25,11 @@ fi
 # Take all the files, filter the dev ones (e.g. node_modules, src), and save the result to './dist'
 rsync -rc --exclude-from ".distignore" "./" "dist/$DIST_FOLDER"
 
+# Update stable version for readme.txt
+npm run grunt:version
+
 # Change the individual sub-text-domain for the included sub-plugins in the main one.
-composer run format-dist -- "dist/$DIST_FOLDER"
+composer run format-dist -- "./dist/$DIST_FOLDER"
 
 cd dist
 

Diff for: composer.json

@@ -39,7 +39,7 @@
 		"format": "phpcbf",
 		"phpunit": "phpunit",
 		"phpstan": "phpstan analyse --memory-limit 2G",
-		"format-dist": "phpcbf --standard=phpcs.export.xml $1"
+		"format-dist": "phpcbf --standard=phpcs.export.xml"
 	},
 	"prefer-stable": true,
 	"config": {

Diff for: inc/class-blocks-animation.php

@@ -44,6 +44,7 @@ public function init() {
 		if ( ! defined( 'BLOCKS_ANIMATION_URL' ) ) {
 			define( 'BLOCKS_ANIMATION_URL', OTTER_BLOCKS_URL );
 			define( 'BLOCKS_ANIMATION_PATH', OTTER_BLOCKS_PATH );
+			define( 'BLOCKS_ANIMATION_OTTER', true );
 		}
 
 		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_editor_assets' ) );
@@ -63,7 +64,8 @@ public function init() {
 	 * @access  public
 	 */
 	public function enqueue_editor_assets() {
-		$asset_file = include BLOCKS_ANIMATION_PATH . '/build/animation/index.asset.php';
+		$asset_file           = include BLOCKS_ANIMATION_PATH . '/build/animation/index.asset.php';
+		$is_using_otter_files = defined( 'BLOCKS_ANIMATION_OTTER' );
 
 		wp_enqueue_style(
 			'otter-animation',
@@ -92,11 +94,7 @@ public function enqueue_editor_assets() {
 			)
 		);
 
-		if ( ! defined( 'BLOCKS_ANIMATION_URL' ) ) {
-			wp_set_script_translations( 'otter-animation', 'otter-blocks' );
-		} else {
-			wp_set_script_translations( 'otter-animation', 'blocks-animation' );
-		}
+		wp_set_script_translations( 'otter-animation', $is_using_otter_files ? 'otter-blocks' : 'blocks-animation' );
 
 		$asset_file = include BLOCKS_ANIMATION_PATH . '/build/animation/anim-count.asset.php';
 		wp_enqueue_script(
@@ -109,11 +107,7 @@ public function enqueue_editor_assets() {
 
 		wp_script_add_data( 'otter-count', 'defer', true );
 
-		if ( ! defined( 'BLOCKS_ANIMATION_URL' ) ) {
-			wp_set_script_translations( 'otter-count', 'otter-blocks' );
-		} else {
-			wp_set_script_translations( 'otter-count', 'blocks-animation' );
-		}
+		wp_set_script_translations( 'otter-count', $is_using_otter_files ? 'otter-blocks' : 'blocks-animation' );
 
 		wp_enqueue_script(
 			'otter-typing',
@@ -125,11 +119,7 @@ public function enqueue_editor_assets() {
 
 		wp_script_add_data( 'otter-typing', 'defer', true );
 
-		if ( ! defined( 'BLOCKS_ANIMATION_URL' ) ) {
-			wp_set_script_translations( 'otter-typing', 'otter-blocks' );
-		} else {
-			wp_set_script_translations( 'otter-typing', 'blocks-animation' );
-		}
+		wp_set_script_translations( 'otter-typing', $is_using_otter_files ? 'otter-blocks' : 'blocks-animation' );
 	}
 
 	/**

Diff for: inc/class-blocks-css.php

@@ -26,6 +26,7 @@ public function init() {
 		if ( ! defined( 'BLOCKS_CSS_URL' ) ) {
 			define( 'BLOCKS_CSS_URL', OTTER_BLOCKS_URL );
 			define( 'BLOCKS_CSS_PATH', OTTER_BLOCKS_PATH );
+			define( 'BLOCKS_CSS_OTTER', true );
 		}
 
 		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_editor_assets' ), 1 );
@@ -86,11 +87,7 @@ public function enqueue_editor_assets() {
 			)
 		);
 
-		if ( ! defined( 'BLOCKS_CSS_URL' ) ) {
-			wp_set_script_translations( 'otter-css', 'otter-blocks' );
-		} else {
-			wp_set_script_translations( 'otter-css', 'blocks-css' );
-		}
+		wp_set_script_translations( 'otter-css', defined( 'BLOCKS_CSS_OTTER' ) ? 'otter-blocks' : 'blocks-css' );
 
 		wp_enqueue_style(
 			'otter-css',

Diff for: inc/class-blocks-export-import.php

@@ -26,6 +26,7 @@ public function init() {
 		if ( ! defined( 'BLOCKS_EXPORT_IMPORT_URL' ) ) {
 			define( 'BLOCKS_EXPORT_IMPORT_URL', OTTER_BLOCKS_URL );
 			define( 'BLOCKS_EXPORT_IMPORT_PATH', OTTER_BLOCKS_PATH );
+			define( 'BLOCKS_EXPORT_OTTER', true );
 		}
 
 		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_editor_assets' ), 1 );
@@ -48,11 +49,7 @@ public function enqueue_editor_assets() {
 			true
 		);
 
-		if ( ! defined( 'BLOCKS_EXPORT_IMPORT_URL' ) ) {
-			wp_set_script_translations( 'blocks-export-import', 'otter-blocks' );
-		} else {
-			wp_set_script_translations( 'blocks-export-import', 'blocks-export-import' );
-		}
+		wp_set_script_translations( 'blocks-export-import', defined( 'BLOCKS_EXPORT_OTTER' ) ? 'otter-blocks' : 'blocks-export-import' );
 	}
 
 	/**

Diff for: package.json

@@ -7,6 +7,7 @@
 		"prod:lite": "wp-scripts build --config webpack.config.js",
 		"prod:pro": "wp-scripts build --config webpack.config.pro.js",
 		"prod:grunt": "grunt build",
+		"grunt:version": "npm run grunt version",
 		"start": "rm -rf build && npm-run-all --parallel dev:*",
 		"dev:lite": "wp-scripts start --config webpack.config.js",
 		"dev:pro": "wp-scripts start --config webpack.config.pro.js",

Diff for: src/animation/editor.js

@@ -457,7 +457,7 @@ function AnimationControls({
 			>
 				<img
 					src={ typingPlaceholder }
-					alt={ _( 'Using Count Animation in the Block Editor', 'blocks-animation' ) }
+					alt={ __( 'Using Count Animation in the Block Editor', 'blocks-animation' ) }
 					className="otter-animations-count-image"
 				/>
 
@@ -470,7 +470,7 @@ function AnimationControls({
 			>
 				<img
 					src={ countPlaceholder }
-					alt={ _( 'Using Typing Animation in the Block Editor', 'blocks-animation' ) }
+					alt={ __( 'Using Typing Animation in the Block Editor', 'blocks-animation' ) }
 					className="otter-animations-count-image"
 				/>