From 2358c233716bebab893bfe8034a3e529bc82661f Mon Sep 17 00:00:00 2001
From: mateuswetah <mateus.m.luna@gmail.com>
Date: Thu, 12 Aug 2021 09:23:23 -0300
Subject: [PATCH] Fix: Updates webpack public path based on plugin URL

---
 src/views/class-tainacan-admin.php                            | 1 +
 .../tainacan-blocks/tainacan-blocks-common-theme-scripts.js   | 3 +++
 webpack.common.js                                             | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/class-tainacan-admin.php b/src/views/class-tainacan-admin.php
index 78ad7f0dc..104f472df 100644
--- a/src/views/class-tainacan-admin.php
+++ b/src/views/class-tainacan-admin.php
@@ -285,6 +285,7 @@ class Admin {
 			'user_caps'              	=> $user_caps,
 			'user_prefs'             	=> $prefs,
 			'base_url'               	=> $TAINACAN_BASE_URL,
+			'plugin_dir_url'			=> plugin_dir_url( __DIR__ ),
 			'admin_url'              	=> admin_url(),
 			'theme_items_list_url' 		=> esc_url_raw( get_site_url() ) . '/' . \Tainacan\Theme_Helper::get_instance()->get_items_list_slug(),
 			'theme_collection_list_url' => get_post_type_archive_link( 'tainacan-collection' ),
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/tainacan-blocks-common-theme-scripts.js b/src/views/gutenberg-blocks/tainacan-blocks/tainacan-blocks-common-theme-scripts.js
index 1f8d88fa2..f9b990847 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/tainacan-blocks-common-theme-scripts.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/tainacan-blocks-common-theme-scripts.js
@@ -1,5 +1,8 @@
 import * as conditioner from 'conditioner-core/conditioner-core.esm';
 
+// Updates Webpack public path based on plugin folder URL, using variable obtained from server side.
+__webpack_public_path__ = tainacan_plugin.plugin_dir_url + 'assets/js/';
+
 // Checks if document is loaded
 const performWhenDocumentIsLoaded = callback => {
     if (/comp|inter|loaded/.test(document.readyState))
diff --git a/webpack.common.js b/webpack.common.js
index 6fa49d467..88d4c443c 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -26,7 +26,7 @@ module.exports = {
     },
     output: {
         path: path.resolve(__dirname, './src/assets/js/'),
-        publicPath: './../../../wp-content/plugins/tainacan/assets/js/',
+        publicPath: './wp-content/plugins/tainacan/assets/js/',
         filename: '[name].js'
     },
     module: {
@@ -96,6 +96,6 @@ module.exports = {
         }),
         new MomentLocalesPlugin({
             localesToKeep: ['en', 'en-ca', 'en-nz', 'en-gb', 'es-au', 'es-in', 'pt-br', 'pt', 'es', 'es-us', 'es-do', 'fr', 'fr-ch', 'fr-ca', 'sv'],
-        }),
+        })
     ]
 };
\ No newline at end of file