Merge pull request #105 from liip/feat/wp-60

feat(): WordPress 6.0

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

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js 16
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16
 
@@ -39,10 +39,10 @@ jobs:
         wp: [ '5.7', '5.8', '5.9' ]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js 16
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: 16
 
@@ -66,18 +66,51 @@ jobs:
       - name: Running PHP unit tests
         run: npm run test:unit:php:ci
 
+  tests-wp-60:
+    name: Tests WordPress 6.0
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js 16
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Install dependencies
+        run: |
+          npm ci
+          composer install
+
+      - name: "Configure environment with WP 6.0"
+        run: |
+          echo -e '{\n\t"core": "https://wordpress.org/wordpress-6.0-RC2.zip"\n}' > ./.wp-env.override.json
+
+      - name: Install WordPress
+        run: |
+          chmod -R 767 ./ # TODO: Possibly integrate in wp-env
+          npm run wp-env start
+
+      - name: Running JavaScript E2E tests
+        run: npm run test:e2e
+
+      - name: Running PHP unit tests
+        run: npm run test:unit:php:ci
+
   deploy-dry-run:
     name: '[DRY RUN] Deploy'
 
     # only run on master but not tags
     if: ${{ github.ref == 'refs/heads/master' && !startsWith(github.ref, 'refs/tags/') }}
 
-    needs: [ lint, tests ]
+    needs: [ lint, tests, 'tests-wp-60' ]
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - shell: bash
         env:
@@ -91,12 +124,12 @@ jobs:
     # only run on tags
     if: startsWith(github.ref, 'refs/tags/')
 
-    needs: [ lint, tests ]
+    needs: [ lint, tests, 'tests-wp-60' ]
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - shell: bash
         env:

.stylelintrc.json

@@ -1,5 +1,5 @@
 {
-	"extends": "@wordpress/stylelint-config",
+	"extends": "@wordpress/stylelint-config/scss",
 	"rules": {
 		"at-rule-empty-line-before": null,
 		"at-rule-no-unknown": null,
@@ -9,6 +9,10 @@
 		"no-descending-specificity": null,
 		"rule-empty-line-before": null,
 		"selector-class-pattern": null,
-		"value-keyword-case": null
+		"value-keyword-case": null,
+		"scss/at-import-partial-extension": null,
+		"scss/no-global-function-names": null,
+		"scss/at-if-closing-brace-newline-after": null,
+		"scss/at-if-closing-brace-space-after": null
 	}
 }

.wp-env.json

@@ -1,5 +1,5 @@
 {
-	"core": "WordPress/WordPress#5.9",
+	"core": "https://wordpress.org/wordpress-6.0-RC2.zip",
 	"plugins": [ "." ],
 	"themes": [
 		"./test-themes/bootstrap"

build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '33f83f64c509950d43b63849629d0712');
+<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => '0eaff1ea1cf672b436eda066b043570f');

build/settings.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'cb9f31fac5fa80527366aec813051fc1');
+<?php return array('dependencies' => array(), 'version' => 'f0104b60f4e97fe8fc9db16e1886cf55');

languages/wp-bootstrap-blocks-de_CH-dfbff627e6c248bcb3b61d7d06da9ca9.json

