Merge branch 'bucket/plugin-consolidation' of github.com:the-events-c…

…alendar/tribe-common into fix/PHPCS-Errors # Conflicts: # src/admin-views/dashboard/components/missing-dependency.php # src/admin-views/notices/tribe-stellar-sale.php # src/admin-views/zapier/dashboard/components/missing-dependency.php
the-events-calendar · Jun 26, 2024 · 73d2488 · 73d2488
2 parents 8d53727 + 548ae6c
commit 73d2488
Show file tree

Hide file tree

Showing 24 changed files with 677 additions and 879 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,5 +46,8 @@ src/resources/js/**/*.min.js
 lang/*.po
 lang/*.mo
 
+# Local packaging files
+.pup-*
+
 # Strauss
 bin/strauss.phar
diff --git a/.puprc b/.puprc
@@ -0,0 +1,61 @@
+{
+	"build": [
+		"echo 'building Tribe Common in: '$(pwd)",
+		"rm -rf vendor",
+		"git checkout -- vendor",
+		"composer install --no-dev",
+		"npm ci",
+		"npm run build"
+	],
+	"build_dev": [
+		"echo 'building Tribe Common in: '$(pwd)",
+		"rm -rf vendor",
+		"git checkout -- vendor",
+		"composer install",
+		"npm ci",
+		"npm run build"
+	],
+	"checks": {
+		"tbd": {
+			"dirs": [ "src" ]
+		},
+		"version-conflict": {}
+	},
+	"i18n": [
+		{
+			"textdomain": "tribe-common",
+			"url": "https://translations.theeventscalendar.com",
+			"slug": "tribe-common"
+		}
+	],
+	"paths": {
+		"changelog": "readme.txt",
+		"css": [
+			"src/resources/postcss"
+		],
+		"js": [
+			"src/resources/js",
+			"src/modules"
+		],
+		"sync_files": [
+			".distfiles",
+			".gitattributes"
+		],
+		"versions": [
+			{
+				"file": "src/Tribe/Main.php",
+				"regex": "(const VERSION += ')([^']+)"
+			},
+			{
+				"file": "tribe-common.php",
+				"regex": "(Version: )(.+)"
+			},
+			{
+				"file": "package.json",
+				"regex": "(\"version\": ?\")([^\"]+)"
+			}
+		],
+		"views": [ "src/views" ]
+	},
+	"zip_name": "tribe-common"
+}
diff --git a/composer.json b/composer.json
@@ -22,15 +22,16 @@
   },
   "require": {
     "firebase/php-jwt": "~6.3.0",
-    "lucatume/di52": "^3.3.4",
+    "lucatume/di52": "^3.3.7",
     "monolog/monolog": "1.24.*",
     "psr/container": "^1.0.0",
     "stellarwp/container-contract": "^1.0.4",
     "stellarwp/db": "^1.0.3",
     "stellarwp/installer": "^1.1.0",
     "stellarwp/models": "dev-main",
     "stellarwp/schema": "^1.1.3",
-    "stellarwp/telemetry": "^2.3.1"
+    "stellarwp/telemetry": "^2.3.1",
+    "stellarwp/assets": "^1.2.6"
   },
   "require-dev": {
     "automattic/vipwpcs": "^3.0",
@@ -87,7 +88,8 @@
         "lucatume/di52",
         "monolog/monolog",
         "firebase/php-jwt",
-        "psr/container"
+        "psr/container",
+        "stellarwp/assets"
       ],
       "exclude_from_prefix": {
         "file_patterns": []

diff --git a/composer.lock b/composer.lock
diff --git a/lang/tribe-common.pot b/lang/tribe-common.pot
@@ -2,15 +2,15 @@
 # This file is distributed under the GPLv2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Tribe Common 5.2.7\n"
+"Project-Id-Version: Tribe Common 5.3.0\n"
 "Report-Msgid-Bugs-To: https://evnt.is/191x\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-05-13T09:38:31-07:00\n"
-"PO-Revision-Date: 2024-05-13 16:38\n"
+"POT-Creation-Date: 2024-06-07T11:39:23-07:00\n"
+"PO-Revision-Date: 2024-06-07 18:39\n"
 "X-Generator: WP-CLI 2.7.1\n"
 "X-Domain: tribe-common\n"
 
@@ -500,13 +500,13 @@ msgstr ""
 #: src/admin-views/notices/tribe-bf-general.php:25
 #: src/admin-views/notices/tribe-stellar-sale-premium.php:24
 #: src/admin-views/notices/tribe-stellar-sale-premium.php:38
-#: src/admin-views/notices/tribe-stellar-sale.php:24
-#: src/admin-views/notices/tribe-stellar-sale.php:38
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:61
 msgctxt "Shop now link text"
 msgid "Shop now"
 msgstr ""
 
 #: src/admin-views/notices/tribe-stellar-sale-premium.php:16
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:80
 msgid "Make it stellar."
 msgstr ""
 
@@ -515,24 +515,15 @@ msgid "Save 30% on all StellarWP products."
 msgstr ""
 
 #: src/admin-views/notices/tribe-stellar-sale-premium.php:32
-#: src/admin-views/notices/tribe-stellar-sale.php:32
 msgid "Purchase any StellarWP product during the sale and get <b>100%</b> off WP Business Reviews and take <b>40%</b> off all other brands."
 msgstr ""
 
 #: src/admin-views/notices/tribe-stellar-sale-premium.php:46
-#: src/admin-views/notices/tribe-stellar-sale.php:46
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:63
 msgctxt "View all StellarWP Deals link text"
 msgid "View all StellarWP Deals"
 msgstr ""
 
-#: src/admin-views/notices/tribe-stellar-sale.php:16
-msgid "Make it yours."
-msgstr ""
-
-#: src/admin-views/notices/tribe-stellar-sale.php:19
-msgid "Save 30% on all The Events Calendar products."
-msgstr ""
-
 #: src/admin-views/notices/upsell/icon.php:19
 msgid "The Events Calendar important notice icon"
 msgstr ""
@@ -1275,6 +1266,42 @@ msgstr ""
 msgid "This extension allows you to add custom HTML content to the top of the Community Events submission form."
 msgstr ""
 
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:58
+msgid "Make it yours."
+msgstr ""
+
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:59
+msgid "Save 40% on all The Events Calendar products."
+msgstr ""
+
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:60
+msgid "Take <b>40%</b> off all premium The Events Calendar products during the annual Stellar Sale. Now through July 30."
+msgstr ""
+
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:74
+msgid "Save 40% on Filter Bar."
+msgstr ""
+
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:75
+msgid "Add filters to your calendar during the annual Stellar Sale. Now through July 30."
+msgstr ""
+
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:77
+msgid "Save 40% on The Events Calendar Bundles."
+msgstr ""
+
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:78
+msgid "Take <b>40%</b> off when you upgrade to a bundle during the annual Stellar Sale. Now through July 30."
+msgstr ""
+
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:81
+msgid "Save 40% on all StellarWP products."
+msgstr ""
+
+#: src/Tribe/Admin/Notice/Marketing/Stellar_Sale.php:82
+msgid "Take <b>40%</b> off all brands during the annual Stellar Sale. Now through July 30."
+msgstr ""
+
 #: src/Tribe/Admin/Notice/Php_Version.php:59
 #: src/Tribe/Admin/Notice/Plugin_Download.php:147
 msgctxt "separator used in a list of items"

diff --git a/package-lock.json b/package-lock.json
diff --git a/readme.txt b/readme.txt
@@ -1,12 +1,41 @@
 == Changelog ==
 
-= [TBD] TBD =
+= [6.0.0] TBD =
 
 * Fix - Fixed an issue where admin transient notices with the dismiss flag not persisting passed the first page load. [ECP-1808]
 * Fix - The Decorated repository was not returning values from `save()` and other methods. Now they return as expected. [BTRIA-2310]
 * Fix - Resolved an issue where transient notices would disappear given a certain order of operations. [ECP-1804]
 * Tweak - Added a new action hook `tec_event_automator_zapier_provider_registered` to fire after the Zapier service has successfully registered. [EVA-159]
 
+= [5.3.0.4] 2024-06-18 =
+
+* Fix - In installations where the plugins or wp-content directories were symbolic linked, assets would fail to be located. [TECTRIA-91]
+* Language - 0 new strings added, 0 updated, 0 fuzzied, and 0 obsoleted
+
+= [5.3.0.3] 2024-06-14 =
+
+* Fix - Issue where scripts would not be enqueued as modules. [TECTRIA-86]
+* Language - 0 new strings added, 0 updated, 1 fuzzied, and 0 obsoleted
+
+= [5.3.0.2] 2024-06-14 =
+
+* Fix - Windows Server compatibility issues with updated Assets handling. [TECTRIA-83]
+* Language - 0 new strings added, 0 updated, 1 fuzzied, and 0 obsoleted
+
+= [5.3.0.1] 2024-06-13 =
+
+* Fix - Issue on which some assets (css,js) would not be located in WP installs which could have some WP constant modified (WP_CONTENT_DIR, WP_PLUGIN_DIR)[TECTRIA-83]
+* Language - 0 new strings added, 0 updated, 1 fuzzied, and 0 obsoleted
+
+= [5.3.0] 2024-06-11 =
+
+* Feature - Refactor tribe_asset to use Stellar Assets. [TCMN-172]
+* Tweak - Remove ini_check for deprecated safe_mode. [TBD]
+* Tweak - Added information about upcoming promotion. [ET-2113]
+* Tweak - Added filters: `tribe_asset_enqueue_{$asset->get_slug()}`
+* Tweak - Removed filters: `tribe_asset_enqueue_{$asset->slug}`, `tribe_asset_pre_register`
+* Language: 7 new strings added, 5 updated, 2 fuzzied, and 0 obsoleted
+
 = [5.2.7] 2024-05-14 =
 
 * Fix - Add dir/filename of `event-automator` in the Plugins_API to fix CTA button text/links in the Help section. [TEC-5071]

diff --git a/src/Common/Event_Automator/Integrations/Assets.php b/src/Common/Event_Automator/Integrations/Assets.php
@@ -28,7 +28,7 @@ public function register_admin_assets() {
 			\Tribe__Main::instance(),
 			'tec-event-automator-js',
 			'tec-event-automator.js',
-			[ 'jquery' ],
+			[ 'jquery', 'tribe-dropdowns', 'tribe-clipboard' ],
 			'admin_enqueue_scripts',
 			[
 				'conditionals' => [

diff --git a/src/Common/Event_Automator/Plugin.php b/src/Common/Event_Automator/Plugin.php
@@ -84,6 +84,22 @@ class Plugin extends \tad_DI52_ServiceProvider {
 	 */
 	protected $container;
 
