Skip to content

Commit

Permalink
[not verified] merge branch master
Browse files Browse the repository at this point in the history
  • Loading branch information
kangzj committed Dec 16, 2021
2 parents 653a870 + 0571017 commit 29ec693
Show file tree
Hide file tree
Showing 263 changed files with 4,050 additions and 1,250 deletions.
2 changes: 1 addition & 1 deletion .github/files/setup-wordpress-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ case "$WP_BRANCH" in
previous)
# We hard-code the version here because there's a time near WP releases where
# we've dropped the old 'previous' but WP hasn't actually released the new 'latest'
git clone --depth=1 --branch 5.7 git://develop.git.wordpress.org/ /tmp/wordpress-previous
git clone --depth=1 --branch 5.8 git://develop.git.wordpress.org/ /tmp/wordpress-previous
;;
*)
echo "Unrecognized value for WP_BRANCH: $WP_BRANCH" >&2
Expand Down
2 changes: 1 addition & 1 deletion .github/versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
PHP_VERSION=8.0
COMPOSER_VERSION=2.1.8
NODE_VERSION=16.11.1
PNPM_VERSION=6.16.0
PNPM_VERSION=6.23.6

# Other useful version numbers.
MIN_PHP_VERSION=5.6
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,18 @@ jobs:
misc_js:
# If package or eslint config changed, there may be new checks
- 'package.json'
- 'tools/js-tools/package.json'
- 'pnpm-lock.yaml'
- '.eslintignore'
- '.eslintrc'
- '**/.eslintrc'
# Also changes to the E2E workspace package.json and pnpm lock have caused linting problems.
- 'projects/plugins/boost/tests/e2e/package.json'
- 'projects/plugins/boost/tests/e2e/pnpm-lock.yaml'
- 'projects/plugins/jetpack/tests/e2e/package.json'
- 'projects/plugins/jetpack/tests/e2e/pnpm-lock.yaml'
- 'tools/e2e-commons/package.json'
- 'tools/e2e-commons/pnpm-lock.yaml'
# If the excludelist changed, run to ensure newly non-excluded files pass.
- 'tools/eslint-excludelist.json'
misc_excludelist:
Expand Down
2 changes: 1 addition & 1 deletion .phpcs.config.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<ruleset>
<config name="minimum_supported_wp_version" value="5.7" />
<config name="minimum_supported_wp_version" value="5.8" />
<config name="testVersion" value="5.6-"/>

<!-- Check all PHP files in directory tree by default. -->
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
},
"engines": {
"node": "^14.17.6 || ^16.7.0",
"pnpm": "^6.5.0",
"pnpm": "^6.23.6",
"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
},
"pnpm": {
Expand Down
102 changes: 52 additions & 50 deletions pnpm-lock.yaml

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Update minimum pnpm version.


4 changes: 2 additions & 2 deletions projects/github-actions/repo-gardening/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "repo-gardening",
"version": "2.0.0",
"version": "2.0.1-alpha",
"description": "Manage PR and issues in your Open Source project (automate labelling, milestones, feedback to PR authors, ...)",
"author": "Automattic",
"license": "GPL-2.0-or-later",
Expand Down Expand Up @@ -28,7 +28,7 @@
},
"engines": {
"node": "^14.17.6 || ^16.7.0",
"pnpm": "^6.5.0",
"pnpm": "^6.23.6",
"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Update minimum pnpm version.


4 changes: 2 additions & 2 deletions projects/github-actions/required-review/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "required-review",
"version": "2.2.1",
"version": "2.2.2-alpha",
"description": "Check that a PR has reviews from required teams.",
"main": "index.js",
"author": "Automattic",
Expand All @@ -20,7 +20,7 @@
},
"engines": {
"node": "^14.17.6 || ^16.7.0",
"pnpm": "^6.5.0",
"pnpm": "^6.23.6",
"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Update minimum pnpm version.


4 changes: 2 additions & 2 deletions projects/js-packages/analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/jetpack-analytics",
"version": "0.1.3",
"version": "0.1.4-alpha",
"description": "Jetpack Analytics Package",
"author": "Automattic",
"license": "GPL-2.0-or-later",
Expand All @@ -21,7 +21,7 @@
},
"engines": {
"node": "^14.17.6 || ^16.7.0",
"pnpm": "^6.5.0",
"pnpm": "^6.23.6",
"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
}
}
5 changes: 5 additions & 0 deletions projects/js-packages/api/changelog/update-min-pnpm-version
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Update minimum pnpm version.


6 changes: 3 additions & 3 deletions projects/js-packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@automattic/jetpack-api",
"version": "0.8.0",
"version": "0.8.1-alpha",
"description": "Jetpack Api Package",
"author": "Automattic",
"license": "GPL-2.0-or-later",
"dependencies": {
"@wordpress/url": "3.3.1",
"@automattic/jetpack-config": "workspace:^0.1.0",
"@automattic/jetpack-config": "workspace:^0.1.1-alpha",
"lodash": "4.17.21"
},
"devDependencies": {
Expand All @@ -24,7 +24,7 @@
},
"engines": {
"node": "^14.17.6 || ^16.7.0",
"pnpm": "^6.5.0",
"pnpm": "^6.23.6",
"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Update minimum pnpm version.


Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automattic/babel-plugin-replace-textdomain",
"version": "0.1.0",
"version": "0.1.1-alpha",
"description": "A Babel plugin to replace the textdomain in gettext-style function calls.",
"homepage": "https://jetpack.com",
"bugs": {
Expand All @@ -26,7 +26,7 @@
},
"engines": {
"node": "^14.17.6 || ^16.7.0",
"pnpm": "^6.5.0",
"pnpm": "^6.23.6",
"yarn": "use pnpm instead - see docs/yarn-upgrade.md"
},
"exports": {
Expand Down
Loading

0 comments on commit 29ec693

Please sign in to comment.