Merge branch 'main' into production

Author: MartinPaulEve

Dockerfile.php

@@ -113,6 +113,9 @@
     cd /app/plugins/hc-styles/ && php -d default_socket_timeout=30000 $(which composer) install --no-dev --no-interaction --no-progress --optimize-autoloader --no-cache
 RUN echo "Finished installing Composer dependencies"
 
+RUN cd /app/site/web/app/plugins/kcworks-on-wp && npm install @wordpress/scripts --save-dev && \
+    cd /app/site/web/app/plugins/kcworks-on-wp && npm ci && npm run build
+
 RUN cd /app/site/web/app/plugins/cc-client && npm ci && npm run build && \
     cd /app/themes/boss-child && npm ci && npm install gulp && node node_modules/gulp-cli/bin/gulp sass && \
     cd /app/themes/boss-child-refresh && npm ci && npm install gulp && node node_modules/gulp-cli/bin/gulp sass

composer.json

@@ -24,7 +24,7 @@
     },
     {
       "type": "vcs",
-      "url": "https://github.com/MESH-Research/kcworks-wp-plugin"
+      "url": "https://github.com/MESH-Research/kcworks-on-wp"
     },
     {
       "type": "path",
@@ -138,8 +138,9 @@
     "wpackagist-theme/stewart": "1.15",
     "wpackagist-plugin/hide-admin-bar-from-non-admins": "^1.0",
     "wpackagist-plugin/tainacan": "^0.21.7",
+    "wpackagist-plugin/cool-timeline": "^3.0.8",
     "mesh-research/cc-client": "dev-main",
-    "mesh-research/kcworks-wp-plugin": "0.4.2",
+    "mesh-research/kcworks-on-wp": "1.0.0",
     "wpackagist-plugin/feedzy-rss-feeds": "^4.4",
     "wpackagist-plugin/zotpress": "^7.4.1",
     "php-http/guzzle7-adapter": "^1.0",