Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:ampproject/amp-wp into update/am…
Browse files Browse the repository at this point in the history
…p-bind-syntax

* 'develop' of github.com:ampproject/amp-wp:
  RTLCSS all the things (#2977)
  Fix AMP Story editor compatibility with code editor (#3007)
  Update dependency core-js to v3.2.1 (#3011)
  Update amphtml validator spec to v1907301630320 (#3003)
  Improve handling of unlisted Vimeo videos (#2986)
  Always hide AMP admin menu item and compatibility tool menu ite… (#3005)
  Update dependency dom-scroll-into-view to v2.0.1 (#3008)
  Hide tooltips that should be hidden (#2988)
  • Loading branch information
westonruter committed Aug 12, 2019
2 parents 267abc2 + 253e08e commit 94e3f33
Show file tree
Hide file tree
Showing 48 changed files with 360 additions and 1,338 deletions.
5 changes: 2 additions & 3 deletions .gitignore
Expand Up @@ -4,9 +4,8 @@
node_modules
wiki
amp.zip
assets/css/*-compiled.css
assets/css/*-compiled-rtl.css
assets/css/*.map
/assets/css/*
!/assets/css/src/
assets/js/*.js
assets/js/*.deps.json
!assets/js/amp-service-worker-runtime-precaching.js
Expand Down
13 changes: 13 additions & 0 deletions .rtlcssrc
@@ -0,0 +1,13 @@
{
"options": {
"autoRename": false,
"autoRenameStrict": false,
"blacklist":{},
"clean": true,
"greedy": false,
"processUrls": false,
"stringMap":[]
},
"plugins": [ ],
"map": false
}
6 changes: 2 additions & 4 deletions .stylelintignore
@@ -1,4 +1,2 @@
assets/css/admin-bar.css
assets/css/admin-bar-rtl.css
assets/css/*-compiled.css
assets/css/*-compiled-rtl.css
assets/css/src/admin-bar.css
assets/css/*.css
12 changes: 8 additions & 4 deletions .travis.yml
Expand Up @@ -46,6 +46,7 @@ before_script:

script:
- npm run build:js
- npm run build:css
- source "$DEV_LIB_PATH/travis.script.sh"
- |
if [[ ! -z "$PHPUNIT_EXTRA_GROUP" ]]; then
Expand Down Expand Up @@ -93,8 +94,9 @@ jobs:
- composer install
# npm is handled by `npm run env:start`
script:
- npm run env:start
- npm run build:js # after npm dependencies have been installed
- npm run env:start # also install npm dependencies
- npm run build:js
- npm run build:css
- npm run env:reset-site
- npm run test:e2e:ci
- npm run env:stop
Expand All @@ -107,8 +109,9 @@ jobs:
- composer install
# npm is handled by `npm run env:start`
script:
- npm run env:start
- npm run build:js # after npm dependencies have been installed
- npm run env:start # also install npm dependencies
- npm run build:js
- npm run build:css
- npm run env:reset-site
- npm run test:e2e:ci
- npm run env:stop
Expand Down Expand Up @@ -157,6 +160,7 @@ jobs:
- echo "Running unit tests with code coverage..."
script:
- npm run build:js
- npm run build:css
- source "$DEV_LIB_PATH/travis.script.sh"
- bash <(curl -s https://codecov.io/bash) -cF php -f /tmp/wordpress/src/wp-content/plugins/amp/build/logs/clover.xml
- npm run test:js -- --collectCoverage
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Expand Up @@ -87,7 +87,7 @@ module.exports = function( grunt ) {
const versionAppend = new Date().toISOString().replace( /\.\d+/, '' ).replace( /-|:/g, '' ) + '-' + commitHash;

const paths = lsOutput.trim().split( /\n/ ).filter( function( file ) {
return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|readme\.md|composer\..*|patches|webpack.*|assets\/src|docker-compose\.yml|.*\.config\.js|codecov\.yml)/.test( file );
return ! /^(blocks|\.|bin|([^/]+)+\.(md|json|xml)|Gruntfile\.js|tests|wp-assets|readme\.md|composer\..*|patches|webpack.*|assets\/src|assets\/css\/src|docker-compose\.yml|.*\.config\.js|codecov\.yml)/.test( file );
} );

paths.push( 'vendor/autoload.php' );
Expand Down

0 comments on commit 94e3f33

Please sign in to comment.