Skip to content

Commit 8ca947f

Browse files
westonruterwestonruter
authored
Merge pull request #6954 from ampproject/update/2.2-dependencies
Update dependencies from `develop`
2 parents 29b900e + 36f8dac commit 8ca947f

File tree

13 files changed

+2554
-2863
lines changed

13 files changed

+2554
-2863
lines changed

‎.github/workflows/build-test-measure.yml‎

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
6161
FILE_COUNT=$(php -f bin/determine-modified-files-count.php "$IGNORE_PATH_REGEX" "$MODIFIED_FILES" --invert)
6262
PHP_FILE_COUNT=$(php -f bin/determine-modified-files-count.php ".+\.php|composer\.(json|lock)|phpstan\.neon\.dist" "$MODIFIED_FILES")
63-
CSS_FILE_COUNT=$(php -f bin/determine-modified-files-count.php ".+\.s?css" "$MODIFIED_FILES")
64-
JS_FILE_COUNT=$(php -f bin/determine-modified-files-count.php "(.+\.(js|snap)|package\.(json|lock))" "$MODIFIED_FILES")
63+
CSS_FILE_COUNT=$(php -f bin/determine-modified-files-count.php ".+\.s?css|package\.json|package-lock\.json" "$MODIFIED_FILES")
64+
JS_FILE_COUNT=$(php -f bin/determine-modified-files-count.php ".+\.(js|snap)|package\.json|package-lock\.json" "$MODIFIED_FILES")
6565
6666
echo "Changed file count: $FILE_COUNT"
6767
echo "Changed PHP file count: $PHP_FILE_COUNT"
@@ -89,14 +89,10 @@ jobs:
8989
- name: Checkout
9090
uses: actions/checkout@v2
9191

92-
- name: Read .nvmrc
93-
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
94-
id: nvm
95-
9692
- name: Setup Node
97-
uses: actions/setup-node@v2
93+
uses: actions/setup-node@v3.0.0
9894
with:
99-
node-version: ${{ steps.nvm.outputs.NVMRC }}
95+
node-version-file: '.nvmrc'
10096
cache: npm
10197

10298
- name: Install Node dependencies
@@ -118,14 +114,10 @@ jobs:
118114
- name: Checkout
119115
uses: actions/checkout@v2
120116

121-
- name: Read .nvmrc
122-
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
123-
id: nvm
124-
125117
- name: Setup Node
126-
uses: actions/setup-node@v2
118+
uses: actions/setup-node@v3.0.0
127119
with:
128-
node-version: ${{ steps.nvm.outputs.NVMRC }}
120+
node-version-file: '.nvmrc'
129121
cache: npm
130122

131123
- name: Install Node dependencies
@@ -256,14 +248,10 @@ jobs:
256248
- name: Checkout
257249
uses: actions/checkout@v2
258250

259-
- name: Read .nvmrc
260-
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
261-
id: nvm
262-
263251
- name: Setup Node
264-
uses: actions/setup-node@v2
252+
uses: actions/setup-node@v3.0.0
265253
with:
266-
node-version: ${{ steps.nvm.outputs.NVMRC }}
254+
node-version-file: '.nvmrc'
267255
cache: npm
268256

269257
- name: Setup Jest cache
@@ -304,14 +292,10 @@ jobs:
304292
with:
305293
php-version: '7.4'
306294

307-
- name: Read .nvmrc
308-
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
309-
id: nvm
310-
311295
- name: Setup Node
312-
uses: actions/setup-node@v2
296+
uses: actions/setup-node@v3.0.0
313297
with:
314-
node-version: ${{ steps.nvm.outputs.NVMRC }}
298+
node-version-file: '.nvmrc'
315299
cache: npm
316300

317301
- name: Get Composer Cache Directory
@@ -436,14 +420,10 @@ jobs:
436420
sleep 1
437421
done
438422
439-
- name: Read .nvmrc
440-
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
441-
id: nvm
442-
443423
- name: Setup Node
444-
uses: actions/setup-node@v2
424+
uses: actions/setup-node@v3.0.0
445425
with:
446-
node-version: ${{ steps.nvm.outputs.NVMRC }}
426+
node-version-file: '.nvmrc'
447427
cache: npm
448428

449429
- name: Get Composer Cache Directory
@@ -589,14 +569,10 @@ jobs:
589569
sleep 1
590570
done
591571
592-
- name: Read .nvmrc
593-
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
594-
id: nvm
595-
596572
- name: Setup Node
597-
uses: actions/setup-node@v2
573+
uses: actions/setup-node@v3.0.0
598574
with:
599-
node-version: ${{ steps.nvm.outputs.NVMRC }}
575+
node-version-file: '.nvmrc'
600576
cache: npm
601577

602578
- name: Get Composer Cache Directory
@@ -693,14 +669,10 @@ jobs:
693669
with:
694670
php-version: '7.4'
695671

