Use external amp-toolbox library instead of lib/ subfolder #5582
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
schlessera
added
Infrastructure
|
Plugin builds for c0d83e6 are ready 🛎️!
|
|
@schlessera one more change to be made: diff --git a/docs/src/Cli/GenerateCommand.php b/docs/src/Cli/GenerateCommand.php
--- a/docs/src/Cli/GenerateCommand.php (revision c0c7c7245f3f547d42a9675cb3cebfe22cf1aa29)
+++ b/docs/src/Cli/GenerateCommand.php (date 1604685464461)
@@ -246,7 +246,6 @@
private function get_excluded_dirs() {
return [
'#^.*/amp/(assets|bin|build|docs|node_modules|tests|vendor)/*#',
- '#^.*/amp/lib/(common|optimizer)/*#',
];
}
|
pierlon
suggested changes
Nov 6, 2020
There was a problem hiding this comment.
A few places where ampproject/optimizer is still in use:
amp-wp/includes/deprecated.php
Line 213 in f972507
schlessera
force-pushed
the
add/4567-use-external-amp-toolbox-library
branch
from
02183ca
to
1e487ef
Compare
Co-authored-by: Pierre Gordon <[email protected]>
|
Changes look OK. I'm rebasing the PR since there's a merge conflict with the |
|
Also updating the patch to allow for the PHP 8 job to run since it's outdated. |
pierlon
force-pushed
the
add/4567-use-external-amp-toolbox-library
branch
from
78d5d9f
to
c0d83e6
Compare
pierlon
approved these changes
Nov 10, 2020
westonruter
approved these changes
Nov 10, 2020
Comment on lines
51
to
+52
| diff --git a/composer.json b/composer.json | ||
| index 4d24ebd44..2a98f63ce 100644 | ||
| index 5a150f830..f670267f8 100644 |
There was a problem hiding this comment.
Aside: do we even need this context? It will get out of date often.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR removes the
lib/subfolder and adapts the Composer file and the build instructions to use the externalampproject/amp-toolbox-phplibrary instead.This PR does not add namespace scoping to the library, assuming that any other WordPress plugin/theme should rely on the plugin's presence if they need access to the library => TBD!
Fixes #4567
Checklist