Merge pull request #99 from devgateway/task/DVIZ-61/worpress-cleanup

chore(DVIZ-61): General Wordpress cleanup

Author: timothygachengo

.dockerignore

@@ -1,16 +1,38 @@
 wp-theme/_functions.php
 wp-content/debug.log
 wp-content/uploads
+# Exclude node_modules (289MB+ directories that shouldn't be in build context)
 node_modules/
+data/
 .git
+
+# Build artifacts
 dist
+*.tgz
+
+# Packages not needed in container
 packages/create-wp-customizer/
 packages/upgrade-wp-customizer/
-# Log files
-*.log
+packages/*/node_modules
+plugins/*/node_modules
+plugins/*/*/node_modules
+
+# Development files
 .vscode/
 .github/
 .idea/
+.changeset/
+*.log
+.env
+.env.*
+
+# Docker files
 nginx/
-docker-compose.*
-.changeset/
+docker-compose*
+Dockerfile*
+.dockerignore
+
+# Documentation
+README.md
+*.md
+!wp-theme/README.md

.gitignore

@@ -12,3 +12,4 @@ dist/
 data/
 wp-content/uploads/
 wp-content/plugins
+wp-content/

Dockerfile

@@ -6,24 +6,32 @@ RUN echo "Installing corepack..."
 ENV COREPACK_INTEGRITY_KEYS=0
 RUN corepack enable
 
-COPY . /app
 WORKDIR /app
 
+
 FROM base AS builder
 ENV NODE_ENV=production
 
+COPY pnpm-lock.yaml /app/pnpm-lock.yaml
+COPY pnpm-workspace.yaml /app/pnpm-workspace.yaml
+COPY package.json /app/package.json
+
+#Packages
+COPY packages/commons/package.json /app/packages/commons/package.json
+COPY plugins/wp-react-blocks-plugin/blocks/package.json /app/plugins/wp-react-blocks-plugin/blocks/package.json
+
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
-  --mount=type=bind,source=package.json,target=package.json \
-  --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
-  --mount=type=bind,source=packages/commons/package.json,target=packages/commons/package.json \
-  pnpm install --frozen-lockfile
+  pnpm install --frozen-lockfile --shamefully-hoist
+
+WORKDIR /app
+COPY . /app
+
 
 # Build the plugins
 RUN BLOCKS_CATEGORY=wp-react-lib-blocks BLOCKS_NS=viz \
-pnpm --filter="@devgateway/dvz-wp-commons" --filter="dg-react-blocks" build
+pnpm -r --filter="@devgateway/dvz-wp-commons" --filter="dg-react-blocks" build
 
 # Organize WordPress files to the container
-COPY wp-content wp-content
 COPY wp-theme wp-content/themes/dg-semantic
 
 # Copy built plugins from workspace into wp-content so built assets are included
@@ -34,7 +42,7 @@ RUN mkdir -p wp-content/plugins \
 RUN chown -R 82:82 wp-content \
   && tar -caf /wp-content.tgz --exclude="**/node_modules" wp-content
 
-FROM wordpress:6.8.2-fpm-alpine AS runtime
+FROM wordpress:6.9.1-fpm-alpine AS runtime
 LABEL org.opencontainers.image.description="WordPress image for Data Viz"
 LABEL org.opencontainers.image.authors="Development Gateway <info@developmentgateway.org>"
 LABEL org.opencontainers.image.url="https://github.com/devgateway/data-viz-wordpress"
@@ -48,5 +56,7 @@ COPY --chmod=755 wordpress.sh /usr/local/sbin/
 
 EXPOSE 80 443
 
+USER www-data
+
 ENTRYPOINT ["/usr/local/sbin/wordpress.sh"]
 CMD ["php-fpm"]

custom/custom.ini

@@ -1,2 +1,9 @@
-upload_max_filesize = 20M
-post_max_size = 21M
+; File upload limits (match nginx client_max_body_size)
+upload_max_filesize = 100M
+post_max_size = 100M
+
+
+; Security hardening
+expose_php = Off
+; display_errors = Off
+; log_errors = On

docker-compose.override.yml

@@ -5,12 +5,11 @@ services:
       - 80:80
     volumes:
       - ./data/wordpress:/var/www/html:ro
-      - ./wp-content:/var/www/html/wp-content
+      # - ./wp-content:/var/www/html/wp-content
       - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
       - ./plugins/wp-react-blocks-plugin:/var/www/html/wp-content/plugins/wp-react-blocks-plugin
       - ./plugins/wp-react-blocks-plugin/blocks/build:/var/www/html/wp-content/plugins/wp-react-blocks-plugin/blocks/build
       - ./plugins/wp-react-custom-rest-menu:/var/www/html/wp-content/plugins/wp-react-custom-rest-menu
-      - ./plugins/wp-react-custom-multilang:/var/www/html/wp-content/plugins/wp-multilang
       - ./wp-theme:/var/www/html/wp-content/themes/dg-semantic
     depends_on:
       - wordpress
@@ -21,14 +20,13 @@ services:
       dockerfile: Dockerfile
     volumes:
       - ./data/wordpress:/var/www/html
-      - ./wp-content:/var/www/html/wp-content
+      # - ./wp-content:/var/www/html/wp-content
       - ./plugins/wp-react-blocks-plugin:/var/www/html/wp-content/plugins/wp-react-blocks-plugin
       - ./plugins/wp-react-blocks-plugin/blocks/build:/var/www/html/wp-content/plugins/wp-react-blocks-plugin/blocks/build
-      - ./plugins/wp-react-custom-rest-menu:/var/www/html/wp-content/plugins/wp-react-custom-rest-menu
-      - ./plugins/wp-react-custom-multilang:/var/www/html/wp-content/plugins/wp-multilang
+      - ./plugins/wp-react-custom-rest-menu:/var/www/html/wp-content/plugins/wp-react-custom-rest-menu 
       - ./wp-theme:/var/www/html/wp-content/themes/dg-semantic
     environment:
-      environment:
+      SKIP_WP_UPDATE: true
       WORDPRESS_DB_HOST: mysql
       WORDPRESS_DB_USER: wordpress
       WORDPRESS_DB_PASSWORD: wordpress

docker-compose.yml

@@ -16,13 +16,14 @@ services:
     volumes:
       - wordpress:/var/www/html
     environment:
-      environment:
       WORDPRESS_DB_HOST: mysql
       WORDPRESS_DB_USER: wordpress
       WORDPRESS_DB_PASSWORD: wordpress
       WORDPRESS_DB_NAME: wordpress
     depends_on:
-      - mysql
+      mysql:
+        condition: service_healthy
+    restart: unless-stopped
 
   mysql:
     image: mariadb:10.7-focal
@@ -33,7 +34,8 @@ services:
       MYSQL_DATABASE: wordpress
       MYSQL_USER: wordpress
       MYSQL_PASSWORD: wordpress
+    restart: unless-stopped
 
 volumes:
-  wordpress_data:
+  wordpress:
   mysql:

package.json

@@ -33,6 +33,7 @@
   "packageManager": "pnpm@10.18.1",
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.1",
-    "@changesets/cli": "^2.29.7"
+    "@changesets/cli": "^2.29.7",
+    "@wordpress/scripts": "^30.25.0"
   }
 }

plugins-required.md

@@ -0,0 +1,33 @@
+# WordPress Plugins
+
+## wp-content/plugins
+- Advanced Custom Fields
+- Akismet Anti-spam
+- Better Search Replace
+- Custom Post Type Permalinks
+- Custom Post Type UI
+- Custom Taxonomy Order NE
+- Duplicate WP Page Post
+- Flexible Table Block
+- Folders
+- Hyperlink Group Block
+- Intuitive Custom Post Order
+- Menu Image
+- Post Types Order
+- Simple Post Type Permalinks
+- SVG Support
+- WordPress Importer
+- Yoast SEO
+- WP Database Backup
+
+## wp-theme/plugins
+- Advanced Custom Fields
+- Akismet Anti-spam
+- Better Search Replace
+- Custom Post Type Permalinks
+- Custom Post Type UI
+- Duplicate WP Page Post
+- SVG Support
+- WordPress Importer
+- Yoast SEO
+- WP Multilang

plugins/wp-react-blocks-plugin/index.php

@@ -1,54 +1,2 @@
 <?php
-/**
- * Plugin Name: React Components
- * Plugin URI: https://github.com/devgateway/wp-rteact-lib
- * Description: Custom UI Components for viz.
- * Version: 0.1.2
- * Author: Sebastian Dimunzio
-  * @package dg
- */
-defined( 'ABSPATH' ) || exit;
-
-function add_custom_block_categories( $categories, $post ) {
-	return array_merge(
-		$categories,
-		array(
-			array(
-				'slug' => 'wp-react-lib-blocks',
-				'title' => __( 'React Blocks', 'wp-react-lib-blocks' ),
-			),
-		)
-	);
-}
-add_filter( 'block_categories', 'add_custom_block_categories', 10, 2);
-
-
-function register_scripts(){
-wp_register_script( 'dummy-handle-header2', '' );
-
-
-wp_enqueue_script( 'dummy-handle-header2' );
-
-        if (function_exists('wpm_get_language')) {
-             wp_add_inline_script( 'dummy-handle-header2', '
-                console.log("----- Language -----'.wpm_get_language().'----------") ;
-                console.log("---- -User Language -----'.wpm_get_user_language().'----------") ;
-                window._user_locale="'.wpm_get_user_language().'" ;
-                window._page_locale="'.wpm_get_language().'" ;' );
-            }else{
-             wp_add_inline_script( 'dummy-handle-header2', '
-                console.log("---------- en ----------") ;
-                console.log("---------- en ----------") ;
-                window._user_locale="en" ;
-                window._page_locale="en" ;' );
-
-            }
-
-}
-add_action( 'admin_enqueue_scripts', 'register_scripts' );
-
-
-
-
-include 'blocks/index.php';
-
+// Silence is golden.

plugins/wp-react-blocks-plugin/wp-react-blocks-plugin.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Plugin Name: React Components
+ * Plugin URI: https://github.com/devgateway/wp-rteact-lib
+ * Description: Custom UI Components for viz.
+ * Version: 0.1.2
+ * Author: Sebastian Dimunzio
+  * @package dg
+ */
+defined( 'ABSPATH' ) || exit;
+
+function add_custom_block_categories( $categories, $post ) {
+	return array_merge(
+		$categories,
+		array(
+			array(
+				'slug' => 'wp-react-lib-blocks',
+				'title' => __( 'React Blocks', 'wp-react-lib-blocks' ),
+			),
+		)
+	);
+}
+add_filter( 'block_categories', 'add_custom_block_categories', 10, 2);
+
+
+function register_scripts(){
+wp_register_script( 'dummy-handle-header2', '' );
+
+
+wp_enqueue_script( 'dummy-handle-header2' );
+
+        if (function_exists('wpm_get_language')) {
+             wp_add_inline_script( 'dummy-handle-header2', '
+                console.log("----- Language -----'.wpm_get_language().'----------") ;
+                console.log("---- -User Language -----'.wpm_get_user_language().'----------") ;
+                window._user_locale="'.wpm_get_user_language().'" ;
+                window._page_locale="'.wpm_get_language().'" ;' );
+            }else{
+             wp_add_inline_script( 'dummy-handle-header2', '
+                console.log("---------- en ----------") ;
+                console.log("---------- en ----------") ;
+                window._user_locale="en" ;
+                window._page_locale="en" ;' );
+
+            }
+
+}
+add_action( 'admin_enqueue_scripts', 'register_scripts' );
+
+
+
+
+include 'blocks/index.php';
+