Skip to content

Commit

Permalink
Merge pull request #1261 from Parsely/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
acicovic authored Dec 20, 2022
2 parents c4f7704 + 9f850d0 commit 9824fa6
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 14 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
run: |
npm ci
npm run build
composer dump-autoload --classmap-authoritative
- name: WordPress Plugin Deploy
uses: 10up/action-wordpress-plugin-deploy@stable
env:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3

- name: Refresh Composer autoload files
run: composer dump-autoload --classmap-authoritative

- name: Use desired version of NodeJS
uses: actions/[email protected]
with:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.6.1](https://github.com/Parsely/wp-parsely/compare/3.6.0...3.6.1) - 2022-12-20

### Fixed

- Revert composer autoloader PR that resulted in fatal errors ([#1259](https://github.com/Parsely/wp-parsely/pull/1259))

## [3.6.0](https://github.com/Parsely/wp-parsely/compare/3.5.2...3.6.0) - 2022-12-20

### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Parse.ly

Stable tag: 3.6.0
Stable tag: 3.6.1
Requires at least: 5.0
Tested up to: 6.1
Requires PHP: 7.1
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
"autoload": {
"classmap": [
"src/"
],
"files": [
"wp-parsely.php"
]
},
"autoload-dev": {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wp-parsely",
"version": "3.6.0",
"version": "3.6.1",
"private": true,
"description": "The Parse.ly plugin facilitates real-time and historical analytics to your content through a platform designed and built for digital publishing.",
"author": "parsely, hbbtstar, jblz, mikeyarce, GaryJ, parsely_mike, pauarge",
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
visitAdminPage,
} from '@wordpress/e2e-test-utils';

export const PLUGIN_VERSION = '3.6.0';
export const PLUGIN_VERSION = '3.6.1';

export const waitForWpAdmin = () => page.waitForSelector( 'body.wp-admin' );

Expand Down
63 changes: 58 additions & 5 deletions wp-parsely.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Plugin Name: Parse.ly
* Plugin URI: https://www.parse.ly/help/integration/wordpress
* Description: This plugin makes it a snap to add Parse.ly tracking code and metadata to your WordPress blog.
* Version: 3.6.0
* Version: 3.6.1
* Author: Parse.ly
* Author URI: https://www.parse.ly
* Text Domain: wp-parsely
Expand Down Expand Up @@ -56,12 +56,28 @@
return;
}

const PARSELY_VERSION = '3.6.0';
const PARSELY_VERSION = '3.6.1';
const PARSELY_FILE = __FILE__;

if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
require_once __DIR__ . '/vendor/autoload.php';
}
require_once __DIR__ . '/src/class-parsely.php';
require_once __DIR__ . '/src/class-scripts.php';
require_once __DIR__ . '/src/class-dashboard-link.php';
require_once __DIR__ . '/src/UI/class-admin-bar.php';
require_once __DIR__ . '/src/UI/class-metadata-renderer.php';
require_once __DIR__ . '/src/Endpoints/class-metadata-endpoint.php';
require_once __DIR__ . '/src/Endpoints/class-graphql-metadata.php';

require_once __DIR__ . '/src/class-metadata.php';
require_once __DIR__ . '/src/Metadata/class-metadata-builder.php';
require_once __DIR__ . '/src/Metadata/class-author-archive-builder.php';
require_once __DIR__ . '/src/Metadata/class-category-builder.php';
require_once __DIR__ . '/src/Metadata/class-date-builder.php';
require_once __DIR__ . '/src/Metadata/class-front-page-builder.php';
require_once __DIR__ . '/src/Metadata/class-page-builder.php';
require_once __DIR__ . '/src/Metadata/class-page-for-posts-builder.php';
require_once __DIR__ . '/src/Metadata/class-paginated-front-page-builder.php';
require_once __DIR__ . '/src/Metadata/class-post-builder.php';
require_once __DIR__ . '/src/Metadata/class-tag-builder.php';

add_action( 'plugins_loaded', __NAMESPACE__ . '\\parsely_initialize_plugin' );
/**
Expand All @@ -86,6 +102,11 @@ function parsely_initialize_plugin(): void {
$metadata_renderer->run();
}

require_once __DIR__ . '/src/UI/class-admin-warning.php';
require_once __DIR__ . '/src/UI/class-plugins-actions.php';
require_once __DIR__ . '/src/UI/class-row-actions.php';
require_once __DIR__ . '/src/UI/class-site-health.php';

add_action( 'admin_init', __NAMESPACE__ . '\\parsely_admin_init_register' );
/**
* Registers the Parse.ly wp-admin warnings, plugin actions and row actions.
Expand All @@ -104,6 +125,9 @@ function parsely_admin_init_register(): void {
$site_health->run();
}

require_once __DIR__ . '/src/UI/class-settings-page.php';
require_once __DIR__ . '/src/UI/class-network-admin-sites-list.php';

add_action( 'init', __NAMESPACE__ . '\\parsely_wp_admin_early_register' );
/**
* Registers the additions the Parse.ly wp-admin settings page and Multisite
Expand All @@ -117,6 +141,23 @@ function parsely_wp_admin_early_register(): void {
$network_admin_sites_list->run();
}

require_once __DIR__ . '/src/RemoteAPI/interface-cache.php';
require_once __DIR__ . '/src/RemoteAPI/interface-proxy.php';
require_once __DIR__ . '/src/RemoteAPI/class-base-proxy.php';
require_once __DIR__ . '/src/RemoteAPI/class-cached-proxy.php';
require_once __DIR__ . '/src/RemoteAPI/class-related-proxy.php';
require_once __DIR__ . '/src/RemoteAPI/class-analytics-posts-proxy.php';
require_once __DIR__ . '/src/RemoteAPI/class-analytics-post-detail-proxy.php';
require_once __DIR__ . '/src/RemoteAPI/class-referrers-post-detail-proxy.php';
require_once __DIR__ . '/src/RemoteAPI/class-wordpress-cache.php';

require_once __DIR__ . '/src/Endpoints/class-base-api-proxy.php';
require_once __DIR__ . '/src/Endpoints/class-related-api-proxy.php';
require_once __DIR__ . '/src/Endpoints/class-analytics-posts-api-proxy.php';
require_once __DIR__ . '/src/Endpoints/class-analytics-post-detail-api-proxy.php';
require_once __DIR__ . '/src/Endpoints/class-referrers-post-detail-api-proxy.php';
require_once __DIR__ . '/src/Endpoints/class-rest-metadata.php';

add_action( 'rest_api_init', __NAMESPACE__ . '\\parsely_rest_api_init' );
/**
* Registers REST Endpoints that act as a proxy to the Parse.ly API.
Expand Down Expand Up @@ -154,6 +195,8 @@ function parsely_rest_api_init(): void {
);
}

require_once __DIR__ . '/src/blocks/recommendations/class-recommendations-block.php';

add_action( 'init', __NAMESPACE__ . '\\init_recommendations_block' );
/**
* Registers the Recommendations Block.
Expand All @@ -163,6 +206,8 @@ function init_recommendations_block(): void {
$recommendations_block->run();
}

require_once __DIR__ . '/src/blocks/content-helper/class-content-helper.php';

add_action( 'enqueue_block_editor_assets', __NAMESPACE__ . '\init_content_helper' );
/**
* Inserts the Content Helper into the WordPress Post Editor.
Expand All @@ -173,6 +218,8 @@ function init_content_helper(): void {
( new Content_Helper() )->run();
}

require_once __DIR__ . '/src/UI/class-recommended-widget.php';

add_action( 'widgets_init', __NAMESPACE__ . '\\parsely_recommended_widget_register' );
/**
* Registers the Parse.ly Recommended widget.
Expand All @@ -181,6 +228,12 @@ function parsely_recommended_widget_register(): void {
register_widget( new Recommended_Widget( $GLOBALS['parsely'] ) );
}

require_once __DIR__ . '/src/Integrations/class-integration.php';
require_once __DIR__ . '/src/Integrations/class-integrations.php';
require_once __DIR__ . '/src/Integrations/class-amp.php';
require_once __DIR__ . '/src/Integrations/class-facebook-instant-articles.php';
require_once __DIR__ . '/src/Integrations/class-google-web-stories.php';

add_action( 'init', __NAMESPACE__ . '\\parsely_integrations' );
/**
* Instantiates Integrations collection and registers built-in integrations.
Expand Down

0 comments on commit 9824fa6

Please sign in to comment.