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

Fix building assets #1828

Merged
merged 3 commits into from Jan 18, 2019

Conversation

Projects
None yet
3 participants
@westonruter
Copy link
Member

westonruter commented Jan 17, 2019

  • After #1781 there were introduced separate wp-i18n and wp-dom-ready scripts which are polyfills for 5.0. However, the source JS files were placed in the wrong directory so they were getting included in the build. So 645466c moves them to assets/src so that only their Webpack *-compiled.js versions are included in the assets/js for the build.
  • Also after #1781 there was no longer a reason to include amp-validation-tooltips.js in a Webpack build, so cc3929e just moves it from assets/src to assets/js so that it can be loaded directly from source.
  • Lastly, the build was erroneously including assets/src in the build, so a335f91 excludes it.

westonruter added some commits Jan 17, 2019

@westonruter westonruter added this to the v1.0.2 milestone Jan 17, 2019

@googlebot googlebot added the cla: yes label Jan 17, 2019

@westonruter westonruter referenced this pull request Jan 17, 2019

Merged

Release 1.0.2 #1827

4 of 4 tasks complete

@westonruter westonruter requested a review from felixarntz Jan 17, 2019

@amedina amedina requested a review from swissspidy Jan 17, 2019

@westonruter

This comment has been minimized.

Copy link
Member Author

westonruter commented Jan 18, 2019

Here's a build of this branch for testing: amp.zip

@swissspidy
Copy link
Collaborator

swissspidy left a comment

Seems to work fine 👍

@westonruter westonruter merged commit 147d889 into 1.0 Jan 18, 2019

3 checks passed

cla/google All necessary CLAs are signed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@westonruter westonruter deleted the fix/asset-building branch Jan 18, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.