Skip to content

Update Jetpack to use new JITM package #12516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roccotripaldi merged 21 commits into from
Jun 5, 2019
Merged

Update Jetpack to use new JITM package #12516

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
92a6c62
Update Jetpack to use new JITM package
gititon May 30, 2019
28f64e5
Adding use statement to avoid using full namespace inline
gititon May 31, 2019
23dfaa2
Remove errant debug statement
gititon May 31, 2019
a2aa79e
Updating readme file
gititon May 31, 2019
98f1a94
Updating readme file
gititon May 31, 2019
85c447e
Using filter instead of explicit Jetpack checks to disable
gititon May 31, 2019
df76ce4
Ensuring instance uses correct class
gititon Jun 3, 2019
8d650a4
Fixed bad rebase, restored changes manually
gititon Jun 4, 2019
2da6592
Adding use statement
gititon Jun 4, 2019
d3cb58b
Fixing reference to connection manager
gititon Jun 4, 2019
374d5dd
Ensuring proper use of logo package
gititon Jun 4, 2019
b27b37b
Incorporating new asset manager dependency
gititon Jun 4, 2019
aa48ab8
Assets package uses constants package
gititon Jun 4, 2019
2cd9994
get tests to run
gititon Jun 5, 2019
9b10552
dependencies
gititon Jun 5, 2019
e61a620
Trying to retrigger Travis CI tests
gititon Jun 5, 2019
edfd75c
Removing unnecessary .gitignore
gititon Jun 5, 2019
7ba6df4
Changing all Automattic packages to @dev in composer.json
gititon Jun 5, 2019
b333b4b
Changing assets package to asset-tools to avoid conflict with logo pa…
gititon Jun 5, 2019
c107095
adding composer.lock file
roccotripaldi Jun 5, 2019
014609b
removing a require
roccotripaldi Jun 5, 2019
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
Prev Previous commit
Next Next commit
Incorporating new asset manager dependency
  • Loading branch information
@gititon @roccotripaldi
gititon authored and roccotripaldi committed Jun 5, 2019
commit b27b37b0868bd8b88c7eb17f4eb1e37936f3b1a3
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"automattic/jetpack-options": "@dev",
"automattic/jetpack-logo": "@dev",
"automattic/jetpack-constants": "@dev",
"automattic/jetpack-jitm": "@dev"
"automattic/jetpack-jitm": "@dev",
"automattic/jetpack-assets": "@dev"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "0.5.0",
Expand Down
1 change: 1 addition & 0 deletions packages/jitm/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"type": "library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-assets": "@dev",
"automattic/jetpack-connection": "^1.0",
"automattic/jetpack-logo": "@dev"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/jitm/src/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Automattic\Jetpack\JITM;

use Automattic\Jetpack\Assets as Asset_Manager;
use Automattic\Jetpack\Assets\Manager as Asset_Manager;
use Automattic\Jetpack\Connection\Manager as Jetpack_Connection;
use Automattic\Jetpack\Logo as Jetpack_Logo;

Expand Down Expand Up @@ -53,6 +53,7 @@ public function __construct() {
if ( ! $jetpack_connection->is_active() || $jetpack_connection->is_development_mode() ) {
return;
}

add_action( 'current_screen', array( $this, 'prepare_jitms' ) );
}

Expand Down