@@ -1 +1 @@
-{"translation-revision-date":"2020-10-18 22:25+0200","generator":"WP-CLI\/2.5.0","source":"build\/index.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"de_CH","plural-forms":"nplurals=2; plural=(n != 1);"},"Button":["Button"],"Bootstrap Button":["Bootstrap Button"],"Bootstrap":["Bootstrap"],"Primary":["Primary"],"Secondary":["Secondary"],"Add text...":["Text hinzuf\u00fcgen..."],"Style":["Stil"],"Link settings":["Link-Einstellungen"],"Open in new tab":["In einem neuen Tab \u00f6ffnen"],"Link rel":["Link rel"],"Change button alignment":["\u00c4ndere die Positionierung des Buttons"],"Apply":["\u00dcbernehmen"],"Column":["Column"],"Bootstrap Column":["Bootstrap Column"],"Align content top":["Inhalt oben positionieren"],"Align content center":["Inhalt zentrieren"],"Align content bottom":["Inhalt unten positionieren"],"None":["Deaktiviert"],"Small":["Klein"],"Medium":["Mittel"],"Large":["Gross"],"Column size":["Anzahl Spalten"],"Xs Column count":["Xs Anzahl Spalten"],"Xs equal-width":["Xs gleiche Breite (equal-width)"],"Sm Column count":["Sm Anzahl Spalten"],"Sm equal-width":["Sm gleiche Breite (equal-width)"],"Md Column count":["Md Anzahl Spalten"],"Md equal-width":["Md gleiche Breite (equal-width)"],"Lg Column count":["Lg Anzahl Spalten"],"Lg equal-width":["Lg gleiche Breite (equal-width)"],"Xl Column count":["Xl Anzahl Spalten"],"Xl equal-width":["Xl gleiche Breite (equal-width)"],"Xxl Column count":["Xxl Anzahl Spalten"],"Xxl equal-width":["Xxl gleiche Breite (equal-width)"],"Background color":["Hintergrundfarbe"],"Padding (inside column)":["Padding (innerhalb der Spalte)"],"Size":["Gr\u00f6sse"],"Change vertical alignment of content":["\u00c4ndere die vertikale Positionierung des Inhaltes"],"Container":["Container"],"Bootstrap Container":["Bootstrap Container"],"Xl":["Xl"],"Lg":["Lg"],"Md":["Md"],"Sm":["Sm"],"Xxl":["Xxl"],"No breakpoint selected":["Kein Breakpoint ausgew\u00e4hlt"],"Fluid":["Fluid"],"Fluid Breakpoint":["Fluid Breakpoint"],"Fluid breakpoints only work with Bootstrap v4.4+. The container will be 100% wide until the specified breakpoint is reached, after which max-widths for each of the higher breakpoints will be applied.":["Fluid Breakpoints werden erst ab Bootstrap v4.4+ unterst\u00fctzt. Wenn die Option aktiviert ist, nimmt der Container 100% der Breite ein bis zum gew\u00e4hlten Breakpoint. Ab diesem Breakpoint gilt die jeweilige maximale Breite (max-width) des Containers."],"Margin":["Margin"],"Margin After":["Margin unterhalb vom Block"],"Row":["Row"],"Bootstrap Row":["Bootstrap Row"],"2 Columns (1:1)":["2 Spalten (1:1)"],"2 Columns (1:2)":["2 Spalten (1:2)"],"2 Columns (2:1)":["2 Spalten (2:1)"],"3 Columns (1:1:1)":["3 Spalten (1:1:1)"],"Custom":["Benutzerdefiniert"],"Bootstrap Default":["Bootstrap Standardwert"],"Bootstrap Default (None)":["Bootstrap Standardwert (Kein Abstand)"],"Align columns left":["Spalten links positionieren"],"Align columns center":["Spalten zentrieren"],"Align columns right":["Spalten rechts positionieren"],"Align columns top":["Spalten oben positionieren"],"Align columns bottom":["Spalten unten positionieren"],"Editor: Display columns stacked":["Editor: Spalten untereinander darstellen"],"Displays stacked columns in editor to enhance readability of block content. This option is only used in the editor and won't affect the output of the row.":["Stellt die Spalten untereinander dar um die Lesbarkeit der Block-Inhalte zu verbessern. Diese Option wird lediglich f\u00fcr den Editor verwendet und ver\u00e4ndert die Ausgabe des Blocks nicht."],"Change layout":["Layout \u00e4ndern"],"Row options":["Zeilen Optionen"],"No Gutters":["Keine Abst\u00e4nde zwischen Spalten (No Gutters)"],"Gutters":["Abst\u00e4nde zwischen Spalten"],"Horizontal Gutters":["Horizontale Abst\u00e4nde zwischen Spalten"],"Vertical Gutters":["Vertikale Abst\u00e4nde zwischen Spalten"],"Change horizontal alignment of columns":["\u00c4ndere die horizontale Positionierung der Spalten"],"Change vertical alignment of columns":["\u00c4ndere die vertikale Positionierung der Spalten"]}}}
+{"translation-revision-date":"2020-10-18 22:25+0200","generator":"WP-CLI\/2.6.0","source":"build\/index.js","domain":"messages","locale_data":{"messages":{"":{"domain":"messages","lang":"de_CH","plural-forms":"nplurals=2; plural=(n != 1);"},"Bootstrap Button":["Bootstrap Button"],"Button":["Button"],"Bootstrap":["Bootstrap"],"Primary":["Primary"],"Secondary":["Secondary"],"Add text...":["Text hinzuf\u00fcgen..."],"Style":["Stil"],"Link settings":["Link-Einstellungen"],"Open in new tab":["In einem neuen Tab \u00f6ffnen"],"Link rel":["Link rel"],"Change button alignment":["\u00c4ndere die Positionierung des Buttons"],"Apply":["\u00dcbernehmen"],"Bootstrap Column":["Bootstrap Column"],"Column":["Column"],"Align content top":["Inhalt oben positionieren"],"Align content center":["Inhalt zentrieren"],"Align content bottom":["Inhalt unten positionieren"],"None":["Deaktiviert"],"Small":["Klein"],"Medium":["Mittel"],"Large":["Gross"],"Column size":["Anzahl Spalten"],"Xs Column count":["Xs Anzahl Spalten"],"Xs equal-width":["Xs gleiche Breite (equal-width)"],"Sm Column count":["Sm Anzahl Spalten"],"Sm equal-width":["Sm gleiche Breite (equal-width)"],"Md Column count":["Md Anzahl Spalten"],"Md equal-width":["Md gleiche Breite (equal-width)"],"Lg Column count":["Lg Anzahl Spalten"],"Lg equal-width":["Lg gleiche Breite (equal-width)"],"Xl Column count":["Xl Anzahl Spalten"],"Xl equal-width":["Xl gleiche Breite (equal-width)"],"Xxl Column count":["Xxl Anzahl Spalten"],"Xxl equal-width":["Xxl gleiche Breite (equal-width)"],"Background color":["Hintergrundfarbe"],"Padding (inside column)":["Padding (innerhalb der Spalte)"],"Size":["Gr\u00f6sse"],"Change vertical alignment of content":["\u00c4ndere die vertikale Positionierung des Inhaltes"],"Bootstrap Container":["Bootstrap Container"],"Container":["Container"],"Xl":["Xl"],"Lg":["Lg"],"Md":["Md"],"Sm":["Sm"],"Xxl":["Xxl"],"No breakpoint selected":["Kein Breakpoint ausgew\u00e4hlt"],"Fluid":["Fluid"],"Fluid Breakpoint":["Fluid Breakpoint"],"Fluid breakpoints only work with Bootstrap v4.4+. The container will be 100% wide until the specified breakpoint is reached, after which max-widths for each of the higher breakpoints will be applied.":["Fluid Breakpoints werden erst ab Bootstrap v4.4+ unterst\u00fctzt. Wenn die Option aktiviert ist, nimmt der Container 100% der Breite ein bis zum gew\u00e4hlten Breakpoint. Ab diesem Breakpoint gilt die jeweilige maximale Breite (max-width) des Containers."],"Margin":["Margin"],"Margin After":["Margin unterhalb vom Block"],"Bootstrap Row":["Bootstrap Row"],"Row":["Row"],"2 Columns (1:1)":["2 Spalten (1:1)"],"2 Columns (1:2)":["2 Spalten (1:2)"],"2 Columns (2:1)":["2 Spalten (2:1)"],"3 Columns (1:1:1)":["3 Spalten (1:1:1)"],"Custom":["Benutzerdefiniert"],"Bootstrap Default":["Bootstrap Standardwert"],"Bootstrap Default (None)":["Bootstrap Standardwert (Kein Abstand)"],"Align columns left":["Spalten links positionieren"],"Align columns center":["Spalten zentrieren"],"Align columns right":["Spalten rechts positionieren"],"Align columns top":["Spalten oben positionieren"],"Align columns bottom":["Spalten unten positionieren"],"Editor: Display columns stacked":["Editor: Spalten untereinander darstellen"],"Displays stacked columns in editor to enhance readability of block content. This option is only used in the editor and won't affect the output of the row.":["Stellt die Spalten untereinander dar um die Lesbarkeit der Block-Inhalte zu verbessern. Diese Option wird lediglich f\u00fcr den Editor verwendet und ver\u00e4ndert die Ausgabe des Blocks nicht."],"Change layout":["Layout \u00e4ndern"],"Row options":["Zeilen Optionen"],"No Gutters":["Keine Abst\u00e4nde zwischen Spalten (No Gutters)"],"Gutters":["Abst\u00e4nde zwischen Spalten"],"Horizontal Gutters":["Horizontale Abst\u00e4nde zwischen Spalten"],"Vertical Gutters":["Vertikale Abst\u00e4nde zwischen Spalten"],"Change horizontal alignment of columns":["\u00c4ndere die horizontale Positionierung der Spalten"],"Change vertical alignment of columns":["\u00c4ndere die vertikale Positionierung der Spalten"]}}}

languages/wp-bootstrap-blocks-de_CH.po

@@ -2,10 +2,10 @@
 # This file is distributed under the same license as the Bootstrap Blocks plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Bootstrap Blocks 4.0.1\n"
+"Project-Id-Version: Bootstrap Blocks 4.1.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-bootstrap-"
 "blocks\n"
-"POT-Creation-Date: 2021-12-09T20:17:11+00:00\n"
+"POT-Creation-Date: 2022-05-11T07:32:45+00:00\n"
 "PO-Revision-Date: 2020-10-18 22:25+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -101,14 +101,14 @@ msgstr "Die Option ist in der folgenden Konstante definiert: %s"
 msgid "%s does not exist."
 msgstr "%s existiert nicht."
 
-#: build/index.js:30 build/index.js:35 build/index.js:15 build/index.js:19
-msgid "Button"
-msgstr "Button"
-
-#: build/index.js:35 build/index.js:20
+#: build/index.js:30 build/index.js:35 build/index.js:15 build/index.js:20
 msgid "Bootstrap Button"
 msgstr "Bootstrap Button"
 
+#: build/index.js:35 build/index.js:19
+msgid "Button"
+msgstr "Button"
+
 #: build/index.js:35 build/index.js:272 build/index.js:702 build/index.js:1168
 #: build/index.js:21 build/index.js:212 build/index.js:682 build/index.js:1044
 msgid "Bootstrap"
@@ -150,14 +150,14 @@ msgstr "Ändere die Positionierung des Buttons"
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: build/index.js:266 build/index.js:272 build/index.js:206 build/index.js:210
-msgid "Column"
-msgstr "Column"
-
-#: build/index.js:272 build/index.js:211
+#: build/index.js:266 build/index.js:272 build/index.js:206 build/index.js:211
 msgid "Bootstrap Column"
 msgstr "Bootstrap Column"
 
+#: build/index.js:272 build/index.js:210
+msgid "Column"
+msgstr "Column"
+
 #: build/index.js:399 build/index.js:320
 msgid "Align content top"
 msgstr "Inhalt oben positionieren"
@@ -261,14 +261,14 @@ msgstr "Grösse"
 msgid "Change vertical alignment of content"
 msgstr "Ändere die vertikale Positionierung des Inhaltes"
 
-#: build/index.js:697 build/index.js:702 build/index.js:676 build/index.js:680
-msgid "Container"
-msgstr "Container"
-
-#: build/index.js:702 build/index.js:681
+#: build/index.js:697 build/index.js:702 build/index.js:676 build/index.js:681
 msgid "Bootstrap Container"
 msgstr "Bootstrap Container"
 
+#: build/index.js:702 build/index.js:680
+msgid "Container"
+msgstr "Container"
+
 #: build/index.js:789 build/index.js:745
 msgid "Xl"
 msgstr "Xl"
@@ -321,14 +321,14 @@ msgid "Margin After"
 msgstr "Margin unterhalb vom Block"
 
 #: build/index.js:1162 build/index.js:1168 build/index.js:1038
-#: build/index.js:1042
-msgid "Row"
-msgstr "Row"
-
-#: build/index.js:1168 build/index.js:1043
+#: build/index.js:1043
 msgid "Bootstrap Row"
 msgstr "Bootstrap Row"
 
+#: build/index.js:1168 build/index.js:1042
+msgid "Row"
+msgstr "Row"
+
 #: build/index.js:1274 build/index.js:1115
 msgid "2 Columns (1:1)"
 msgstr "2 Spalten (1:1)"