Merge branch 'master' into feature/issue-948

.editorconfig

@@ -14,6 +14,9 @@ ij_smart_tabs = false
 ij_visual_guides = none
 ij_wrap_on_typing = false
 
+[Gruntfile]
+indent_style = tab
+
 [*.blade.php]
 ij_blade_keep_indents_on_empty_lines = false
 

.github/actions/build-plugin/action.yml

@@ -9,13 +9,6 @@ runs:
       with:
         php-version: '7.4'
 
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.0.6' # Not needed with a .ruby-version file
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - run: gem install compass
-      shell: bash
-
     - name: Cache Composer packages
       id: composer-cache
       uses: actions/cache@v3

.github/dependabot.yml

@@ -0,0 +1,31 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  # Maintain dependencies for npm
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    allow:
+      - dependency-name: "*"
+        dependency-type: "production"
+    commit-message:
+      prefix: "npm"
+      include: "scope"
+
+  # Maintain dependencies for Composer
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    allow:
+      - dependency-name: "*"
+        dependency-type: "production"
+    commit-message:
+      prefix: "composer"
+      include: "scope"

.github/workflows/build-rc.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
 
-     - uses: actions/checkout@v3
+     - uses: actions/checkout@v4
 
      - uses: ./.github/actions/build-plugin
 

.github/workflows/compile.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     name: Check i18n coverage
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -46,19 +46,15 @@ jobs:
     needs: i18n-coverage
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.ref }} # checkout the latest commit so that we can push changes
 
     - uses: shivammathur/setup-php@v2
       with:
         php-version: '7.4'
 
-    - uses: ruby/setup-ruby@v1
-      with:
-          ruby-version: '3.0.6' # Not needed with a .ruby-version file
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - run: gem install compass
-
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
         cache: 'npm'

.github/workflows/e2e.yml

@@ -35,7 +35,7 @@ jobs:
           - {name: 'trunk', version: 'WordPress/WordPress#master'}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ./.github/actions/build-plugin
 
@@ -62,7 +62,7 @@ jobs:
 
       - name: Upload Cypress screenshots
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cypress-screenshots-${{ matrix.php }}_${{ matrix.core.name }}
           path: ${{ github.workspace }}/tests/cypress/screenshots/

.github/workflows/phpunit.yml

@@ -30,7 +30,7 @@ jobs:
           - '8.2'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up MySQL
       run: |

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: ./.github/actions/build-plugin
 
@@ -33,10 +33,12 @@ jobs:
         BUILD_DIR: build/commonsbooking
         SLUG: commonsbooking # optional, remove if GitHub repo name matches SVN slug, including capitalization
 
-    - name: Upload release assets
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: ${{ steps.deploy.outputs.zip-path }}
+    - name: Upload release asset
+      uses: actions/upload-release-asset@v1
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ${{ steps.deploy.outputs.zip-path }}
+        asset_name: ${{ github.event.repository.name }}.zip
+        asset_content_type: application/zip

.wp-env.json

@@ -1,12 +1,14 @@
 {
 	"phpVersion": "7.4",
-	"core": "Wordpress/Wordpress#6.3.2",
+	"core": "Wordpress/Wordpress#6.4.1",
         "plugins": [ 
 		".",
 	        "https://downloads.wordpress.org/plugin/wp-crontrol.zip",
       	        "https://downloads.wordpress.org/plugin/wordpress-importer.zip",
 	        "https://downloads.wordpress.org/plugin/query-monitor.zip",
-		"https://downloads.wordpress.org/plugin/wp-mail-logging.zip"
+		"https://downloads.wordpress.org/plugin/wp-mail-logging.zip",
+		"https://downloads.wordpress.org/plugin/jsm-show-post-meta.zip",
+		"https://downloads.wordpress.org/plugin/disable-welcome-messages-and-tips.zip"
 	],
 	"port": 1000,
   	"testsPort": 1001,