@nextsparkjs/core 0.1.0-beta.192 → 0.1.0-beta.194

package/templates/projects/blog/lib/block-selectors.ts

@@ -0,0 +1,29 @@
+/**
+ * Block selectors, and a `sel` bound to them alone.
+ *
+ * Block components import `sel` from here, not from ./selectors: that file merges CORE_SELECTORS (every domain's
+ * map, ~10 kB gzip), and the loader that renders a page imports every block, so a block importing it puts the
+ * whole map on each public page. ./selectors re-exports BLOCK_SELECTORS, so Cypress still reaches the same paths.
+ */
+
+import { createSelectorHelpers } from '@nextsparkjs/core/lib/selectors/selector-factory'
+
+/**
+ * Block-specific selectors for the blog theme.
+ * Each block has at minimum a 'container' selector.
+ * Dynamic selectors use {index} placeholder.
+ */
+export const BLOCK_SELECTORS = {
+  // Blocks the pages and blog content features copy into the project (blocks/hero, blocks/post-content)
+  hero: {
+    container: 'block-hero',
+    cta: 'hero-cta',
+  },
+  postContent: {
+    container: 'block-post-content',
+    divider: 'post-content-divider',
+    cta: 'post-content-cta',
+  },
+} as const
+
+export const { sel } = createSelectorHelpers({ blocks: BLOCK_SELECTORS })

package/templates/projects/blog/lib/selectors.ts

@@ -10,20 +10,13 @@
  */
 
 import { createSelectorHelpers, CORE_SELECTORS } from '@nextsparkjs/core/selectors'
+import { BLOCK_SELECTORS } from './block-selectors'
 
 // =============================================================================
 // BLOCK SELECTORS
 // =============================================================================
 
-/**
- * Block-specific selectors for the blog theme.
- * Each block has at minimum a 'container' selector.
- * Dynamic selectors use {index} placeholder.
- */
-export const BLOCK_SELECTORS = {
-  // Blog theme currently has no custom blocks
-  // Add block selectors here when blocks are created
-} as const
+export { BLOCK_SELECTORS }
 
 // =============================================================================
 // ENTITY SELECTORS

package/templates/projects/blog/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nextsparkjs/theme-blog",
   "version": "0.1.0-beta.192",
-  "private": false,
+  "private": true,
   "type": "module",
   "main": "./config/theme.config.ts",
   "requiredPlugins": [],
@@ -14,17 +14,14 @@
     "@nextsparkjs/core": ">=0.1.0-0",
     "@nextsparkjs/testing": ">=0.1.0-0",
     "lucide-react": "^0.539.0",
-    "next": "^15.0.0 || ^16.0.0",
+    "next": "~16.3.6",
     "next-intl": "^4.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "zod": "^4.0.0"
   },
   "nextspark": {
     "type": "theme",
     "name": "blog"
-  },
-  "devDependencies": {
-    "@types/dompurify": "^3.2.0"
   }
 }

package/templates/projects/crm/lib/block-selectors.ts

@@ -0,0 +1,29 @@
+/**
+ * Block selectors, and a `sel` bound to them alone.
+ *
+ * Block components import `sel` from here, not from ./selectors: that file merges CORE_SELECTORS (every domain's
+ * map, ~10 kB gzip), and the loader that renders a page imports every block, so a block importing it puts the
+ * whole map on each public page. ./selectors re-exports BLOCK_SELECTORS, so Cypress still reaches the same paths.
+ */
+
+import { createSelectorHelpers } from '@nextsparkjs/core/lib/selectors/selector-factory'
+
+/**
+ * Block-specific selectors for the CRM theme.
+ * Each block has at minimum a 'container' selector.
+ * Dynamic selectors use {index} placeholder.
+ */
+export const BLOCK_SELECTORS = {
+  // Blocks the pages and blog content features copy into the project (blocks/hero, blocks/post-content)
+  hero: {
+    container: 'block-hero',
+    cta: 'hero-cta',
+  },
+  postContent: {
+    container: 'block-post-content',
+    divider: 'post-content-divider',
+    cta: 'post-content-cta',
+  },
+} as const
+
+export const { sel } = createSelectorHelpers({ blocks: BLOCK_SELECTORS })

