Skip to content

Commit be3dba3

Browse files
westonruterwestonruter
authored
Merge 67a2f91 into 905ca69 
2 parents 905ca69 + 67a2f91 commit be3dba3

File tree

11 files changed

+930
-345
lines changed

11 files changed

+930
-345
lines changed

‎.phpstorm.meta.php

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,49 @@
77

88
// TODO: I'd like to use AmpWpPlugin::SERVICES directly here but it doesn't seem to work.
99
map( [
10-
'admin.analytics_menu' => \AmpProject\AmpWP\Admin\AnalyticsOptionsSubmenu::class,
11-
'admin.google_fonts' => \AmpProject\AmpWP\Admin\GoogleFonts::class,
12-
'admin.onboarding_menu' => \AmpProject\AmpWP\Admin\OnboardingWizardSubmenu::class,
13-
'admin.onboarding_wizard' => \AmpProject\AmpWP\Admin\OnboardingWizardSubmenuPage::class,
14-
'admin.options_menu' => \AmpProject\AmpWP\Admin\OptionsMenu::class,
15-
'admin.polyfills' => \AmpProject\AmpWP\Admin\Polyfills::class,
16-
'admin.paired_browsing' => \AmpProject\AmpWP\Admin\PairedBrowsing::class,
17-
'admin.validation_counts' => \AmpProject\AmpWP\Admin\ValidationCounts::class,
18-
'admin.plugin_row_meta' => \AmpProject\AmpWP\Admin\PluginRowMeta::class,
19-
'amp_slug_customization_watcher' => \AmpProject\AmpWP\AmpSlugCustomizationWatcher::class,
20-
'css_transient_cache.ajax_handler' => \AmpProject\AmpWP\Admin\ReenableCssTransientCachingAjaxAction::class,
21-
'css_transient_cache.monitor' => \AmpProject\AmpWP\BackgroundTask\MonitorCssTransientCaching::class,
22-
'dev_tools.block_sources' => \AmpProject\AmpWP\DevTools\BlockSources::class,
23-
'dev_tools.callback_reflection' => \AmpProject\AmpWP\DevTools\CallbackReflection::class,
24-
'dev_tools.error_page' => \AmpProject\AmpWP\DevTools\ErrorPage::class,
25-
'dev_tools.file_reflection' => \AmpProject\AmpWP\DevTools\FileReflection::class,
26-
'dev_tools.likely_culprit_detector' => \AmpProject\AmpWP\DevTools\LikelyCulpritDetector::class,
27-
'dev_tools.user_access' => \AmpProject\AmpWP\DevTools\UserAccess::class,
28-
'editor.editor_support' => \AmpProject\AmpWP\Editor\EditorSupport::class,
29-
'extra_theme_and_plugin_headers' => \AmpProject\AmpWP\ExtraThemeAndPluginHeaders::class,
30-
'injector' => \AmpProject\AmpWP\Infrastructure\Injector::class,
31-
'mobile_redirection' => \AmpProject\AmpWP\MobileRedirection::class,
32-
'obsolete_block_attribute_remover' => \AmpProject\AmpWP\ObsoleteBlockAttributeRemover::class,
33-
'optimizer' => \AmpProject\AmpWP\Optimizer\OptimizerService::class,
34-
'plugin_activation_notice' => \AmpProject\AmpWP\Admin\PluginActivationNotice::class,
35-
'plugin_registry' => \AmpProject\AmpWP\PluginRegistry::class,
36-
'plugin_suppression' => \AmpProject\AmpWP\PluginSuppression::class,
37-
'reader_theme_loader' => \AmpProject\AmpWP\ReaderThemeLoader::class,
38-
'rest.options_controller' => \AmpProject\AmpWP\OptionsRESTController::class,
39-
'rest.validation_counts_controller' => \AmpProject\AmpWP\Validation\ValidationCountsRestController::class,
40-
'server_timing' => \AmpProject\AmpWP\Instrumentation\ServerTiming::class,
41-
'site_health_integration' => \AmpProject\AmpWP\Admin\SiteHealth::class,
42-
'validated_url_stylesheet_gc' => \AmpProject\AmpWP\BackgroundTask\ValidatedUrlStylesheetDataGarbageCollection::class,
43-
'url_validation_cron' => \AmpProject\AmpWP\Validation\URLValidationCron::class,
44-
'save_post_validation_event' => \AmpProject\AmpWP\Validation\SavePostValidationEvent::class,
45-
'background_task_deactivator' => \AmpProject\AmpWP\BackgroundTask\BackgroundTaskDeactivator::class,
46-
'paired_routing' => \AmpProject\AmpWP\PairedRouting::class,
47-
'paired_url' => \AmpProject\AmpWP\PairedUrl::class,
10+
'admin.analytics_menu' => \AmpProject\AmpWP\Admin\AnalyticsOptionsSubmenu::class,
11+
'admin.google_fonts' => \AmpProject\AmpWP\Admin\GoogleFonts::class,
12+
'admin.onboarding_menu' => \AmpProject\AmpWP\Admin\OnboardingWizardSubmenu::class,
13+
'admin.onboarding_wizard' => \AmpProject\AmpWP\Admin\OnboardingWizardSubmenuPage::class,
14+
'admin.options_menu' => \AmpProject\AmpWP\Admin\OptionsMenu::class,
15+
'admin.polyfills' => \AmpProject\AmpWP\Admin\Polyfills::class,
16+
'admin.paired_browsing' => \AmpProject\AmpWP\Admin\PairedBrowsing::class,
17+
'admin.validation_counts' => \AmpProject\AmpWP\Admin\ValidationCounts::class,
18+
'admin.plugin_row_meta' => \AmpProject\AmpWP\Admin\PluginRowMeta::class,
19+
'amp_slug_customization_watcher' => \AmpProject\AmpWP\AmpSlugCustomizationWatcher::class,
20+
'cli.command_namespace' => \AmpProject\AmpWP\CliCli\CommandNamespaceRegistration::class,
21+
'cli.optimizer_command' => \AmpProject\AmpWP\CliCli\OptimizerCommand::class,
22+
'cli.transformer_command' => \AmpProject\AmpWP\CliCli\TransformerCommand::class,
23+
'cli.validation_command' => \AmpProject\AmpWP\CliCli\ValidationCommand::class,
24+
'css_transient_cache.ajax_handler' => \AmpProject\AmpWP\Admin\ReenableCssTransientCachingAjaxAction::class,
25+
'css_transient_cache.monitor' => \AmpProject\AmpWP\BackgroundTask\MonitorCssTransientCaching::class,
26+
'dev_tools.block_sources' => \AmpProject\AmpWP\DevTools\BlockSources::class,
27+
'dev_tools.callback_reflection' => \AmpProject\AmpWP\DevTools\CallbackReflection::class,
28+
'dev_tools.error_page' => \AmpProject\AmpWP\DevTools\ErrorPage::class,
29+
'dev_tools.file_reflection' => \AmpProject\AmpWP\DevTools\FileReflection::class,
30+
'dev_tools.likely_culprit_detector' => \AmpProject\AmpWP\DevTools\LikelyCulpritDetector::class,
31+
'dev_tools.user_access' => \AmpProject\AmpWP\DevTools\UserAccess::class,
32+
'editor.editor_support' => \AmpProject\AmpWP\Editor\EditorSupport::class,
33+
'extra_theme_and_plugin_headers' => \AmpProject\AmpWP\ExtraThemeAndPluginHeaders::class,
34+
'injector' => \AmpProject\AmpWP\Infrastructure\Injector::class,
35+
'mobile_redirection' => \AmpProject\AmpWP\MobileRedirection::class,
36+
'obsolete_block_attribute_remover' => \AmpProject\AmpWP\ObsoleteBlockAttributeRemover::class,
37+
'optimizer' => \AmpProject\AmpWP\Optimizer\OptimizerService::class,
38+
'optimizer.hero_candidate_filtering' => \AmpProject\AmpWP\Optimizer\HeroCandidateFiltering::class,
39+
'plugin_activation_notice' => \AmpProject\AmpWP\Admin\PluginActivationNotice::class,
40+
'plugin_registry' => \AmpProject\AmpWP\PluginRegistry::class,
41+
'plugin_suppression' => \AmpProject\AmpWP\PluginSuppression::class,
42+
'reader_theme_loader' => \AmpProject\AmpWP\ReaderThemeLoader::class,
43+
'rest.options_controller' => \AmpProject\AmpWP\OptionsRESTController::class,
44+
'rest.validation_counts_controller' => \AmpProject\AmpWP\Validation\ValidationCountsRestController::class,
45+
'server_timing' => \AmpProject\AmpWP\Instrumentation\ServerTiming::class,
46+
'site_health_integration' => \AmpProject\AmpWP\Admin\SiteHealth::class,
47+
'validated_url_stylesheet_gc' => \AmpProject\AmpWP\BackgroundTask\ValidatedUrlStylesheetDataGarbageCollection::class,
48+
'url_validation_cron' => \AmpProject\AmpWP\Validation\URLValidationCron::class,
49+
'save_post_validation_event' => \AmpProject\AmpWP\Validation\SavePostValidationEvent::class,
50+
'background_task_deactivator' => \AmpProject\AmpWP\BackgroundTask\BackgroundTaskDeactivator::class,
51+
'paired_routing' => \AmpProject\AmpWP\PairedRouting::class,
52+
'paired_url' => \AmpProject\AmpWP\PairedUrl::class,
4853
] )
4954
);
5055

‎Gruntfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ module.exports = function( grunt ) {
3737
'vendor/*/*/*.yml',
3838
'vendor/*/*/.*.yml',
3939
'vendor/*/*/tests',
40-
'vendor/ampproject/amp-toolbox/bin',
40+
'vendor/ampproject/amp-toolbox/.gitattributes',
4141
'vendor/ampproject/amp-toolbox/.phpcs.xml.dist',
42+
'vendor/ampproject/amp-toolbox/bin',
4243
'vendor/ampproject/amp-toolbox/conceptual-diagram.svg',
4344
'vendor/ampproject/amp-toolbox/phpstan.neon.dist',
4445
'vendor/bin',

0 commit comments

Comments
 (0)