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

Abstracting AMP validators and sanitizers into AMP Library #4

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open

Abstracting AMP validators and sanitizers into AMP Library #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c241ecd
Use composer instead of submodules
marcelovani Nov 29, 2018
82b4767
Deleted folder
marcelovani Nov 29, 2018
e91bc15
Updated folder
marcelovani Nov 29, 2018
599181c
Fixing scripts
marcelovani Nov 29, 2018
807b48f
Speeding up script
marcelovani Nov 29, 2018
60615ff
Run update
marcelovani Nov 29, 2018
e79d8f2
Moved files into amp-sanitizer library
marcelovani Nov 29, 2018
a95b903
Re-instated includes
marcelovani Nov 29, 2018
2346234
Use autoloader
marcelovani Nov 29, 2018
2cc322b
Resolving dependencies
marcelovani Dec 5, 2018
d37e8c3
Reverted commit
marcelovani Dec 5, 2018
17d337c
Updating dependencies
marcelovani Dec 6, 2018
9bca805
Merge branch 'amp-library' of github.com:marcelovani/amp-wp into amp-…
marcelovani Dec 6, 2018
b23559c
Use Lullabot AMP library to convert the page
marcelovani Dec 6, 2018
e2822a0
Require symfony/console
marcelovani Dec 6, 2018
1c43343
Updated packages
marcelovani Dec 6, 2018
20389cc
Upgraded composer
marcelovani Dec 7, 2018
0b20922
Removed composer.lock
marcelovani Dec 7, 2018
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ amp.zip
languages/*.pot
languages/*.php
built
composer.lock

4 changes: 0 additions & 4 deletions .gitmodules
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cache:
install:
- if [[ $DEV_LIB_SKIP =~ composer ]]; then composer install --no-dev; fi
- nvm install 8.11.4 && nvm use 8.11.4
- export DEV_LIB_PATH=dev-lib
- export DEV_LIB_PATH=vendor/xwp/wp-dev-lib
- source $DEV_LIB_PATH/travis.install.sh

script:
Expand Down
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = function( grunt ) {
stderr: true
},
readme: {
command: './dev-lib/generate-markdown-readme' // Generate the readme.md.
command: './vendor/xwp/wp-dev-lib/generate-markdown-readme' // Generate the readme.md.
},
Copy link
Owner Author

Choose a reason for hiding this comment

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

The submodule is now pulled via composer and goes to the vendor folder

phpunit: {
command: 'phpunit'
Expand Down Expand Up @@ -113,7 +113,7 @@ module.exports = function( grunt ) {
versionAppend = new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' ) + '-' + commitHash;

paths = lsOutput.trim().split( /\n/ ).filter( function( file ) {
return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|dev-lib|readme\.md|composer\..*|webpack.*|languages\/README.*)/.test( file );
return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|readme\.md|composer\..*|webpack.*|languages\/README.*)/.test( file );
} );
paths.push( 'vendor/autoload.php' );
paths.push( 'assets/js/*-compiled.js' );
Expand Down
Loading