Merge branch 'main' of https://github.com/wpkitpro/wp-kit-elementor i…

…nto develop

# Conflicts:
#	assets/sass/style.scss
#	functions.php
#	package.json
#	readme.txt

.env

@@ -0,0 +1 @@
+VERSION=1.0.6

.github/scripts/update-version-in-files.js

@@ -1,32 +1,39 @@
 'use strict';
 
-const replaceInFile = require('replace-in-file');
+const dotenv = require( 'dotenv' );
+const path = require( 'path' );
+dotenv.config( { path: path.resolve( '../../.env' ) } );
+const replaceInFile = require( 'replace-in-file' );
 
-const {VERSION} = process.env;
-
-const replaceInFileWithLog = async (options) => {
-	const results = await replaceInFile(options);
-	console.log('Replacement results:', results, 'options: ', options);
+const { VERSION } = process.env;
+const replaceInFileWithLog = async ( options ) => {
+	const results = await replaceInFile( options );
+	console.log( 'Replacement results:', results, 'options: ', options );
 };
 
 const run = async () => {
 	try {
 		await replaceInFileWithLog( {
-			files: './assets/scss/style.scss',
+			files: '../../assets/sass/style.scss',
 			from: /Version:.*$/m,
 			to: `Version: ${ VERSION }`,
 		} );
 
 		await replaceInFileWithLog( {
-			files: './functions.php',
+			files: '../../assets/sass/style.scss',
+			from: /Stable tag:.*$/m,
+			to: `Stable tag: ${ VERSION }`,
+		} );
+
+		await replaceInFileWithLog( {
+			files: '../../functions.php',
 			from: /WPKIT_ELEMENTOR_VERSION', '(.*?)'/m,
 			to: `WPKIT_ELEMENTOR_VERSION', '${ VERSION }'`,
 		} );
 
-	} catch (err) {
-		console.error('Error occurred:', err);
-		process.exit(1);
+	} catch ( err ) {
+		console.error( 'Error occurred:', err );
+		process.exit( 1 );
 	}
 }
-
 run();

assets/sass/style.scss

@@ -4,7 +4,8 @@ Theme URI: https://wpkit.pro/themes/wpkit-elementor/
 Description: WpKitElementor is a versatile and streamlined WordPress theme meticulously crafted to integrate seamlessly with the Elementor page builder plugin. This free and open-source theme is tailored for users seeking a nimble, user-friendly, and highly customizable website. Engineered for optimal performance, WpKitElementor establishes a robust groundwork, empowering users to fashion distinctive designs effortlessly through the intuitive Elementor drag-and-drop site builder. With its user-centric simplicity and adaptable features, WpKitElementor stands out as an excellent choice for both novices and seasoned web creators alike.
 Author: WpKit
 Author URI: https://wpkit.pro
-Version: 1.0.5
+Version: 1.0.6
+Stable tag: 1.0.6
 Requires at least: 6.0
 Tested up to: 6.4
 Requires PHP: 7.3

functions.php

@@ -9,7 +9,7 @@
 	exit; // Exit if accessed directly.
 }
 
-define( 'WPKIT_ELEMENTOR_VERSION', '1.0.5' );
+define( 'WPKIT_ELEMENTOR_VERSION', '1.0.6' );
 
 function wp_kit_elementor_setup() {
 	// Add default posts and comments RSS feed links to head

package.json

@@ -3,7 +3,7 @@
 	"slug": "wp-kit-elementor",
 	"homepage": "https://wpkit.pro",
 	"description": "A sample WordPress theme for Elementor page builder.",
-	"version": "1.0.5",
+	"version": "1.0.6",
 	"private": true,
 	"scripts": {
 		"update-version": "node .github/scripts/update-version-in-files.js",
@@ -29,6 +29,7 @@
 		"concurrently": "^8.2.2",
 		"copy-webpack-plugin": "^11.0.0",
 		"cssnano": "^6.0.3",
+		"dotenv": "^16.3.2",
 		"eslint": "^8.56.0",
 		"eslint-config-wordpress": "^2.0.0",
 		"eslint-plugin-babel": "^5.3.1",
@@ -48,6 +49,7 @@
 		"matchdep": "^2.0.0",
 		"npm-build-zip": "^1.0.4",
 		"react": "^18.2.0",
+		"replace-in-file": "^7.1.0",
 		"rimraf": "^5.0.5",
 		"sass": "^1.69.7",
 		"terser-webpack-plugin": "^5.3.10",
@@ -58,7 +60,7 @@
 		"@babel/plugin-transform-modules-commonjs": "^7.23.3",
 		"@babel/plugin-transform-runtime": "^7.23.7",
 		"@lodder/grunt-postcss": "^3.1.1",
-		"grunt-autoprefixer": "^3.0.0",
+		"grunt-autoprefixer": "^3.0.4",
 		"grunt-cssnano": "^3.0.0"
 	}
 }

readme.txt

@@ -42,25 +42,16 @@ Source: https://stocksnap.io/photo/BHIL9FV6RK
 
 == Changelog ==
 
+= 1.0.5 - 2024-01-22 =
+Fix: Correct function names in wp_kit_elementor theme
+
 = 1.0.5 - 2024-01-21 =
-* New: Footer code has been moved to a separate 'template-parts/footer' file to improve code organization.
-* New: Add footer menu to wp-kit-elementor theme
-* New: Add gray-base color variable
-* Tweak: Refactor file paths and remove unnecessary comments
-* Tweak: Update theme and author name
-* Tweak: Adjust font size and weight in wp-kit-elementor theme's header
-* Tweak: Update footer styling in wp-kit-elementor theme
-* Tweak: Refactor navigation styling in wp-kit-elementor theme
-* Tweak: Rename primary menu label in wp-kit-elementor theme functions
-* Tweak: Update light-gray color variable and references
-* Fix: Added prefix wp_kit_elementor_ to function names in wp-kit-elementor
-* Fix: Cleansed 'header.php' file in 'wp-kit-elementor' theme by deduction of superfluous line breaks.
-* Fix: Simplify site navigation tag in theme header
-* Fix: The PHP requirement has been reduced from 7.4 to 7.3 in the readme.txt file.
-* Remove: Remove stable tag in theme's style file
-* Remove: Custom background support in wp-kit-elementor.
+Fix: Refactor function names in WpKit Elementor theme
 
 = 1.0.4 - 2024-01-13 =
+* Tweak: Updated theme metadata in the style.css file
+* Tweak: Add enqueue theme stylesheet code in functions.php
+* Tweak: Refactor theme function file for wp-kit-elementor
 * New: Add navigation styles to _header-and-footer.scss in wp-kit-elementor theme
 * New: Add style code for header, footer, comments, and posts/pages
 * New: Add theme.scss and related Sass files

webpack.config.js

@@ -28,6 +28,7 @@ const copyPluginConfig = new CopyPlugin( {
 					...Object.keys( entry ).map( ( key ) => `**/assets/js/${ key }.min.asset.php` ),
 					'**.zip',
 					'**.css',
+					'**/.env',
 					'**/karma.conf.js',
 					'**/assets/scripts/**',
 					'**/assets/sass/**',