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.

Sign up for GitHub

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

Update means of determining bento support for component #6373

Merged
merged 5 commits into from
Jun 16, 2021
Merged

Update means of determining bento support for component #6373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7399c5e
Update means of determining bento support for component
westonruter Jun 11, 2021
17302f6
Regenerate spec after wrapper:bento prop added
westonruter Jun 11, 2021
d7c2d99
Omit bento for components whose versions are not yet valid
westonruter Jun 11, 2021
835a217
Update spec to include https://github.com/ampproject/amphtml/pull/34769
westonruter Jun 16, 2021
0b72eef
Omit Bento from components when version is not valid
westonruter Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions bin/amphtml-update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ def ParseRules(repo_directory, out_dir):
if extension_versions[ extension['name'] ]['latest'] is not None and extension_versions[ extension['name'] ]['latest'] != extension['latestVersion']:
logging.info('Warning: latestVersion mismatch for ' + extension['name'])
extension_versions[ extension['name'] ]['latest'] = extension['latestVersion']
if 'options' in extension and 'npm' in extension['options'] and extension['options']['npm'] == True:
if 'options' in extension and 'wrapper' in extension['options'] and extension['options']['wrapper'] == 'bento':
extension_versions[ extension['name'] ]['bento'] = {
'version': extension['version'],
'has_css': extension['options'].get( 'hasCss', False ),
Expand All @@ -434,10 +434,14 @@ def ParseRules(repo_directory, out_dir):
if not validator_versions.issubset( bundle_versions ):
logging.info( 'Validator versions are not a subset of bundle versions: ' + extension_name )

if 'bento' in extension_versions[extension_name] and extension_versions[extension_name]['bento']['version'] not in validator_versions:
logging.info( 'Skipping bento for ' + extension_name + ' since version ' + extension_versions[extension_name]['bento']['version'] + ' is not yet valid' )
del extension_versions[extension_name]['bento']

validator_versions = sorted( validator_versions, key=lambda version: map(int, version.split('.') ) )
extension_script_list[0]['tag_spec']['extension_spec']['version'] = validator_versions

if 'bento' in extension_versions[extension_name]:
if 'bento' in extension_versions[extension_name] and extension_versions[extension_name]['bento']['version'] in validator_versions:
extension_script_list[0]['tag_spec']['extension_spec']['bento'] = extension_versions[extension_name]['bento']

extension_script_list[0]['tag_spec']['extension_spec']['latest'] = extension_versions[extension_name]['latest']
Expand Down
6 changes: 5 additions & 1 deletion includes/sanitizers/class-amp-allowed-tags-generated.php
View file
Open in desktop

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