create-faas-app 8.0.0-beta.26 → 8.0.0-beta.28

package/dist/index.mjs

@@ -6,12 +6,13 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import enquirer from "enquirer";
 //#region package.json
-var version = "8.0.0-beta.25";
+var version = "8.0.0-beta.27";
 //#endregion
-//#region src/action.ts
+//#region src/action/index.ts
 const prompt = enquirer.prompt;
 const validateName = (input) => Validator.name(input);
-const templateRoot = join(dirname(fileURLToPath(import.meta.url)), "..", "template");
+const templateRoot = join(dirname(fileURLToPath(import.meta.url)), "..", "..", "template");
+const ignoredTemplateEntries = new Set(["node_modules"]);
 const Validator = { name(input) {
 	const match = /^[a-z0-9-_]+$/i.test(input) ? true : "Must be a-z, 0-9 or -_";
 	if (match !== true) return match;
@@ -35,6 +36,7 @@ function generateSessionSecret() {
 function copyTemplateDirectory(sourcePath, targetPath, replacements) {
 	mkdirSync(targetPath, { recursive: true });
 	for (const entry of readdirSync(sourcePath, { withFileTypes: true })) {
+		if (ignoredTemplateEntries.has(entry.name)) continue;
 		const nextSourcePath = join(sourcePath, entry.name);
 		const nextTargetPath = join(targetPath, entry.name === "gitignore" ? ".gitignore" : entry.name);
 		if (entry.isDirectory()) {
@@ -110,6 +112,8 @@ ${getTemplateNames().join(", ")}`)).option("--name <name>", "Project name").opti
 //#endregion
 //#region src/index.ts
 /**
+* # create-faas-app
+*
 * [![License: MIT](https://img.shields.io/npm/l/create-faas-app.svg)](https://github.com/faasjs/faasjs/blob/main/packages/create-faas-app/LICENSE)
 * [![NPM Version](https://img.shields.io/npm/v/create-faas-app.svg)](https://www.npmjs.com/package/create-faas-app)
 *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-faas-app",
-  "version": "8.0.0-beta.26",
+  "version": "8.0.0-beta.28",
   "homepage": "https://faasjs.com/doc/create-faas-app",
   "bugs": {
     "url": "https://github.com/faasjs/faasjs/issues"

package/template/admin/package.json

@@ -14,21 +14,15 @@
     "db:up": "faasjs-pg up",
     "db:down": "faasjs-pg down"
   },
-  "dependencies": {
-    "@faasjs/ant-design": "*",
-    "@faasjs/core": "*",
-    "@faasjs/pg": "*",
-    "antd": "*",
-    "postgres": "*",
-    "react": "*",
-    "react-dom": "*"
-  },
   "devDependencies": {
-    "@electric-sql/pglite": "*",
-    "@electric-sql/pglite-socket": "*",
     "@faasjs/dev": "*",
     "@faasjs/pg-dev": "*"
   },
+  "peerDependencies": {
+    "@faasjs/ant-design": "*",
+    "@faasjs/core": "*",
+    "@faasjs/pg": "*"
+  },
   "overrides": {
     "vite": "npm:@voidzero-dev/vite-plus-core",
     "vitest": "npm:@voidzero-dev/vite-plus-test"

package/template/admin/src/pages/home/api/users/create.api.ts

@@ -1,5 +1,6 @@
-import { defineApi, z } from '@faasjs/core'
+import { defineApi } from '@faasjs/core'
 import { getClient } from '@faasjs/pg'
+import * as z from 'zod'
 
 export default defineApi({
   schema: z.object({

package/template/admin/src/pages/home/api/users/detail.api.ts

@@ -1,5 +1,6 @@
-import { defineApi, HttpError, z } from '@faasjs/core'
+import { defineApi, HttpError } from '@faasjs/core'
 import { getClient } from '@faasjs/pg'
+import * as z from 'zod'
 
 export default defineApi({
   schema: z.object({

package/template/admin/src/pages/home/api/users/list.api.ts

@@ -1,5 +1,6 @@
-import { defineApi, z } from '@faasjs/core'
+import { defineApi } from '@faasjs/core'
 import { getClient } from '@faasjs/pg'
+import * as z from 'zod'
 
 export default defineApi({
   schema: z.object({

package/template/admin/src/pages/home/api/users/update.api.ts

@@ -1,5 +1,6 @@
-import { defineApi, HttpError, z } from '@faasjs/core'
+import { defineApi, HttpError } from '@faasjs/core'
 import { getClient } from '@faasjs/pg'
+import * as z from 'zod'
 
 export default defineApi({
   schema: z.object({

package/template/admin/src/pages/home/index.tsx

@@ -1,3 +1,20 @@
+declare module '@faasjs/types' {
+  interface FaasActions {
+    '/pages/home/api/users/list': {
+      Params: { limit: number }
+      Data: { total?: number; users?: { id: number; name: string }[] }
+    }
+    '/pages/home/api/users/create': {
+      Params: { name?: string | undefined }
+      Data: { message?: string; total?: number; user?: { id: number; name: string } }
+    }
+    '/pages/home/api/auth/me': {
+      Params: Record<string, never>
+      Data: { current_user?: { id: number; name: string; role: string } }
+    }
+  }
+}
+
 import { faas, useApp } from '@faasjs/ant-design'
 import { Button, Card, Input, Space, Table, Typography } from 'antd'
 import { useState } from 'react'

package/template/admin/vite.config.ts

@@ -1,8 +1,12 @@
 import { viteConfig } from '@faasjs/dev'
-import { TypedPgVitestPlugin } from '@faasjs/pg-dev'
+import { PgVitestPlugin } from '@faasjs/pg-dev'
 import { defineConfig } from 'vite-plus'
 
 export default defineConfig({
   ...viteConfig,
-  plugins: [...viteConfig.plugins, TypedPgVitestPlugin()],
+  plugins: [...viteConfig.plugins, PgVitestPlugin()],
+  test: {
+    fileParallelism: false,
+    testTimeout: 30_000,
+  },
 })

package/template/minimal/package.json

@@ -9,15 +9,12 @@
     "start": "node --import @faasjs/node-utils/register-hooks server.ts",
     "test": "vp test"
   },
-  "dependencies": {
-    "@faasjs/core": "*",
-    "@faasjs/react": "*",
-    "react": "*",
-    "react-dom": "*"
-  },
   "devDependencies": {
     "@faasjs/dev": "*"
   },
+  "peerDependencies": {
+    "@faasjs/core": "*"
+  },
   "overrides": {
     "vite": "npm:@voidzero-dev/vite-plus-core",
     "vitest": "npm:@voidzero-dev/vite-plus-test"

package/template/minimal/src/pages/home/api/hello.api.ts

@@ -1,4 +1,5 @@
-import { defineApi, z } from '@faasjs/core'
+import { defineApi } from '@faasjs/core'
+import * as z from 'zod'
 
 export default defineApi({
   schema: z.object({

package/template/minimal/src/pages/home/index.tsx

@@ -1,3 +1,12 @@
+declare module '@faasjs/types' {
+  interface FaasActions {
+    '/pages/home/api/hello': {
+      Params: { name?: string | undefined }
+      Data: { message?: string }
+    }
+  }
+}
+
 import { useState } from 'react'
 
 import { faas } from '../../react-client'