@pasosdejesus/m 0.30.1 → 0.31.1

package/dist/templates/README.md.hbs

@@ -8,12 +8,12 @@ Generated with **m** — a CLI for Next.js + PostgreSQL + Hardhat.
 
 ## Quick Test (no PostgreSQL required)
 
-Run the Next.js dev server immediately:
+`pnpm install` instala **todo el workspace** (`apps/web`, `apps/contracts` y los motores
+vendorizados en `packages/generated/*`); luego arranca el servidor de Next:
 
 ```bash
-cd apps/nextjs
-pnpm install
-pnpm dev
+pnpm install          # una sola instalación para todas las apps
+cd apps/web && pnpm dev
 ```
 
 Open http://localhost:3000 — you should see the welcome page.
@@ -32,7 +32,7 @@ npm install -g pnpm@10
 If using Hardhat on OpenBSD/adJ, run the preparation script:
 
 ```bash
-cd apps/hardhat && bin/prepadJ.sh
+cd apps/contracts && bin/prepadJ.sh
 ```
 
 ### 2. Configure environment
@@ -50,7 +50,7 @@ Key variables for OpenBSD/adJ:
 ### 3. Create the database
 
 ```bash
-cd apps/nextjs
+cd apps/web
 ./bin/m db:super:createuser
 ./bin/m db:migrate
 ```
@@ -58,17 +58,22 @@ cd apps/nextjs
 ### 4. Start development
 
 ```bash
-cd apps/nextjs && pnpm dev
+cd apps/web && pnpm dev
 ```
 
 ## Project Structure
 
-- `apps/nextjs/` — Next.js frontend with Rails-like backend
-- `apps/hardhat/` — Hardhat smart contracts
+- `package.json` + `pnpm-workspace.yaml` — **workspace raíz**: un lockfile, una instalación y
+  versiones compartidas por **catálogo** (`@pasosdejesus/*`, `next`, `react`, `viem`, …)
+- `apps/web/` — Next.js frontend with Rails-like backend (incluye `bin/m`)
+- `apps/contracts/` — Solidity smart contracts (Hardhat)
+- `packages/generated/` — motores vendorizados (`bin/m eng:sync --vendor`)
 - `apps/.env` — Unified environment config
 
 ## Available Commands
 
+Comandos (desde `apps/web`):
+
 ```bash
 ./bin/m --help        # All commands (adapts to your project)
 ./bin/m db:create     # Create database
@@ -87,10 +92,12 @@ cd apps/nextjs && pnpm dev
 ## Testing
 
 ```bash
-cd apps/nextjs && pnpm test
-cd apps/hardhat && yarn test
+cd apps/web && pnpm test
+cd apps/contracts && pnpm test
 ```
 
+Desde la raíz: `make test` y `make type` corren ambos; `make all` instala (y compila).
+
 ## Troubleshooting
 
 ### pnpm issues on OpenBSD

package/dist/templates/apps/{hardhat → contracts}/Makefile

@@ -1,13 +1,13 @@
 .PHONY: test type compile deploy-mock-usdt
 
 test:
-	yarn test
+	pnpm test
 
 type:
-	yarn build
+	pnpm build
 
 compile:
-	yarn compile
+	pnpm compile
 
 deploy-mock-usdt:
-	yarn deploy-mock-usdt
+	pnpm deploy-mock-usdt

package/dist/templates/apps/{hardhat → contracts}/README.md

@@ -70,7 +70,7 @@ Runs `hardhat test` with the built-in Hardhat Network (requires native EDR binar
 ### OpenBSD / adJ
 
 ```sh
