Merge branch 'develop' into KarelJanVanHaute/issue314

.ddev/config.yaml

@@ -1,31 +1,36 @@
 name: craft-base-install
 type: craftcms
 docroot: public
-php_version: '8.2'
+php_version: "8.2"
 webserver_type: apache-fpm
 xdebug_enabled: false
-project_tld: local.statik.be
 additional_hostnames: []
 additional_fqdns: []
 database:
-  type: mysql
-  version: '5.7'
+    type: mysql
+    version: "8.0"
+upload_dirs:
+    - files
+    - ../node_modules
+project_tld: local.statik.be
 use_dns_when_possible: true
-composer_version: '2'
+composer_version: "2"
 web_environment: []
-upload_dirs:
-  - files
-  - ../node_modules
+corepack_enable: false
+
 # Key features of DDEV's config.yaml:
 
 # name: <projectname> # Name of the project, automatically provides
 #   http://projectname.ddev.site and https://projectname.ddev.site
 
-# type: <projecttype>  # drupal6/7/8, backdrop, typo3, wordpress, php
+# type: <projecttype>  # backdrop, craftcms, django4, drupal, drupal6, drupal7, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
+# See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more
+# information on the different project types
+# "drupal" covers recent Drupal 8+
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "8.1"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"
+# php_version: "8.2"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"
 
 # You can explicitly specify the webimage but this
 # is not recommended, as the images are often closely tied to DDEV's' behavior,
@@ -35,7 +40,7 @@ upload_dirs:
 
 # database:
 #   type: <dbtype> # mysql, mariadb, postgres
-#   version: <version> # database version, like "10.4" or "8.0"
+#   version: <version> # database version, like "10.11" or "8.0"
 #   MariaDB versions can be 5.5-10.8 and 10.11, MySQL versions can be 5.5-8.0
 #   PostgreSQL versions can be 9-16.
 
@@ -76,12 +81,17 @@ upload_dirs:
 # Alternatively, an explicit Composer version may be specified, for example "2.2.18".
 # To reinstall Composer after the image was built, run "ddev debug refresh".
 
-# nodejs_version: "18"
-# change from the default system Node.js version to another supported version, like 16, 18, 20.
-# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any
-# Node.js version, including v6, etc.
-# You only need to configure this if you are not using nvm and you want to use a major
-# version that is not the default.
+# nodejs_version: "20"
+# change from the default system Node.js version to any other version.
+# Numeric version numbers can be complete (i.e. 18.15.0) or
+# incomplete (18, 17.2, 16). 'lts' and 'latest' can be used as well along with
+# other named releases.
+# see https://www.npmjs.com/package/n#specifying-nodejs-versions
+# Note that you can continue using 'ddev nvm' or nvm inside the web container
+# to change the project's installed node version if you need to.
+
+# corepack_enable: false
+# Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm
 
 # additional_hostnames:
 #  - somename
@@ -95,6 +105,12 @@ upload_dirs:
 # would provide http and https URLs for "example.com" and "sub1.example.com"
 # Please take care with this because it can cause great confusion.
 
+# upload_dirs: "custom/upload/dir"
+#
+# upload_dirs:
+#   - custom/upload/dir
+#   - ../private
+#
 # would set the destination paths for ddev import-files to <docroot>/custom/upload/dir
 # When Mutagen is enabled this path is bind-mounted so that all the files
 # in the upload_dirs don't have to be synced into Mutagen.
@@ -134,8 +150,8 @@ upload_dirs:
 #   - "mutagen": enables Mutagen for this project.
 #   - "nfs":     enables NFS for this project.
 #
-# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs
-# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen
+# See https://ddev.readthedocs.io/en/stable/users/install/performance/#nfs
+# See https://ddev.readthedocs.io/en/stable/users/install/performance/#mutagen
 
 # fail_on_hook_fail: False
 # Decide whether 'ddev start' should be interrupted by a failing hook
@@ -176,6 +192,7 @@ upload_dirs:
 # instead of editing /etc/hosts
 # Defaults to true
 
+# project_tld: ddev.site
 # The top-level domain used for project URLs
 # The default "ddev.site" allows DNS lookup via a wildcard
 # If you prefer you can change this to "ddev.local" to preserve

.env.example

@@ -40,4 +40,6 @@ FRONTEND_DEV=false
 
 ALGOLIA_APP_ID=""
 ALGOLIA_API_KEY=""
-ALGOLIA_SEARCH_KEY=""
+ALGOLIA_SEARCH_KEY=""
+
+SITE_PASSWORD=""

.githooks/post-merge