package/templates/projects/crm/lib/selectors.ts

@@ -10,20 +10,13 @@
  */
 
 import { createSelectorHelpers, CORE_SELECTORS } from '@nextsparkjs/core/selectors'
+import { BLOCK_SELECTORS } from './block-selectors'
 
 // =============================================================================
 // BLOCK SELECTORS
 // =============================================================================
 
-/**
- * Block-specific selectors for the CRM theme.
- * Each block has at minimum a 'container' selector.
- * Dynamic selectors use {index} placeholder.
- */
-export const BLOCK_SELECTORS = {
-  // CRM theme currently has no custom blocks
-  // Add block selectors here when blocks are created
-} as const
+export { BLOCK_SELECTORS }
 
 // =============================================================================
 // ENTITY SELECTORS

package/templates/projects/crm/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nextsparkjs/theme-crm",
   "version": "0.1.0-beta.192",
-  "private": false,
+  "private": true,
   "type": "module",
   "main": "./config/theme.config.ts",
   "requiredPlugins": [],
@@ -13,10 +13,10 @@
     "@nextsparkjs/core": ">=0.1.0-0",
     "@nextsparkjs/testing": ">=0.1.0-0",
     "lucide-react": "^0.539.0",
-    "next": "^15.0.0 || ^16.0.0",
+    "next": "~16.3.6",
     "next-intl": "^4.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "zod": "^4.0.0"
   },
   "nextspark": {

package/templates/projects/crm/templates/dashboard/(main)/layout.tsx

@@ -5,28 +5,13 @@
 
 'use client'
 
-import { useState, createContext, useContext, ReactNode, useEffect } from 'react'
+import { useState, ReactNode, useEffect } from 'react'
 import { CRMSidebar } from '@/templates/shared/CRMSidebar'
 import { CRMTopBar } from '@/templates/shared/CRMTopBar'
 import { CRMMobileNav } from '@/templates/shared/CRMMobileNav'
+import { SidebarContext } from '@/templates/shared/CRMSidebarContext'
 import { cn } from '@nextsparkjs/core/lib/utils'
 
-// Context for sidebar state
-interface SidebarContextValue {
-  expanded: boolean
-  setExpanded: (value: boolean) => void
-}
-
-const SidebarContext = createContext<SidebarContextValue | undefined>(undefined)
-
-export function useCRMSidebar() {
-  const context = useContext(SidebarContext)
-  if (!context) {
-    return { expanded: false, setExpanded: () => {} }
-  }
-  return context
-}
-
 interface CRMDashboardLayoutProps {
   children: ReactNode
 }

package/templates/projects/crm/templates/shared/CRMSidebarContext.tsx

@@ -0,0 +1,23 @@
+/**
+ * CRM sidebar state, shared by the dashboard layout (provider) and any component that reads it.
+ * Lives outside the layout: Next only allows a layout to export its default component.
+ */
+
+'use client'
+
+import { createContext, useContext } from 'react'
+
+export interface SidebarContextValue {
+  expanded: boolean
+  setExpanded: (value: boolean) => void
+}
+
+export const SidebarContext = createContext<SidebarContextValue | undefined>(undefined)
+
+export function useCRMSidebar() {
+  const context = useContext(SidebarContext)
+  if (!context) {
+    return { expanded: false, setExpanded: () => {} }
+  }
+  return context
+}

package/templates/projects/productivity/entities/boards/boards.service.ts

@@ -82,9 +82,9 @@ export class BoardsService {
    */
   static async getById(id: string, userId: string): Promise<Board | null> {
     const result = await queryOneWithRLS<DbBoard>(
-      userId,
       `SELECT * FROM boards WHERE id = $1`,
-      [id]
+      [id],
+      userId
     )
 
     return result ? mapDbBoard(result) : null
@@ -121,9 +121,9 @@ export class BoardsService {
 
     // Get total count
     const countResult = await queryOneWithRLS<{ count: string }>(
-      userId,
       `SELECT COUNT(*) as count FROM boards ${whereClause}`,
-      params
+      params,
+      userId
     )
     const total = parseInt(countResult?.count || '0', 10)
 
@@ -135,9 +135,9 @@ export class BoardsService {
 
     params.push(limit, offset)
     const boards = await queryWithRLS<DbBoard>(
-      userId,
       `SELECT * FROM boards ${whereClause} ORDER BY ${validOrderBy} ${validOrderDir} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
-      params
+      params,
+      userId
     )
 
     return {
@@ -173,13 +173,13 @@ export class BoardsService {
       teamId,
     } = data
 
-    const result = await mutateWithRLS<DbBoard>(
-      userId,
+    const result = (await mutateWithRLS<DbBoard>(
       `INSERT INTO boards (name, description, color, is_archived, position, user_id, team_id)
        VALUES ($1, $2, $3, $4, $5, $6, $7)
        RETURNING *`,
-      [name, description, color, isArchived, position, userId, teamId]
-    )
+      [name, description, color, isArchived, position, userId, teamId],
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Failed to create board')
@@ -228,11 +228,11 @@ export class BoardsService {
     updates.push(`updated_at = NOW()`)
     params.push(id)
 
-    const result = await mutateWithRLS<DbBoard>(
-      userId,
+    const result = (await mutateWithRLS<DbBoard>(
       `UPDATE boards SET ${updates.join(', ')} WHERE id = $${paramIndex} RETURNING *`,
-      params
-    )
+      params,
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Board not found or access denied')
@@ -245,11 +245,11 @@ export class BoardsService {
    * Delete a board with RLS
    */
   static async delete(userId: string, id: string): Promise<boolean> {
-    const result = await mutateWithRLS<DbBoard>(
-      userId,
+    const result = (await mutateWithRLS<DbBoard>(
       `DELETE FROM boards WHERE id = $1 RETURNING *`,
-      [id]
-    )
+      [id],
+      userId
+    )).rows[0] ?? null
 
     return result !== null
   }

package/templates/projects/productivity/entities/cards/cards.service.ts

@@ -105,9 +105,9 @@ export class CardsService {
    */
   static async getById(id: string, userId: string): Promise<Card | null> {
     const result = await queryOneWithRLS<DbCard>(
-      userId,
       `SELECT * FROM cards WHERE id = $1`,
-      [id]
+      [id],
+      userId
     )
 
     return result ? mapDbCard(result) : null
@@ -162,9 +162,9 @@ export class CardsService {
 
     // Get total count
     const countResult = await queryOneWithRLS<{ count: string }>(
-      userId,
       `SELECT COUNT(*) as count FROM cards ${whereClause}`,
-      params
+      params,
+      userId
     )
     const total = parseInt(countResult?.count || '0', 10)
 
@@ -176,9 +176,9 @@ export class CardsService {
 
     params.push(limit, offset)
     const cards = await queryWithRLS<DbCard>(
-      userId,
       `SELECT * FROM cards ${whereClause} ORDER BY ${validOrderBy} ${validOrderDir} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
-      params
+      params,
+      userId
     )
 
     return {
@@ -218,13 +218,13 @@ export class CardsService {
       teamId,
     } = data
 
-    const result = await mutateWithRLS<DbCard>(
-      userId,
+    const result = (await mutateWithRLS<DbCard>(
       `INSERT INTO cards (title, description, list_id, board_id, position, due_date, assignee_id, labels, is_archived, user_id, team_id)
        VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
        RETURNING *`,
-      [title, description, listId, boardId, position, dueDate, assigneeId, JSON.stringify(labels), isArchived, userId, teamId]
-    )
+      [title, description, listId, boardId, position, dueDate, assigneeId, JSON.stringify(labels), isArchived, userId, teamId],
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Failed to create card')
@@ -293,11 +293,11 @@ export class CardsService {
     updates.push(`updated_at = NOW()`)
     params.push(id)
 
-    const result = await mutateWithRLS<DbCard>(
-      userId,
+    const result = (await mutateWithRLS<DbCard>(
       `UPDATE cards SET ${updates.join(', ')} WHERE id = $${paramIndex} RETURNING *`,
-      params
-    )
+      params,
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Card not found or access denied')
@@ -325,11 +325,11 @@ export class CardsService {
    * Delete a card with RLS
    */
   static async delete(userId: string, id: string): Promise<boolean> {
-    const result = await mutateWithRLS<DbCard>(
-      userId,
+    const result = (await mutateWithRLS<DbCard>(
       `DELETE FROM cards WHERE id = $1 RETURNING *`,
-      [id]
-    )
+      [id],
+      userId
+    )).rows[0] ?? null
 
     return result !== null
   }

package/templates/projects/productivity/entities/lists/lists.service.ts

@@ -78,9 +78,9 @@ export class ListsService {
    */
   static async getById(id: string, userId: string): Promise<List | null> {
     const result = await queryOneWithRLS<DbList>(
-      userId,
       `SELECT * FROM lists WHERE id = $1`,
-      [id]
+      [id],
+      userId
     )
 
     return result ? mapDbList(result) : null
@@ -123,9 +123,9 @@ export class ListsService {
 
     // Get total count
     const countResult = await queryOneWithRLS<{ count: string }>(
-      userId,
       `SELECT COUNT(*) as count FROM lists ${whereClause}`,
-      params
+      params,
+      userId
     )
     const total = parseInt(countResult?.count || '0', 10)
 
@@ -137,9 +137,9 @@ export class ListsService {
 
     params.push(limit, offset)
     const lists = await queryWithRLS<DbList>(
-      userId,
       `SELECT * FROM lists ${whereClause} ORDER BY ${validOrderBy} ${validOrderDir} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
-      params
+      params,
+      userId
     )
 
     return {
@@ -174,13 +174,13 @@ export class ListsService {
       teamId,
     } = data
 
-    const result = await mutateWithRLS<DbList>(
-      userId,
+    const result = (await mutateWithRLS<DbList>(
       `INSERT INTO lists (name, board_id, position, is_archived, user_id, team_id)
        VALUES ($1, $2, $3, $4, $5, $6)
        RETURNING *`,
-      [name, boardId, position, isArchived, userId, teamId]
-    )
+      [name, boardId, position, isArchived, userId, teamId],
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('Failed to create list')
@@ -224,11 +224,11 @@ export class ListsService {
     updates.push(`updated_at = NOW()`)
     params.push(id)
 
-    const result = await mutateWithRLS<DbList>(
-      userId,
+    const result = (await mutateWithRLS<DbList>(
       `UPDATE lists SET ${updates.join(', ')} WHERE id = $${paramIndex} RETURNING *`,
-      params
-    )
+      params,
+      userId
+    )).rows[0] ?? null
 
     if (!result) {
       throw new Error('List not found or access denied')
@@ -241,11 +241,11 @@ export class ListsService {
    * Delete a list with RLS
    */
   static async delete(userId: string, id: string): Promise<boolean> {
-    const result = await mutateWithRLS<DbList>(
-      userId,
+    const result = (await mutateWithRLS<DbList>(
       `DELETE FROM lists WHERE id = $1 RETURNING *`,
-      [id]
-    )
+      [id],
+      userId
+    )).rows[0] ?? null
 
     return result !== null
   }

package/templates/projects/productivity/lib/block-selectors.ts

@@ -0,0 +1,29 @@
+/**
+ * Block selectors, and a `sel` bound to them alone.
+ *
+ * Block components import `sel` from here, not from ./selectors: that file merges CORE_SELECTORS (every domain's
+ * map, ~10 kB gzip), and the loader that renders a page imports every block, so a block importing it puts the
+ * whole map on each public page. ./selectors re-exports BLOCK_SELECTORS, so Cypress still reaches the same paths.
+ */
+
+import { createSelectorHelpers } from '@nextsparkjs/core/lib/selectors/selector-factory'
+
+/**
+ * Block-specific selectors for the productivity theme.
+ * Each block has at minimum a 'container' selector.
+ * Dynamic selectors use {index} placeholder.
+ */
+export const BLOCK_SELECTORS = {
+  // Blocks the pages and blog content features copy into the project (blocks/hero, blocks/post-content)
+  hero: {
+    container: 'block-hero',
+    cta: 'hero-cta',
+  },
+  postContent: {
+    container: 'block-post-content',
+    divider: 'post-content-divider',
+    cta: 'post-content-cta',
+  },
+} as const
+
+export const { sel } = createSelectorHelpers({ blocks: BLOCK_SELECTORS })

package/templates/projects/productivity/lib/selectors.ts

@@ -10,20 +10,13 @@
  */
 
 import { createSelectorHelpers, CORE_SELECTORS } from '@nextsparkjs/core/selectors'
+import { BLOCK_SELECTORS } from './block-selectors'
 
 // =============================================================================
 // BLOCK SELECTORS
 // =============================================================================
 
-/**
- * Block-specific selectors for the productivity theme.
- * Each block has at minimum a 'container' selector.
- * Dynamic selectors use {index} placeholder.
- */
-export const BLOCK_SELECTORS = {
-  // Productivity theme currently has no custom blocks
-  // Add block selectors here when blocks are created
-} as const
+export { BLOCK_SELECTORS }
 
 // =============================================================================
 // ENTITY SELECTORS

package/templates/projects/productivity/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nextsparkjs/theme-productivity",
   "version": "0.1.0-beta.192",
-  "private": false,
+  "private": true,
   "type": "module",
   "main": "./config/theme.config.ts",
   "requiredPlugins": [],
@@ -17,9 +17,9 @@
     "@nextsparkjs/core": ">=0.1.0-0",
     "@nextsparkjs/testing": ">=0.1.0-0",
     "lucide-react": "^0.539.0",
-    "next": "^15.0.0 || ^16.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "next": "~16.3.6",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "zod": "^4.0.0"
   },
   "nextspark": {

package/templates/projects/starter/lib/block-selectors.ts

@@ -0,0 +1,28 @@
+/**
+ * Block selectors, and a `sel` bound to them alone.
+ *
+ * Block components import `sel` from here, not from ./selectors: that file merges CORE_SELECTORS (every domain's
+ * map, ~10 kB gzip), and the loader that renders a page imports every block, so a block importing it puts the
+ * whole map on each public page. ./selectors re-exports BLOCK_SELECTORS, so Cypress still reaches the same paths.
+ */
+
+import { createSelectorHelpers } from '@nextsparkjs/core/lib/selectors/selector-factory'
+
+/**
+ * Block-specific selectors for the starter theme.
+ * Each block has at minimum a 'container' selector.
+ * Dynamic selectors use {index} placeholder.
+ */
+export const BLOCK_SELECTORS = {
+  hero: {
+    container: 'block-hero',
+    cta: 'hero-cta',
+  },
+  postContent: {
+    container: 'block-post-content',
+    divider: 'post-content-divider',
+    cta: 'post-content-cta',
+  },
+} as const
+
+export const { sel } = createSelectorHelpers({ blocks: BLOCK_SELECTORS })

package/templates/projects/starter/lib/selectors.ts

@@ -10,22 +10,13 @@
  */
 
 import { createSelectorHelpers, CORE_SELECTORS } from '@nextsparkjs/core/selectors'
+import { BLOCK_SELECTORS } from './block-selectors'
 
 // =============================================================================
 // BLOCK SELECTORS
 // =============================================================================
 
-/**
- * Block-specific selectors for the starter theme.
- * Each block has at minimum a 'container' selector.
- * Dynamic selectors use {index} placeholder.
- */
-export const BLOCK_SELECTORS = {
-  hero: {
-    container: 'block-hero',
-    cta: 'hero-cta',
-  },
-} as const
+export { BLOCK_SELECTORS }
 
 // =============================================================================
 // THEME SELECTORS (CORE + BLOCKS)