Skip to content

Commit b4acdc4

Browse files
Merge pull request #1677 from xwp/release/v4.1.0
Release `4.1.0`
2 parents ec217b8 + 051f5f1 commit b4acdc4

File tree

248 files changed

+23546
-22666
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+23546
-22666
lines changed

.distignore

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
.distignore
33
.editorconfig
44
.eslintignore
5-
.eslintrc.json
5+
.eslintrc.js
66
.gitignore
77
.nvmrc
8+
.phpunit.result.cache
89
composer.lock
910
docker-compose.build.yml
1011
docker-compose.yml
@@ -14,14 +15,24 @@ package-lock.json
1415
phpcs.xml.dist
1516
phpunit.xml
1617
phpunit-multisite.xml
18+
playwright.config.js
1719
renovate.json
1820
.git
1921
.github
2022
.idea
2123
.vscode
2224
.wordpress-org
23-
build
2425
dist
2526
local
2627
node_modules
2728
tests
29+
30+
# Playwright generated files.
31+
/artifacts/
32+
/test-results/
33+
/playwright-report/
34+
/blob-report/
35+
/playwright/.cache/
36+
37+
# JS and SCSS source files.
38+
/src/

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/ui/lib/
2-
**/*.min.js
31
/vendor/
42
/node_modules/
53
/build/

.eslintrc.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module.exports = {
2+
extends: [
3+
'plugin:@wordpress/eslint-plugin/recommended-with-formatting',
4+
],
5+
env: {
6+
browser: true,
7+
es6: true,
8+
},
9+
rules: {
10+
'@wordpress/no-global-event-listener': 'off',
11+
'jsdoc/check-indentation': 'error',
12+
'@wordpress/dependency-group': 'error',
13+
'import/order': [ 'error', { groups: [ 'builtin', [ 'external', 'unknown' ], 'internal', 'parent', 'sibling', 'index' ] } ],
14+
'jsdoc/require-param': 'off',
15+
'jsdoc/require-param-type': 'off',
16+
'jsdoc/check-param-names': 'off',
17+
},
18+
};

.eslintrc.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/deploy-to-stream-dist.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ jobs:
5757
- name: Setup environment
5858
run: |
5959
set -ex
60-
60+
6161
ROOT_DIR="$(git rev-parse --show-toplevel)"
6262
WORKING_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
63-
SRC_DIR="$ROOT_DIR/build"
63+
SRC_DIR="$ROOT_DIR/source"
6464
DIST_DIR="$ROOT_DIR/dist"
6565
DIST_BRANCH="${GITHUB_REF#refs/heads/}"
6666
DIST_TAG="${GITHUB_REF#refs/tags/}"
6767
COMMIT_MESSAGE="$(git log -1 --oneline)"
68-
68+
6969
echo "ROOT_DIR=$ROOT_DIR" >> $GITHUB_ENV
7070
echo "WORKING_BRANCH=$WORKING_BRANCH" >> $GITHUB_ENV
7171
echo "SRC_DIR=$SRC_DIR" >> $GITHUB_ENV
@@ -77,12 +77,12 @@ jobs:
7777
- name: Sync files locally
7878
run: |
7979
set -ex
80-
80+
8181
rm -rf "$SRC_DIR"
8282
rm -rf "$DIST_DIR"
83-
83+
8484
mkdir -p "$SRC_DIR"
85-
85+
8686
rsync -av --exclude-from=.distignore "$ROOT_DIR/" "$SRC_DIR/"
8787
env:
8888
ROOT_DIR: ${{ env.ROOT_DIR }}
@@ -103,19 +103,19 @@ jobs:
103103
- name: Deploy to xwp/stream-dist
104104
run: |
105105
set -ex
106-
106+
107107
export GIT_DIR="$DIST_DIR/.git"
108108
export GIT_WORK_TREE="$DIST_DIR"
109-
109+
110110
git clone --progress --verbose ${{ vars.DIST_REPO }} "$DIST_DIR/.git"
111111
git checkout -B "$DIST_BRANCH"
112-
112+
113113
# Use the release bundle as the work tree.
114114
export GIT_WORK_TREE="$SRC_DIR"
115-
115+
116116
git add --all
117117
git commit --allow-empty --message "$COMMIT_MESSAGE"
118-
118+
119119
if [ "${{ github.event_name }}" = "release" ]; then
120120
echo "Tagging a release: $DIST_TAG"
121121
git tag --force "$DIST_TAG"

.github/workflows/deploy-to-wp-org.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ on:
77
# In case of a pre-release, the action will not commit to WP.org (dry-run). However, it will still
88
# create a zip file and upload it to the release. Note that a pre-release (release candidate)
99
# should not be changed to a release but rather a new release should be created.
10+
#
11+
# The "prereleased" type will not trigger for pre-releases published from draft releases, but
12+
# the "published" type will trigger. Since we want a workflow to run when stable and pre-releases
13+
# publish, we subscribe to "published" instead of "released" and "prereleased".
14+
#
15+
# See: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#release
1016
release:
11-
types:
12-
- released
13-
- prereleased
17+
types: [ published ]
1418

1519
jobs:
1620
lint_and_test:

.github/workflows/lint-and-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ jobs:
5454
- name: Lint
5555
run: npm run lint
5656

57+
- name: Build
58+
run: npm run build
59+
5760
- name: Pull custom Docker images
5861
run: docker compose pull wordpress
5962

6063
- name: Test
6164
run: npm run test
62-
63-
- name: Build
64-
run: npm run build

.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ debug.log
1414
package.lock
1515
.phpunit.result.cache
1616

17-
# Compiled files
18-
ui/js/*.min.js
19-
ui/css/*.min.css
20-
alerts/js/*.min.js
21-
2217
# Generated test data
18+
/artifacts/
2319
tests/data/tmp/*
20+
/test-results/
21+
/playwright-report/
22+
/blob-report/
23+
/playwright/.cache/
24+
/playwright/.auth/

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"recommendations": [
33
"EditorConfig.EditorConfig",
44
"felixfbecker.php-debug",
5-
"ikappas.phpcs"
5+
"ms-playwright.playwright"
66
]
77
}

0 commit comments

Comments
 (0)