Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 17 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"name": "tribe-common",
"version": "5.2.5",
"version": "5.3.0",
"repository": "git@github.com:the-events-calendar/tribe-common.git",
"_resourcepath": "src/resources",
"_domainPath": "lang",
"_textDomain": "tribe-common",
"_glotPressUrl": "https://translations.theeventscalendar.com",
"_glotPressSlug": "tribe-common",
"_glotPressFileFormat": "%textdomain%-%wp_locale%.%format%",
"_glotPressFormats": ["po", "mo"],
"_glotPressFormats": [
"po",
"mo"
],
"_glotPressFilter": {
"translation_sets": false,
"minimum_percentage": 30,
Expand All @@ -31,9 +34,14 @@
"!src/resources/postcss/datepicker.pcss",
"!src/resources/postcss/tribe-ui.pcss"
],
"jest": ["src/modules/**/__tests__/**/*.js"]
"jest": [
"src/modules/**/__tests__/**/*.js"
]
},
"engines": {
"node": "18.13.0",
"npm": "8.19.3"
},
"engines": { "node": "18.13.0", "npm": "8.19.3" },
"scripts": {
"analyze": "webpack-bundle-analyzer -m static stats.json",
"bootstrap": "./scripts/linkDependencies",
Expand Down Expand Up @@ -106,7 +114,11 @@
"webpack-cli": "^3.1.2",
"webpack-merge": "^4.1.4"
},
"overrides": { "babel-plugin-lodash": { "@babel/types": "~7.20.0" } },
"overrides": {
"babel-plugin-lodash": {
"@babel/types": "~7.20.0"
}
},
"browserslist": [
"last 2 Chrome versions",
"last 2 Firefox versions",
Expand Down
2 changes: 0 additions & 2 deletions src/Common/Contracts/Provider/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
namespace TEC\Common\Contracts\Provider;

use TEC\Common\Contracts\Service_Provider;
use TEC\Common\StellarWP\ContainerContract\ContainerInterface;
use Tribe__Log as Log;

/**
Expand All @@ -21,7 +20,6 @@
*
* @package TEC\Common\Provider;
*
* @property ContainerInterface $container
*/
abstract class Controller extends Service_Provider {
/**
Expand Down
9 changes: 9 additions & 0 deletions src/Tribe/Assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,10 @@ public function enqueue( $forcibly_enqueue = null ) {
}

foreach ( $assets as $asset ) {
if ( $asset->already_enqueued ) {
continue;
}

// Should this asset be enqueued regardless of the current filter/any conditional requirements?
$must_enqueue = in_array( $asset->slug, $forcibly_enqueue );
$in_filter = in_array( current_filter(), (array) $asset->action );
Expand Down Expand Up @@ -754,6 +758,11 @@ public function register( $origin, $slug, $file, $deps = [], $action = null, $ar
// Set the Asset on the array of notices.
$this->assets[ $slug ] = $asset;

// If we are already on the init action we register the asset.
if ( did_action( 'init' ) ) {
$this->register_in_wp( $asset );
}

// Return the Slug because it might be modified.
return $asset;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Tribe/Main.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Tribe__Main {
const OPTIONNAME = 'tribe_events_calendar_options';
const OPTIONNAMENETWORK = 'tribe_events_calendar_network_options';
const FEED_URL = 'https://theeventscalendar.com/feed/';
const VERSION = '5.2.5';
const VERSION = '5.3.0';

protected $plugin_context;
protected $plugin_context_class;
Expand Down
2 changes: 1 addition & 1 deletion src/resources/postcss/utilities
2 changes: 1 addition & 1 deletion tribe-common.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: Tribe Common
* Description: An event settings framework for managing shared options
* Version: 5.2.5
* Version: 5.3.0
* Author: The Events Calendar
* Author URI: http://evnt.is/1x
* Text Domain: tribe-common
Expand Down