696-
- name: Read .nvmrc
697-
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
698-
id: nvm
699-
700672
- name: Setup Node
701-
uses: actions/setup-node@v2
673+
uses: actions/setup-node@v3.0.0
702674
with:
703-
node-version: ${{ steps.nvm.outputs.NVMRC }}
675+
node-version-file: '.nvmrc'
704676
cache: npm
705677

706678
- name: Get Composer Cache Directory

‎.github/workflows/gutenberg-packages-update.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,10 @@ jobs:
101101
env:
102102
VERSION: ${{ needs.check-gutenberg-release.outputs.latest-version }}
103103

104-
- name: Read .nvmrc
105-
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
106-
id: nvm
107-
108104
- name: Setup Node
109-
uses: actions/setup-node@v2
105+
uses: actions/setup-node@v3.0.0
110106
with:
111-
node-version: ${{ steps.nvm.outputs.NVMRC }}
107+
node-version-file: '.nvmrc'
112108
cache: npm
113109

114110
- name: Configure git user

‎Gruntfile.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ module.exports = function( grunt ) {
1010
'assets',
1111
'back-compat',
1212
'includes',
13-
'php-css-parser-install-composer-plugin',
1413
'src',
1514
'templates',
1615
'uninstall.php',
@@ -26,7 +25,6 @@ module.exports = function( grunt ) {
2625
// ⚠️ Warning: These paths are passed straight to rm command in the shell, without any escaping.
2726
const productionInstallExcludedFilePatterns = [
2827
'composer.*',
29-
'php-css-parser-install-composer-plugin',
3028
'vendor/*/*/.editorconfig',
3129
'vendor/*/*/.git',
3230
'vendor/*/*/.github',

‎assets/src/block-validation/components/amp-validation-status/test/__snapshots__/status-notification.js.snap‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/src/components/dev-tools-toggle/test/__snapshots__/index.js.snap‎

Lines changed: 20 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/src/components/loading/test/__snapshots__/loading.js.snap‎

Lines changed: 40 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/src/components/template-mode-option/test/__snapshots__/index.js.snap‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎composer.json‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
"ampproject/amp-toolbox": "0.10.0",
1818
"cweagans/composer-patches": "~1.0",
1919
"fasterimage/fasterimage": "1.5.0",
20-
"sabberworm/php-css-parser": "dev-master#bfdd976"
20+
"sabberworm/php-css-parser": "8.4.0"
2121
},
2222
"require-dev": {
23-
"ampproject/php-css-parser-install-plugin": "*",
2423
"automattic/vipwpcs": "^2.2",
2524
"civicrm/composer-downloads-plugin": "^3.0",
2625
"dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
@@ -31,7 +30,7 @@
3130
"phpcompatibility/phpcompatibility-wp": "2.1.3",
3231
"phpdocumentor/reflection": "~3.0",
3332
"roave/security-advisories": "dev-latest",
34-
"sirbrillig/phpcs-variable-analysis": "2.11.2",
33+
"sirbrillig/phpcs-variable-analysis": "2.11.3",
3534
"wp-cli/export-command": "^2.0",
3635
"wp-cli/extension-command": "^2.0",
3736
"wp-cli/wp-cli": "^2.4",
@@ -43,12 +42,6 @@
4342
"ext-intl": "Enables use of idn_to_utf8() to convert punycode domains to UTF-8 for use with an AMP Cache.",
4443
"ext-mbstring": "Used by PHP-CSS-Parser when working with stylesheets."
4544
},
46-
"repositories": [
47-
{
48-
"type": "path",
49-
"url": "./php-css-parser-install-composer-plugin"
50-
}
51-
],
5245
"minimum-stability": "dev",
5346
"prefer-stable": true,
5447
"autoload": {
@@ -77,7 +70,6 @@
7770
},
7871
"config": {
7972
"allow-plugins": {
80-
"ampproject/php-css-parser-install-plugin": true,
8173
"civicrm/composer-downloads-plugin": true,
8274
"cweagans/composer-patches": true,
8375
"dealerdirect/phpcodesniffer-composer-installer": true
@@ -88,6 +80,7 @@
8880
"sort-packages": true
8981
},
9082
"extra": {
83+
"composer-exit-on-patch-failure": true,
9184
"downloads": {
9285
"phpstan": {
9386
"path": "vendor/bin/phpstan",
@@ -100,9 +93,9 @@
10093
"Fix ReflectionParameter warnings on PHP 8": "patches/phpunit-mock-objects.patch"
10194
},
10295
"sabberworm/php-css-parser": {
103-
"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",
104-
"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",
105-
"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"
96+
"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",
97+
"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",
98+
"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"
10699
}
107100
}
108101
},

0 commit comments

Comments
 (0)