Move assets to the folder assets

tlamedia · Oct 2, 2023 · 8810178 · 8810178
1 parent 98aec7f
commit 8810178
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 21 deletions.
diff --git a/build/admin/settings.asset.php → assets/admin/settings.asset.php b/build/admin/settings.asset.php → assets/admin/settings.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '77ee83c4ea5024b59278');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => 'ba69da201e2be1442d0d');
diff --git a/build/admin/settings.css → assets/admin/settings.css b/build/admin/settings.css → assets/admin/settings.css
diff --git a/assets/admin/settings.js b/assets/admin/settings.js
diff --git a/build/admin/wizard.asset.php → assets/admin/wizard.asset.php b/build/admin/wizard.asset.php → assets/admin/wizard.asset.php
diff --git a/build/admin/wizard.css → assets/admin/wizard.css b/build/admin/wizard.css → assets/admin/wizard.css
diff --git a/build/admin/wizard.js → assets/admin/wizard.js b/build/admin/wizard.js → assets/admin/wizard.js
diff --git a/build/frontend/woocommerce-blocks.asset.php → assets/frontend/woocommerce-blocks.asset.php b/build/frontend/woocommerce-blocks.asset.php → assets/frontend/woocommerce-blocks.asset.php
diff --git a/build/frontend/woocommerce-blocks.js → assets/frontend/woocommerce-blocks.js b/build/frontend/woocommerce-blocks.js → assets/frontend/woocommerce-blocks.js
diff --git a/assets/js/contact-form-7.js → assets/integration/contact-form-7.js b/assets/js/contact-form-7.js → assets/integration/contact-form-7.js
diff --git a/assets/js/edd-checkout.js → assets/integration/edd-checkout.js b/assets/js/edd-checkout.js → assets/integration/edd-checkout.js
diff --git a/assets/js/edd.js → assets/integration/edd.js b/assets/js/edd.js → assets/integration/edd.js
diff --git a/assets/js/woocommerce-checkout.js → assets/integration/woocommerce-checkout.js b/assets/js/woocommerce-checkout.js → assets/integration/woocommerce-checkout.js
diff --git a/assets/js/woocommerce.js → assets/integration/woocommerce.js b/assets/js/woocommerce.js → assets/integration/woocommerce.js
diff --git a/build/admin/settings.js b/build/admin/settings.js
diff --git a/package.json b/package.json
@@ -20,19 +20,19 @@
     "uglify-js": "^3.17.4"
   },
   "scripts": {
-    "build": "wp-scripts build src/js/frontend/woocommerce-blocks.js --output-path=build/frontend",
+    "build": "wp-scripts build src/js/frontend/woocommerce-blocks.js --output-path=assets/frontend",
     "build:assets": "npm run clean:assets && npm run build:js && npm run copy:images",
     "build:js": "npm run uglify:woocommerce && npm run uglify:woocommerce-checkout && npm run uglify:edd && npm run uglify:edd-checkout && npm run uglify:cf7",
     "clean:assets": "del assets",
     "i18n:textdomain": "wpi18n addtextdomain",
     "i18n:pot": "wp i18n make-pot ./ languages/gtm-kit.pot",
     "change-version": "./bin/change-version.sh $npm_package_version",
     "zip-package": "./bin/zip-package.sh",
-    "uglify:woocommerce": "mkdirp assets/js && uglifyjs src/js/woocommerce.js --compress --mangle --output assets/js/woocommerce.js",
-    "uglify:woocommerce-checkout": "mkdirp assets/js && uglifyjs src/js/woocommerce-checkout.js --compress --mangle --output assets/js/woocommerce-checkout.js",
-    "uglify:edd": "mkdirp assets/js && uglifyjs src/js/edd.js --compress --mangle --output assets/js/edd.js",
-    "uglify:edd-checkout": "mkdirp assets/js && uglifyjs src/js/edd-checkout.js --compress --mangle --output assets/js/edd-checkout.js",
-    "uglify:cf7": "mkdirp assets/js && uglifyjs src/js/contact-form-7.js --compress --mangle --output assets/js/contact-form-7.js",
+    "uglify:woocommerce": "mkdirp assets/integration && uglifyjs src/js/woocommerce.js --compress --mangle --output assets/integration/woocommerce.js",
+    "uglify:woocommerce-checkout": "mkdirp assets/integration && uglifyjs src/js/woocommerce-checkout.js --compress --mangle --output assets/integration/woocommerce-checkout.js",
+    "uglify:edd": "mkdirp assets/integration && uglifyjs src/js/edd.js --compress --mangle --output assets/integration/edd.js",
+    "uglify:edd-checkout": "mkdirp assets/integration && uglifyjs src/js/edd-checkout.js --compress --mangle --output assets/integration/edd-checkout.js",
+    "uglify:cf7": "mkdirp assets/integration && uglifyjs src/js/contact-form-7.js --compress --mangle --output assets/integration/contact-form-7.js",
     "copy:images": "node ./bin/copy-images.js",
     "format": "wp-scripts format",
     "lint:css": "wp-scripts lint-style",

diff --git a/src/Admin/AbstractOptionsPage.php b/src/Admin/AbstractOptionsPage.php
@@ -158,7 +158,7 @@ abstract public function enqueue_page_assets( string $hook ): void;
 	 */
 	protected function enqueue_assets( string $page_slug, string $script_handle, string $path = GTMKIT_PATH, string $url = GTMKIT_URL ) {
 
-		$deps_file  = $path . 'build/admin/' . $script_handle . '.asset.php';
+		$deps_file  = $path . 'assets/admin/' . $script_handle . '.asset.php';
 		$dependency = [];
 		$version    = false;
 
@@ -168,9 +168,9 @@ protected function enqueue_assets( string $page_slug, string $script_handle, str
 			$version    = $deps_file['version'];
 		}
 
-		\wp_enqueue_style( 'gtmkit-' . $script_handle . '-style', $url . 'build/admin/' . $script_handle . '.css', array( 'wp-components' ), $version );
+		\wp_enqueue_style( 'gtmkit-' . $script_handle . '-style', $url . 'assets/admin/' . $script_handle . '.css', array( 'wp-components' ), $version );
 
-		\wp_enqueue_script( 'gtmkit-' . $script_handle . '-script', $url . 'build/admin/' . $script_handle . '.js', $dependency, $version, true );
+		\wp_enqueue_script( 'gtmkit-' . $script_handle . '-script', $url . 'assets/admin/' . $script_handle . '.js', $dependency, $version, true );
 
 		$this->localize_script( $page_slug, $script_handle );
 	}

diff --git a/src/Admin/SetupWizard.php b/src/Admin/SetupWizard.php
@@ -130,17 +130,17 @@ public function enqueue_assets( string $hook ) {
 			return;
 		}
 
-		$deps_file  = GTMKIT_PATH . 'build/admin/wizard.asset.php';
+		$deps_file  = GTMKIT_PATH . 'assets/admin/wizard.asset.php';
 		$dependency = [];
 		if ( file_exists( $deps_file ) ) {
 			$deps_file  = require $deps_file;
 			$dependency = $deps_file['dependencies'];
 			$version    = $deps_file['version'];
 		}
 
-		wp_enqueue_style( 'gtmkit-wizard-style', GTMKIT_URL . 'build/admin/wizard.css', array( 'wp-components' ), $version );
+		wp_enqueue_style( 'gtmkit-wizard-style', GTMKIT_URL . 'assets/admin/wizard.css', array( 'wp-components' ), $version );
 
-		wp_enqueue_script( 'gtmkit-wizard-script', GTMKIT_URL . 'build/admin/wizard.js', $dependency, $version, true );
+		wp_enqueue_script( 'gtmkit-wizard-script', GTMKIT_URL . 'assets/admin/wizard.js', $dependency, $version, true );
 
 		wp_localize_script(
 			'gtmkit-wizard-script',

diff --git a/src/Common/Util.php b/src/Common/Util.php
@@ -214,7 +214,7 @@ public function get_plugin_version(): string {
 	 */
 	public function enqueue_script( string $handle, string $script ): void {
 
-		$deps_file = GTMKIT_PATH . 'build/' . $script . '.asset.php';
+		$deps_file = GTMKIT_PATH . 'assets/' . $script . '.asset.php';
 
 		$dependency = [];
 		$version    = false;
@@ -225,6 +225,6 @@ public function enqueue_script( string $handle, string $script ): void {
 			$version    = $deps_file['version'];
 		}
 
-		\wp_enqueue_script( $handle, GTMKIT_URL . 'build/' . $script . '.js', $dependency, $version, true );
+		\wp_enqueue_script( $handle, GTMKIT_URL . 'assets/' . $script . '.js', $dependency, $version, true );
 	}
 }
diff --git a/src/Integration/ContactForm7.php b/src/Integration/ContactForm7.php
@@ -61,7 +61,7 @@ public function enqueue_scripts(): void {
 
 		wp_enqueue_script(
 			'gtmkit-cf7',
-			GTMKIT_URL . 'assets/js/contact-form-7.js',
+			GTMKIT_URL . 'assets/integration/contact-form-7.js',
 			[],
 			$this->util->get_plugin_version(),
 			true

diff --git a/src/Integration/EasyDigitalDownloads.php b/src/Integration/EasyDigitalDownloads.php
@@ -83,7 +83,7 @@ public function enqueue_scripts(): void {
 		if ( ! edd_is_checkout() ) {
 			wp_enqueue_script(
 				'gtmkit-edd',
-				GTMKIT_URL . 'assets/js/edd.js',
+				GTMKIT_URL . 'assets/integration/edd.js',
 				[ 'jquery' ],
 				$this->util->get_plugin_version(),
 				true
@@ -93,7 +93,7 @@ public function enqueue_scripts(): void {
 		if ( edd_is_checkout() ) {
 			wp_enqueue_script(
 				'gtmkit-edd-checkout',
-				GTMKIT_URL . 'assets/js/edd-checkout.js',
+				GTMKIT_URL . 'assets/integration/edd-checkout.js',
 				[ 'jquery' ],
 				$this->util->get_plugin_version(),
 				true

diff --git a/src/Integration/WooCommerce.php b/src/Integration/WooCommerce.php
@@ -193,7 +193,7 @@ public function enqueue_scripts(): void {
 
 		wp_enqueue_script(
 			'gtmkit-woocommerce',
-			GTMKIT_URL . 'assets/js/woocommerce.js',
+			GTMKIT_URL . 'assets/integration/woocommerce.js',
 			[],
 			$this->util->get_plugin_version(),
 			true
@@ -218,7 +218,7 @@ public function enqueue_scripts(): void {
 			} else {
 				wp_enqueue_script(
 					'gtmkit-woocommerce-checkout',
-					GTMKIT_URL . 'assets/js/woocommerce-checkout.js',
+					GTMKIT_URL . 'assets/integration/woocommerce-checkout.js',
 					[ 'gtmkit-woocommerce' ],
 					$this->util->get_plugin_version(),
 					true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '77ee83c4ea5024b59278');
		<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => 'ba69da201e2be1442d0d');