Merge branch 'development' into release

diff --combined .gitignore
index 615013ff78371cf236a479194a8c405446024881,bdc523530f9175454a367f6d7dfa7a734e92bb33..ede4fe29601642d47a2c4b0614f20e8020dd934f
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,14 -1,16 +1,16 @@@
  /vendor
  /node_modules
+ /.vscode
+ /composer
  Homestead.yaml
  .env
  .idea
  npm-debug.log
  yarn-error.log
 -/public/dist
 +/public/dist/*.map
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /public/build/
  /public/favicon.ico
@@@ -21,8 -23,10 +23,10 @@@ yarn.loc
  nbproject
  .buildpath
  .project
+ .nvmrc
  .settings/
  webpack-stats.json
  .phpunit.result.cache
  .DS_Store
- phpstan.neon
+ phpstan.neon
+ esbuild-meta.json