+	/**
+	 * Plugin constructor.
+	 *
+	 * @since TBD
+	 *
+	 * @param \tad_DI52_Container $container The container to use.
+	 */
+	public function __construct( \tad_DI52_Container $container ) {
+		$this->container = $container;
+
+		// Set up the plugin provider properties.
+		$this->plugin_path = trailingslashit( Tribe__Main::instance()->plugin_path );
+		$this->plugin_dir  = trailingslashit( basename( $this->plugin_path ) );
+		$this->plugin_url  = plugins_url( $this->plugin_dir, $this->plugin_path );
+	}
+
 	/**
 	 * Sets the container for the class.
 	 *
@@ -124,11 +140,6 @@ public function boot( $container = null ): void {
 	 * This always executes even if the required plugins are not present.
 	 */
 	public function register() {
-		// Set up the plugin provider properties.
-		$this->plugin_path = trailingslashit( Tribe__Main::instance()->plugin_path );
-		$this->plugin_dir  = trailingslashit( basename( $this->plugin_path ) );
-		$this->plugin_url  = plugins_url( $this->plugin_dir, $this->plugin_path );
-
 		// Register this provider as the main one and use a bunch of aliases.
 		$this->container->singleton( static::class, $this );
 		$this->container->singleton( 'event-automator', $this );

diff --git a/src/Common/Event_Automator/Zapier/Assets.php b/src/Common/Event_Automator/Zapier/Assets.php
@@ -28,7 +28,7 @@ public function register_admin_assets() {
 			\Tribe__Main::instance(),
 			'tec-event-automator-js',
 			'tec-event-automator.js',
-			[ 'jquery' ],
+			[ 'jquery', 'tribe-dropdowns', 'tribe-clipboard' ],
 			'admin_enqueue_scripts',
 			[
 				'conditionals' => [