Skip to content

Update dependencies from develop #6954

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

Merged
merged 2 commits into from
Mar 3, 2022
Merged

Update dependencies from develop #6954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cbd4e3
Upgrade php-css-parser to v8.4.0 (#6800)
westonruter Mar 3, 2022
36f8dac
Update dependencies from develop
westonruter Mar 3, 2022
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
60 changes: 16 additions & 44 deletions .github/workflows/build-test-measure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ jobs:

FILE_COUNT=$(php -f bin/determine-modified-files-count.php "$IGNORE_PATH_REGEX" "$MODIFIED_FILES" --invert)
PHP_FILE_COUNT=$(php -f bin/determine-modified-files-count.php ".+\.php|composer\.(json|lock)|phpstan\.neon\.dist" "$MODIFIED_FILES")
CSS_FILE_COUNT=$(php -f bin/determine-modified-files-count.php ".+\.s?css" "$MODIFIED_FILES")
JS_FILE_COUNT=$(php -f bin/determine-modified-files-count.php "(.+\.(js|snap)|package\.(json|lock))" "$MODIFIED_FILES")
CSS_FILE_COUNT=$(php -f bin/determine-modified-files-count.php ".+\.s?css|package\.json|package-lock\.json" "$MODIFIED_FILES")
JS_FILE_COUNT=$(php -f bin/determine-modified-files-count.php ".+\.(js|snap)|package\.json|package-lock\.json" "$MODIFIED_FILES")

echo "Changed file count: $FILE_COUNT"
echo "Changed PHP file count: $PHP_FILE_COUNT"
Expand Down Expand Up @@ -89,14 +89,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3.0.0
with:
node-version: ${{ steps.nvm.outputs.NVMRC }}
node-version-file: '.nvmrc'
cache: npm

- name: Install Node dependencies
Expand All @@ -118,14 +114,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3.0.0
with:
node-version: ${{ steps.nvm.outputs.NVMRC }}
node-version-file: '.nvmrc'
cache: npm

- name: Install Node dependencies
Expand Down Expand Up @@ -256,14 +248,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3.0.0
with:
node-version: ${{ steps.nvm.outputs.NVMRC }}
node-version-file: '.nvmrc'
cache: npm

- name: Setup Jest cache
Expand Down Expand Up @@ -304,14 +292,10 @@ jobs:
with:
php-version: '7.4'

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3.0.0
with:
node-version: ${{ steps.nvm.outputs.NVMRC }}
node-version-file: '.nvmrc'
cache: npm

- name: Get Composer Cache Directory
Expand Down Expand Up @@ -436,14 +420,10 @@ jobs:
sleep 1
done

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3.0.0
with:
node-version: ${{ steps.nvm.outputs.NVMRC }}
node-version-file: '.nvmrc'
cache: npm

- name: Get Composer Cache Directory
Expand Down Expand Up @@ -589,14 +569,10 @@ jobs:
sleep 1
done

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3.0.0
with:
node-version: ${{ steps.nvm.outputs.NVMRC }}
node-version-file: '.nvmrc'
cache: npm

- name: Get Composer Cache Directory
Expand Down Expand Up @@ -693,14 +669,10 @@ jobs:
with:
php-version: '7.4'

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3.0.0
with:
node-version: ${{ steps.nvm.outputs.NVMRC }}
node-version-file: '.nvmrc'
cache: npm

- name: Get Composer Cache Directory
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/gutenberg-packages-update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,10 @@ jobs:
env:
VERSION: ${{ needs.check-gutenberg-release.outputs.latest-version }}

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3.0.0
with:
node-version: ${{ steps.nvm.outputs.NVMRC }}
node-version-file: '.nvmrc'
cache: npm

- name: Configure git user
Expand Down
2 changes: 0 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module.exports = function( grunt ) {
'assets',
'back-compat',
'includes',
'php-css-parser-install-composer-plugin',
'src',
'templates',
'uninstall.php',
Expand All @@ -26,7 +25,6 @@ module.exports = function( grunt ) {
// ⚠️ Warning: These paths are passed straight to rm command in the shell, without any escaping.
const productionInstallExcludedFilePatterns = [
'composer.*',
'php-css-parser-install-composer-plugin',
'vendor/*/*/.editorconfig',
'vendor/*/*/.git',
'vendor/*/*/.github',
Expand Down
6 changes: 3 additions & 3 deletions ...alidation/components/amp-validation-status/test/__snapshots__/status-notification.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions assets/src/components/dev-tools-toggle/test/__snapshots__/index.js.snap
View file
Open in desktop

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

46 changes: 40 additions & 6 deletions assets/src/components/loading/test/__snapshots__/loading.js.snap
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions assets/src/components/template-mode-option/test/__snapshots__/index.js.snap
View file
Open in desktop

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

19 changes: 6 additions & 13 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
"ampproject/amp-toolbox": "0.10.0",
"cweagans/composer-patches": "~1.0",
"fasterimage/fasterimage": "1.5.0",
"sabberworm/php-css-parser": "dev-master#bfdd976"
"sabberworm/php-css-parser": "8.4.0"
},
"require-dev": {
"ampproject/php-css-parser-install-plugin": "*",
"automattic/vipwpcs": "^2.2",
"civicrm/composer-downloads-plugin": "^3.0",
"dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
Expand All @@ -31,7 +30,7 @@
"phpcompatibility/phpcompatibility-wp": "2.1.3",
"phpdocumentor/reflection": "~3.0",
"roave/security-advisories": "dev-latest",
"sirbrillig/phpcs-variable-analysis": "2.11.2",
"sirbrillig/phpcs-variable-analysis": "2.11.3",
"wp-cli/export-command": "^2.0",
"wp-cli/extension-command": "^2.0",
"wp-cli/wp-cli": "^2.4",
Expand All @@ -43,12 +42,6 @@
"ext-intl": "Enables use of idn_to_utf8() to convert punycode domains to UTF-8 for use with an AMP Cache.",
"ext-mbstring": "Used by PHP-CSS-Parser when working with stylesheets."
},
"repositories": [
{
"type": "path",
"url": "./php-css-parser-install-composer-plugin"
}
],
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
Expand Down Expand Up @@ -77,7 +70,6 @@
},
"config": {
"allow-plugins": {
"ampproject/php-css-parser-install-plugin": true,
"civicrm/composer-downloads-plugin": true,
"cweagans/composer-patches": true,
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -88,6 +80,7 @@
"sort-packages": true
},
"extra": {
"composer-exit-on-patch-failure": true,
"downloads": {
"phpstan": {
"path": "vendor/bin/phpstan",
Expand All @@ -100,9 +93,9 @@
"Fix ReflectionParameter warnings on PHP 8": "patches/phpunit-mock-objects.patch"
},
"sabberworm/php-css-parser": {
"1. Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/193>": "https://github.com/sabberworm/PHP-CSS-Parser/compare/3bc5ded67d77a52b81608cfc97f23b1bb0678e2f%5E...468da3441945e9c1bf402a3340b1d8326723f7d9.patch",
"2. Validate name-start code points for identifier <https://github.com/sabberworm/PHP-CSS-Parser/pull/185>": "https://github.com/sabberworm/PHP-CSS-Parser/compare/d42b64793f2edaffeb663c63e9de79069cdc0831%5E...113df5d55e94e21c6402021dfa959924941d4c29.patch",
"3. Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "https://github.com/westonruter/PHP-CSS-Parser/compare/master...10a2501c119abafced3e4014aa3c0a3453a86f67.patch"
"1. Add additional validation for size unit <https://github.com/sabberworm/PHP-CSS-Parser/pull/350>": "https://github.com/westonruter/PHP-CSS-Parser/commit/5b1d6a4abe43f4311d9b4674913ca665ed8c43aa.diff",
"2. Validate name-start code points for identifier <https://github.com/westonruter/PHP-CSS-Parser/pull/2>": "https://github.com/westonruter/PHP-CSS-Parser/commit/9f96bc97fcb1e848a2f6ca6f658009996883dffc.diff",
"3. Fix parsing CSS selectors which contain commas <https://github.com/westonruter/PHP-CSS-Parser/pull/1>": "https://github.com/westonruter/PHP-CSS-Parser/commit/dc18ba737fd6a611189a5b83729396500676f8dd.diff"
}
}
},
Expand Down
Loading