@@ -13,5 +13,5 @@ check_run() {
 
 check_run package.json "yarn install"
 check_run tailoff "yarn run dev"
-check_run composer.json "composer install"
-check_run config/project/project.yaml "php craft up"
+check_run composer.json "ddev composer install"
+check_run config/project/project.yaml "ddev craft up"

.githooks/pre-push

@@ -11,5 +11,5 @@ check_run() {
 	echo "$changed_files" | grep --quiet "$1" && eval "$2"
 }
 
-check_run config/project/project.yaml "php craft up"
+check_run config/project/project.yaml "ddev craft up"
 echo "pre-push hook ended"

bitbucket-pipelines.yml

@@ -11,6 +11,7 @@ pipelines:
           script:
             # build frontend and run composer
             - composer install --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader
+            - sh ./bitbucket_pipelines_build_frontend.sh
             # deploy:
             - cp .deploy/ssh/* ~/.ssh/. && chmod 400 ~/.ssh/bitbucket_pipelines*
             - dep deploy staging -vv
@@ -23,6 +24,7 @@ pipelines:
           script:
             # build frontend and run composer
             - composer install --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader
+            - sh ./bitbucket_pipelines_build_frontend.sh
             # deploy:
             - cp .deploy/ssh/* ~/.ssh/. && chmod 400 ~/.ssh/bitbucket_pipelines*
             - dep deploy production -vv

bitbucket_pipelines_build_frontend.sh

@@ -0,0 +1,9 @@
+#!bin/bash
+
+# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+nvm install && nvm use
+npm install -g yarn
+yarn install
+yarn prod

composer.json

@@ -11,32 +11,35 @@
   "require": {
     "php": ">=8.2",
     "ext-json": "*",
-    "craftcms/ckeditor": "3.8.2",
-    "craftcms/cms": "4.8.6",
-    "craftcms/postmark": "3.1.0",
-    "hybridinteractive/craft-position-fieldtype": "4.0.0",
-    "hybridinteractive/craft-width-fieldtype": "^4.0",
+    "craftcms/ckeditor": "^4.0",
+    "craftcms/cms": "5.3.6",
+    "craftcms/postmark": "^3.1.0",
+    "hybridinteractive/craft-position-fieldtype": "^5.0.0",
+    "hybridinteractive/craft-width-fieldtype": "^5.0.0",
     "jaybizzle/crawler-detect": "^1.2",
     "mikehaertl/php-shellcommand": "^1.6",
-    "mmikkel/cp-field-inspect": "1.4.4",
-    "nystudio107/craft-imageoptimize": "4.0.5",
-    "nystudio107/craft-vite": "4.0.9",
-    "percipioglobal/craft-password-policy": "4.1.0",
-    "statikbe/craft-carbon-tracker": "^4.1",
-    "statikbe/craft-config-values": "^2.0.0",
-    "statikbe/craft-cookie-banner": "^3.0.0",
-    "statikbe/craft-translate": "^2.1",
-    "statikbe/craft-video-parser": "^2.1.1",
+    "miranj/craft-obfuscator": "^1.2.0",
+    "mmikkel/cp-field-inspect": "2.0.2",
+    "nystudio107/craft-imageoptimize": "5.0.2",
+    "nystudio107/craft-vite": "5.0.1",
+    "percipioglobal/craft-password-policy": "^5.0.0-beta1",
+    "statikbe/craft-carbon-tracker": "5.0.2",
+    "statikbe/craft-config-values": "^5.0.0",
+    "statikbe/craft-cookie-banner": "^5.0.0",
+    "statikbe/craft-sentry": "^5.0.0",
+    "statikbe/craft-translate": "^5.0.0",
+    "statikbe/craft-video-parser": "^5.0.0",
     "studioespresso/craft-dumper": "5.0.1",
-    "studioespresso/craft-navigate": "3.1.3",
-    "studioespresso/craft-seo-fields": "4.0.7",
+    "studioespresso/craft-navigate": "^5.0.0",
+    "studioespresso/craft-seo-fields": "5.0.2",
     "vanderlee/syllable": "^1.7",
-    "verbb/element-index-defaults": "3.0.1",
-    "verbb/expanded-singles": "2.0.5",
-    "verbb/formie": "2.1.7",
-    "verbb/hyper": "1.1.25",
-    "verbb/super-table": "3.0.12",
-    "verbb/tablemaker": "4.0.9",
+    "verbb/element-index-defaults": "^4.0.0-beta.1",
+    "verbb/expanded-singles": "^3.0.0-beta.2",
+    "verbb/formie": "3.0.5",
+    "verbb/hyper": "2.0.4",
+    "verbb/image-resizer": "4.0.1",
+    "verbb/knock-knock": "3.0.1",
+    "verbb/tablemaker": "5.0.1",
     "vlucas/phpdotenv": "^5.4.1"
   },
   "autoload": {
@@ -49,7 +52,8 @@
     "optimize-autoloader": true,
     "allow-plugins": {
       "yiisoft/yii2-composer": true,
-      "craftcms/plugin-installer": true
+      "craftcms/plugin-installer": true,
+      "php-http/discovery": true
     }
   },
   "scripts": {