Skip to content
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.

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

Merge trunk into feature/image-loading-optimization #1063

Conversation

westonruter
Copy link
Member

@westonruter westonruter commented Mar 19, 2024

Note that this fixes merge conflicts. Pay special attention to changes in these files:

        both modified:   .github/CODEOWNERS
        both modified:   .github/workflows/deploy-dotorg.yml
        both modified:   .github/workflows/deploy-standalone-plugins.yml
        deleted by them: .github/workflows/php-test-standalone-plugins.yml
        both modified:   .wp-env.json
        both modified:   composer.json
        both modified:   load.php
        both modified:   package-lock.json
        both modified:   package.json
        both modified:   phpunit.xml.dist
        both modified:   plugins.json
        both modified:   tests/plugins/speculation-rules/speculation-rules-test.php
        both added:      webpack.config.js

Diff with trunk: trunk...merge/trunk-into-image-loading-optimization

adamsilverstein and others added 30 commits November 22, 2023 08:30
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
Co-authored-by: Weston Ruter <westonruter@google.com>
felixarntz and others added 15 commits March 21, 2024 09:42
…ludes

Move `admin` to `includes` directory
Bump minimum required WP version to 6.4
Fix standalone plugin versions and changelogs

Co-authored-by: felixarntz <flixos90@git.wordpress.org>
Co-authored-by: thelovekesh <thelovekesh@git.wordpress.org>
Co-authored-by: westonruter <westonruter@git.wordpress.org>
… merge/trunk-into-image-loading-optimization

* 'trunk' of https://github.com/WordPress/performance:
  Bump Embed Optimizer required WP version to 6.4.
  Fix other standalone plugin versions with 6.4 bump.
  Fix Speculation Rules version and changelog.
westonruter and others added 4 commits March 21, 2024 11:40
Remove workflow to test standalone plugins built from modules as no longer relevant

Co-authored-by: felixarntz <flixos90@git.wordpress.org>
Co-authored-by: thelovekesh <thelovekesh@git.wordpress.org>
Co-authored-by: westonruter <westonruter@git.wordpress.org>
Support changing autoload value for largest autoloaded options in Site Health check

Co-authored-by: mukeshpanchal27 <mukesh27@git.wordpress.org>
Co-authored-by: westonruter <westonruter@git.wordpress.org>
Co-authored-by: felixarntz <flixos90@git.wordpress.org>
Co-authored-by: swissspidy <swissspidy@git.wordpress.org>
… merge/trunk-into-image-loading-optimization

* 'trunk' of https://github.com/WordPress/performance:
  Remove workflow to test standalone plugins built from modules as no longer relevant.
  Remove WP 6.3 from workflow
  Add unit test
  Apply suggestions from code review
  Update approach for modified option
  Change update option logic
  Minor adjustments
  Update parameter name
  Fix lint
  Apply suggestions from code review
  Use action URL approach
  Use button instead a tag
  Ensure function returns string
  Address review feedbacks
  Update since
  POC
@westonruter
Copy link
Member Author

@westonruter Is this urgent? Otherwise I'd suggest to wait until you can include #1060 in this as well.

@felixarntz Now up to date with trunk as of this moment with the many PRs that were just merged.

Copy link
Member

@felixarntz felixarntz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@westonruter With all the merge conflicts, this is difficult to review.

Looking at trunk...merge/trunk-into-image-loading-optimization, I am especially curious about whether the build process is handled efficiently here and whether it needs to run in all the instances where it appears to be run in the feature branch (as far as I know, only optimization-detective requires a build process at this point because of web-vitals).

I'm not opposed to blindly approving this to unblock the work, but I would probably raise the same question once an actual PR from the feature branch to trunk would exist, so doesn't hurt figuring this out already :)

@westonruter
Copy link
Member Author

@felixarntz yes, it is difficult to review.

Looking at trunk...merge/trunk-into-image-loading-optimization, I am especially curious about whether the build process is handled efficiently here and whether it needs to run in all the instances where it appears to be run in the feature branch (as far as I know, only optimization-detective requires a build process at this point because of web-vitals).

Of the 4 instances, and @thelovekesh would be best to speak to this, it could possibly be omitted from:

- name: Build assets
run: npm run build

and

- name: Build assets
run: npm run build

Since the Performance Lab plugin doesn't currently require assets to be built.

But it would definitely need to be present in the two other locations, since it is specifically for the standalone plugins, including Optimization Detective and (soon Web Worker Offloading):

- name: Build assets
run: npm run build

and

- name: Build assets
run: npm run build

Maybe we merge this now and then get confirmation when merging into trunk?

Copy link
Member

@felixarntz felixarntz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving to unblock this. Let's make sure to iron out the workflow changes before trunk merge though. This kind of change that affects all other plugins too needs to be carefully evaluated.

@westonruter westonruter merged commit 0f5f68d into feature/image-loading-optimization Mar 21, 2024
28 checks passed
@westonruter westonruter deleted the merge/trunk-into-image-loading-optimization branch March 21, 2024 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no milestone PRs that do not have a defined milestone for release [Plugin] Optimization Detective Issues for the Optimization Detective plugin [Type] Enhancement A suggestion for improvement of an existing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants