nextpress-core 3.0.1 → 3.1.1

package/cli/np-install.js

@@ -33,3 +33,5 @@ write(
     path.join(__dirname, '..', 'lib', 'wp-lib', 'src'),
     path.join(process.cwd(), 'wp', 'wp-content', 'themes', 'nextpress_theme', '.nextpress')
 )
+
+console.log('Nextpress installation successful.');

package/lib/container-lib/.env.example

@@ -0,0 +1,23 @@
+# ==========================================
+# Database Configuration (MySQL)
+# ==========================================
+
+MYSQL_ROOT_PASSWORD={{MYSQL_ROOT_PASSWORD}}
+MYSQL_DATABASE={{MYSQL_DATABASE}}
+
+# ==========================================
+# Domain Configuration
+# ==========================================
+DOMAIN_NAME={{DOMAIN_NAME}}
+PROTOCOL={{PROTOCOL}}
+
+# ==========================================
+# WordPress / WP-CLI Configuration
+# ==========================================
+WP_SITE_URL=${PROTOCOL}://${DOMAIN_NAME}
+WP_SITE_TITLE={{WP_SITE_TITLE}}
+WP_ADMIN_USER={{WP_ADMIN_USER}}
+WP_ADMIN_PASSWORD={{WP_ADMIN_PASSWORD}}
+WP_ADMIN_EMAIL={{WP_ADMIN_EMAIL}}
+
+CROSS_CONTAINER_API_KEY={{CROSS_CONTAINER_API_KEY}}

package/lib/container-lib/docker-compose.yml

@@ -116,6 +116,7 @@ services:
       DATABASE_URL: mysql://root:${MYSQL_ROOT_PASSWORD}@db:3306/${MYSQL_DATABASE}
       WP_SERVICE_URL: http://wordpress:80
       WP_SITE_URL: ${WP_SITE_URL}
+      DOMAIN_NAME: ${DOMAIN_NAME}
       CROSS_CONTAINER_API_KEY: ${CROSS_CONTAINER_API_KEY}
     healthcheck:
       test: ["CMD-SHELL", "wget --spider -q http://0.0.0.0:3000 || exit 1"]
@@ -138,10 +139,12 @@ services:
       next-js:
         condition: service_healthy
     ports:
-      - "8080:80"
+      - "80:80"
     volumes:
       - ./node_modules/nextpress-core/lib/container-lib/nginx.conf:/etc/nginx/conf.d/default.conf:ro
       - ./nginx.extend.conf:/etc/nginx/snippets/extend.conf:ro
+    environment:
+      DOMAIN_NAME: ${DOMAIN_NAME}
     healthcheck:
       test: ["CMD-SHELL", "pgrep nginx || exit 1"]
       interval: 30s

package/lib/container-lib/nginx.conf

@@ -1,5 +1,7 @@
 server {
     listen 80;
+    server_name ${DOMAIN_NAME};
+
     access_log off;
     client_max_body_size 256M;
 

package/lib/nextjs-lib/globals/get-field/get-field.ts

@@ -23,7 +23,7 @@ declare global {
         fieldGroup: T,
         selector: K,
         location?: Location
-    ) => Promise<FieldProps<T>[K]>;
+    ) => Promise<FieldProps<T>[K] | undefined>;
 }
 
 globalThis.getField = async (fieldGroup, selector, location) => {
@@ -41,7 +41,7 @@ globalThis.getField = async (fieldGroup, selector, location) => {
             //     break;
         }
     }
-    if (!location) return [];
+    if (!location) return;
 
     const values = await (async () => {
         if (location === 'options') {

package/lib/nextjs-lib/nextpress.next.config.ts

@@ -0,0 +1,22 @@
+import type { NextConfig } from "next";
+
+const wpUrl = new URL(process.env.WP_SERVICE_URL ?? '');
+
+const nextpressNextConfig: NextConfig = {
+    reactCompiler: true,
+    images: {
+        dangerouslyAllowLocalIP: true, // Required compromise to allow cross fetching within docker container
+        remotePatterns: [
+            {
+                protocol: wpUrl.protocol.replace(':', '') === 'https' ? 'https' : 'http',
+                hostname: wpUrl.hostname,
+                port: wpUrl.port || undefined,
+                pathname: '/wp-content/uploads/**',
+            },
+        ],
+        qualities: [25, 50, 75, 100],
+    },
+    allowedDevOrigins: [process.env.DOMAIN_NAME ?? ''],
+};
+
+export default nextpressNextConfig;

package/lib/nextjs-lib/services/get-menu.ts

@@ -1,18 +1,18 @@
 import { IMenuItem } from "../entities/post/post.interface";
 import { getThemeMods } from "./get-theme-mods";
 
-type Menu = {
-    menuItem: IMenuItem,
-    children: Menu[]
+export type NextpressMenu = {
+    item: IMenuItem,
+    children: NextpressMenu[]
 }
 
 /**
  * Retrieves a menu by its location identifier.
  *
  * @param {string} menuLocation - The location identifier of the menu.
- * @returns {Promise<Menu[] | undefined>} An array of menu items representing the menu tree, or undefined if the menu is not found.
+ * @returns {Promise<NextpressMenu[] | undefined>} An array of menu items representing the menu tree, or undefined if the menu is not found.
  */
-export async function getMenu(menuLocation: string): Promise<Menu[] | undefined> {
+export async function getMenu(menuLocation: string): Promise<NextpressMenu[] | undefined> {
     const navMenuLocations = await getThemeMods('nav_menu_locations');
     if (!navMenuLocations || typeof navMenuLocations !== 'object') return;
 
@@ -40,8 +40,8 @@ export async function getMenu(menuLocation: string): Promise<Menu[] | undefined>
         }
     }
 
-    const map = new Map<number, Menu>();
-    const tree: Menu[] = [];
+    const map = new Map<number, NextpressMenu>();
+    const tree: NextpressMenu[] = [];
 
     for (const item of menuItems) {
         if (!item.menuItemAttributes) continue;
@@ -71,8 +71,8 @@ export async function getMenu(menuLocation: string): Promise<Menu[] | undefined>
             menuItemAttributes
         };
 
-        const node: Menu = {
-            menuItem: safeItem,
+        const node: NextpressMenu = {
+            item: safeItem,
             children: []
         };
 
@@ -96,7 +96,7 @@ export async function getMenu(menuLocation: string): Promise<Menu[] | undefined>
 
         if (parentNode) {
             parentNode.children.push(currentNode);
-            map.set(parentNode.menuItem.ID, parentNode);
+            map.set(parentNode.item.ID, parentNode);
         }
     }
 

package/lib/wp-lib/src/nextpress_remove_menu_pages.php

@@ -7,8 +7,8 @@ add_action('admin_menu', function() {
 
     // Create a brand new top-level menu item for Customize
     add_menu_page(
-        'Customize',                           // Page title
-        'Customize',                           // Menu title
+        __('Customize'),                       // Page title
+        __('Customize'),                       // Menu title
         'edit_theme_options',                  // Capability required to see it
         'customize.php',                       // Direct link to the Customizer
         '',                                    // No function needed for an existing file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextpress-core",
-  "version": "3.0.1",
+  "version": "3.1.1",
   "description": "Nextpress Core",
   "keywords": [],
   "bin": {