-cd ../nextjs && pnpm contract:test
+cd ../web && pnpm contract:test
 ```
 
 Uses `@ethereumjs/vm` fallback via `@pasosdejesus/edr`. Run from the
@@ -78,7 +78,7 @@ nextjs app directory.
 
 ## ABI Synchronization
 
-ABIs are synced to `../nextjs/abis/` automatically on `pnpm build`.
+ABIs are synced to `../web/abis/` automatically on `pnpm build`.
 Manual sync: `pnpm sync:abis`.
 
 ## Best Practices

package/dist/templates/apps/{hardhat/package.json → contracts/package.json.hbs}

@@ -1,5 +1,5 @@
 {
-  "name": "@stable-sl/hardhat",
+  "name": "{{name}}-contracts",
   "license": "MIT",
   "version": "1.0.0",
   "devDependencies": {
@@ -14,7 +14,7 @@
     "@typechain/hardhat": "^9.1.0",
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.7",
-    "@pasosdejesus/usdt": "^0.1.3",
+    "@pasosdejesus/usdt": "catalog:",
     "chai": "^4.2.0",
     "ethers": "^6.15.0",
     "hardhat": ">=2.27.0 <3.0.0",
@@ -24,13 +24,13 @@
     "ts-node": "^10.9.2",
     "typechain": "^8.3.2",
     "tsx": "^4.21.0",
-    "typescript": "^5.5.3"
+    "typescript": "catalog:"
   },
   "dependencies": {
     "@nomicfoundation/hardhat-ignition": "0.15.0",
     "@openzeppelin/contracts": "^5.4.0",
-    "dotenv": "^17.2.3",
-    "viem": "^2.40.0"
+    "dotenv": "catalog:",
+    "viem": "catalog:"
   },
   "scripts": {
     "postinstall": "chmod +x sync-abis.mjs",
@@ -51,6 +51,5 @@
     "prettier": "prettier --write 'contracts/**/*.sol' '**/*.ts'",
     "sync:abis": "node sync-abis.mjs"
   },
-  "author": "pasosdeJesus",
-  "packageManager": "pnpm@10.34.5"
+  "author": "pasosdeJesus"
 }

package/dist/templates/apps/{hardhat → contracts}/scripts/sync-usdt.mjs

@@ -8,8 +8,8 @@
 // (derivado, no se edita a mano).
 //
 // Funciona desde cualquier proyecto cuyo node_modules tenga el paquete
-// (apps/hardhat con link:, o packages/<motor>/contracts con symlink al
-// node_modules de apps/hardhat).
+// (apps/contracts con link:, o packages/<motor>/contracts con symlink al
+// node_modules de apps/contracts).
 import { cpSync, existsSync } from 'fs'
 import { join } from 'path'
 

package/dist/templates/apps/{hardhat → contracts}/sync-abis.mjs

@@ -5,11 +5,11 @@ import path from 'path'
 
 // Configuration - directory files
 const HARDHAT_ARTIFACTS_PATH = './artifacts/contracts'
-const NEXTJS_ABI_PATH = '../nextjs/abis'
+const WEB_ABI_PATH = '../web/abis'
 
 // Create the React ABI directory if it doesn't exist
-if (!fs.existsSync(NEXTJS_ABI_PATH)) {
-  fs.mkdirSync(NEXTJS_ABI_PATH, { recursive: true })
+if (!fs.existsSync(WEB_ABI_PATH)) {
+  fs.mkdirSync(WEB_ABI_PATH, { recursive: true })
 }
 
 // Function to walk through directories recursively
@@ -45,7 +45,7 @@ try {
     const contractName = filename.replace('.json', '')
 
     // Extract just the ABI and save it to the Next.js directory
-    const abiPath = path.join(NEXTJS_ABI_PATH, `${contractName}.json`)
+    const abiPath = path.join(WEB_ABI_PATH, `${contractName}.json`)
     fs.writeFileSync(abiPath, JSON.stringify(artifact.abi, null, 2))
     console.log(`Copied ABI for ${contractName}`)
   })

package/dist/templates/apps/{nextjs → web}/Makefile

@@ -20,7 +20,3 @@ dev:
 prod:
 	sh -c 'ulimit -d 7340032 && pnpm build'
 	./bin/start > prod.log 2>&1 &
-
-all:
-	pnpm i
-	sh -c 'ulimit -d 7340032 && pnpm build'

package/dist/templates/apps/{nextjs → web}/package.json.hbs

@@ -1,6 +1,5 @@
-
 {
-  "name": "{{name}}",
+  "name": "{{name}}-web",
   "version": "0.0.0",
   "description": "{{description}}",
   "type": "module",
@@ -16,13 +15,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pasosdejesus/m": "^{{m_version}}",
-    "dotenv": "^17.4.2",
-    "kysely-postgres-js": "3.0.0",
-    "next": "^16.0.0",
-    "pg": "8.17.2",
-    "react": "19.3.0",
-    "react-dom": "19.3.0"
+    "@pasosdejesus/m": "catalog:",
+    "dotenv": "catalog:",
+    "kysely-postgres-js": "catalog:",
+    "next": "catalog:",
+    "pg": "catalog:",
+    "react": "catalog:",
+    "react-dom": "catalog:"
   },
   "devDependencies": {
     "@testing-library/react": "16.3.2",
@@ -33,17 +32,16 @@
     "autoprefixer": "^10.5.0",
     "dotenv-cli": "^7.4.4",
     "jsdom": "^29.1.1",
-    "kysely": "0.28.17",
+    "kysely": "catalog:",
     "kysely-codegen": "0.19.0",
     "kysely-ctl": "0.20.0",
     "next-auth": "4.24.15",
     "postcss": "^8.5.15",
     "siwe": "2.3.2",
     "tailwindcss": "3.4.19",
-    "typescript": "5.9.3",
-    "viem": "^2.51.0",
+    "typescript": "catalog:",
+    "viem": "catalog:",
     "vitest": "3.2.6",
     "wagmi": "2.19.5"
-  },
-  "packageManager": "pnpm@10.34.5"
+  }
 }

package/dist/templates/package.json.hbs

@@ -0,0 +1,12 @@
+{
+  "name": "{{name}}",
+  "private": true,
+  "description": "{{description}}",
+  "packageManager": "pnpm@10.34.5",
+  "scripts": {
+    "dev": "pnpm -r dev",
+    "build": "pnpm -r build",
+    "test": "pnpm -r test",
+    "typecheck": "pnpm -r typecheck"
+  }
+}

package/dist/templates/pnpm-workspace.yaml.hbs

@@ -0,0 +1,42 @@
+# Workspace raíz: una sola instalación, un solo lockfile y versiones compartidas por catálogo.
+#
+# Los motores vendorizados (`packages/generated/*`) son miembros del workspace, así que
+# instalan sus propias dependencias y su puente (`generated-<motor>`) se resuelve solo.
+packages:
+  - 'apps/*'
+  - 'packages/*'
+  - 'packages/generated/*'
+
+# Versión única por dependencia: las apps escriben `"catalog:"`.
+catalog:
+  # ecosistema y motores
+  '@pasosdejesus/m': ^{{m_version}}
+  '@pasosdejesus/mpdj': ^0.2.14
+  '@pasosdejesus/usdt': ^0.1.3
+  # compartidas por apps/web y apps/contracts
+  typescript: 5.9.3
+  viem: ^2.51.0
+  dotenv: ^17.4.2
+  # de apps/web, centralizadas igual
+  next: ^16.0.0
+  react: 19.3.0
+  react-dom: 19.3.0
+  kysely: 0.28.17
+  kysely-postgres-js: 3.0.0
+  pg: 8.17.2
+
+# Paquetes cuyo script de instalación se permite ejecutar (OpenBSD/adJ).
+allowBuilds:
+  '@pasosdejesus/m': true
+  bufferutil: true
+  esbuild: true
+  keccak: true
+  sharp: true
+  utf-8-validate: true
+
+# OpenBSD/adJ: variantes WASM (no hay binarios nativos de estos paquetes).
+overrides:
+  '@parcel/watcher': npm:@parcel/watcher-wasm
+  rollup: npm:@rollup/wasm-node
+  lightningcss: npm:lightningcss-wasm
+  '@tailwindcss/oxide': npm:@tailwindcss/oxide-wasm32-wasi

package/dist/util/engines.d.ts

@@ -30,7 +30,7 @@ export declare function loadEnginePackages(pkgFile: string): Promise<void>;
 /**
  * Locate the `packages/` directory by searching upward from `startDir`.
  * Mirrors the CLI's hierarchical .env / package.json lookup
- * (apps/nextjs → apps → project root). Returns null if none found.
+ * (apps/web → apps → project root). Returns null if none found.
  */
 export declare function findPackagesDir(startDir: string): Promise<string | null>;
 /**

package/dist/util/engines.js

@@ -77,7 +77,7 @@ export async function loadEnginePackages(pkgFile) {
 /**
  * Locate the `packages/` directory by searching upward from `startDir`.
  * Mirrors the CLI's hierarchical .env / package.json lookup
- * (apps/nextjs → apps → project root). Returns null if none found.
+ * (apps/web → apps → project root). Returns null if none found.
  */
 export async function findPackagesDir(startDir) {
     let current = startDir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pasosdejesus/m",
-  "version": "0.30.1",
+  "version": "0.31.1",
   "description": "Motor para crear y gestionar proyectos al estilo Pasos de Jesus.",
   "author": "",
   "license": "ISC",
@@ -141,7 +141,7 @@
     "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "@pasosdejesus/contract-test": "0.1.4",
+    "@pasosdejesus/contract-test": "0.1.5",
     "@pasosdejesus/edr": "0.1.2"
   },
   "devDependencies": {

package/src/blockchain/README.md

@@ -49,7 +49,7 @@ const usdt = getContractAddress('celo', 'NEXT_PUBLIC_USDT_ADDRESS', deploymentsD
 ┌──────────────────────────────────────────────────────┐
 │  Project (sivel.xyz / learn.tg)                      │
 │                                                      │
-│  apps/hardhat/deployments/                           │
+│  apps/contracts/deployments/                           │
 │    └── *.json (deployment addresses)                │
 │                                                      │
 │  lib/deployments.ts                                  │

package/src/shadcn_components/README.md

@@ -117,9 +117,9 @@ Components use Tailwind classes. Your project needs Tailwind configured with the
 
 ## Tests
 
-Tests for these components are in `tests/test-project/apps/nextjs/tests/shadcn-components/` of the `@pasosdejesus/m` repository. Run with:
+Tests for these components are in `tests/test-project/apps/web/tests/shadcn-components/` of the `@pasosdejesus/m` repository. Run with:
 
 ```bash
-cd tests/test-project/apps/nextjs
+cd tests/test-project/apps/web
 make test
 ```

package/src/wallet/README.md

@@ -91,6 +91,21 @@ configureInAppWallet({
 `react` es un *optional peer*: el subpath está fuera del barrel, así que importar
 `@pasosdejesus/m/wallet` no arrastra React.
 
+## Integración con el host (CSP)
+
+La llave privada vive en la página: desbloquear, firmar y mover fondos son JavaScript en el
+origen del host, así que el host **debe** servir una CSP estricta (referencia de implementación:
+`learn.tg/doc/csp.md`). Contrato mínimo que el paquete espera del host:
+
+- `script-src` con **nonce por request** (Next inyecta scripts de hidratación) y **sin**
+  `'unsafe-eval'` ni `'unsafe-inline'` para scripts.
+- **Sin `worker-src`**: el núcleo **no** crea Web Workers (tampoco usa `eval`/`new Function`).
+- `connect-src`: incluir el RPC que se pase a `getInAppWalletProvider({ rpcUrl })`.
+- `img-src`: incluir los hosts de imágenes que use tu UI (p. ej. NFT/IPFS); `data:` sólo si
+  renderizas QR como data-URL.
+- `default-src 'self'` y `frame-ancestors 'none'`.
+- **Origen seguro** (`https:` o `localhost`): lo exigen `crypto.subtle` (WebCrypto) y WebAuthn.
+
 ## Pruebas
 
 Mocks en `@pasosdejesus/m/test-utils` (`installLocalStorage`, `installIndexedDB`,

package/dist/templates/apps/nextjs/pnpm-workspace.yaml

@@ -1,13 +0,0 @@
-allowBuilds:
-  '@pasosdejesus/m': true
-  bufferutil: true
-  esbuild: true
-  keccak: true
-  sharp: true
-  utf-8-validate: true
-
-overrides:
-  '@parcel/watcher': npm:@parcel/watcher-wasm
-  rollup: npm:@rollup/wasm-node
-  lightningcss: npm:lightningcss-wasm
-  '@tailwindcss/oxide': npm:@tailwindcss/oxide-wasm32-wasi