Break out routes, node, bun and ignite

kingstinct · Oct 17, 2023 · 36d1129 · 36d1129
1 parent 7a47832
commit 36d1129
Show file tree

Hide file tree

Showing 61 changed files with 713 additions and 133 deletions.
diff --git a/apps/supplement-stack/app.ts b/apps/supplement-stack/app.ts
@@ -1,4 +1,4 @@
-import { createApp } from '@zemble/core'
+import bunRunner from '@zemble/bun'
 import YogaGraphQL from '@zemble/graphql'
 import AuthOTP from 'zemble-plugin-auth-otp'
 
@@ -14,7 +14,7 @@ declare global {
   }
 }
 
-const app = createApp({
+void bunRunner({
   plugins: [
     YogaGraphQL.configure({
       yoga: {
@@ -50,7 +50,3 @@ const app = createApp({
 })
 
 void connect()
-
-void app.then(({ start }) => {
-  start()
-})
diff --git a/apps/supplement-stack/package.json b/apps/supplement-stack/package.json
@@ -24,7 +24,8 @@
     "zemble-plugin-apple-app-site-association": "workspace:*",
     "zemble-plugin-auth-otp": "workspace:*",
     "zemble-plugin-bull": "workspace:*",
-    "zemble-plugin-todo": "workspace:*"
+    "zemble-plugin-todo": "workspace:*",
+    "@zemble/bun": "workspace:*"
   },
   "devDependencies": {
     "@tsconfig/node20": "^20.1.1",

diff --git a/apps/todo-app-with-auth-backend/app.ts b/apps/todo-app-with-auth-backend/app.ts
@@ -1,19 +1,12 @@
-import { createApp } from '@zemble/core'
-import YogaGraphQL from '@zemble/graphql'
+import bunRunner from '@zemble/bun'
+import Ignite from '@zemble/ignite'
 import AppleAppSiteAssociation from 'zemble-plugin-apple-app-site-association'
 import AnonymousAuth from 'zemble-plugin-auth-anonymous'
-import Bull from 'zemble-plugin-bull'
 import TodoPlugin from 'zemble-plugin-todo'
 
-const app = createApp({
+void bunRunner({
   plugins: [
-    YogaGraphQL.configure({
-      yoga: {
-        graphqlEndpoint: '/graphql',
-        plugins: [],
-      },
-    }),
-    Bull.configure(),
+    Ignite.configure(),
     AnonymousAuth.configure(),
     TodoPlugin.configure(),
     AppleAppSiteAssociation.configure({
@@ -29,5 +22,3 @@ const app = createApp({
     }),
   ],
 })
-
-void app.then(({ start }) => start())
diff --git a/apps/todo-app-with-auth-backend/package.json b/apps/todo-app-with-auth-backend/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "main": "app.ts",
   "scripts": {
-    "dev": "bun app.ts",
+    "dev": "bun --hot app.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "typecheck": "tsc --noEmit"
@@ -20,7 +20,9 @@
     "zemble-plugin-auth-anonymous": "workspace:*",
     "zemble-plugin-apple-app-site-association": "workspace:*",
     "zemble-plugin-bull": "workspace:*",
-    "zemble-plugin-todo": "workspace:*"
+    "zemble-plugin-todo": "workspace:*",
+    "@zemble/ignite": "workspace:*",
+    "@zemble/bun": "workspace:*"
   },
   "devDependencies": {
     "@tsconfig/node20": "^20.1.1",

diff --git a/apps/todo-app-with-auth-backend/routes/hey/get2.ts b/apps/todo-app-with-auth-backend/routes/hey/get2.ts
@@ -0,0 +1,14 @@
+import type { Context } from 'hono'
+
+export const get = async (c: Context) => c.html(`<html>
+    <head>
+      <title>yeah it's a get</title>
+      <meta name="color-scheme" content="light dark">
+    </head>
+    <body>
+      <div>
+        <p>Hello Zemble! Serving</p>
+        <p><a href='/graphql'>Check out your GraphQL API here</a></p>
+      </div>
+    </body>
+  </html>`)
diff --git a/apps/todo-app-with-auth-backend/routes/hey/getting.post.ts b/apps/todo-app-with-auth-backend/routes/hey/getting.post.ts
@@ -0,0 +1,16 @@
+import type { Context } from 'hono'
+
+const getter = async (c: Context) => c.html(`<html>
+    <head>
+      <title>yeah it's a get</title>
+      <meta name="color-scheme" content="light dark">
+    </head>
+    <body>
+      <div>
+        <p>Hello Zemble! Serving</p>
+        <p><a href='/graphql'>Check out your GraphQL API here</a></p>
+      </div>
+    </body>
+  </html>`)
+
+export default getter
diff --git a/apps/todo-app-with-auth-backend/routes/hey/index.html b/apps/todo-app-with-auth-backend/routes/hey/index.html
@@ -0,0 +1,127 @@
+<html>
+  <head>
+      <title>Todo App</title>
+  </head>
+  <body>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    v
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+
+
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    v
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+    <div>
+      <p>TEST!</p>
+    </div>
+
+</html>
diff --git a/apps/todo-app-with-auth-backend/routes/hey/test.jpg b/apps/todo-app-with-auth-backend/routes/hey/test.jpg
diff --git a/apps/todo-app-with-auth-backend/routes/hey/test.pdf b/apps/todo-app-with-auth-backend/routes/hey/test.pdf
diff --git a/apps/todo-app-with-auth-backend/routes/hey/test.png b/apps/todo-app-with-auth-backend/routes/hey/test.png
diff --git a/apps/todo-app-with-auth/package.json b/apps/todo-app-with-auth/package.json
@@ -7,7 +7,7 @@
     "android": "expo start --android",
     "ios": "expo start --ios",
     "web": "expo start --web",
-    "dev": "PLUGIN_DEV=true bun --hot index.ts",
+    "dev": "zemble-bun index.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "typecheck": "tsc --noEmit"

diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "pre-push": "bunx turbo run lint-quiet test typecheck --continue",
     "generate-cms-json-schema": "typescript-json-schema ./packages/cms/tsconfig.json CmsConfigFile --include ./packages/cms/types.ts --out ./packages/cms/entities-json-schema.json --required --strictNullChecks --rejectDateType",
     "fix-workspace-dependencies": "find . -type f -name 'package.json' -not -path './package.json' -not -path '*/node_modules/*' -exec perl -pi -e 's/\"workspace:[^\"]*\"/\"*\"/g' {} \\;",
-    "changeset-release": "bun run fix-workspace-dependencies && bunx changeset publish"
+    "changeset-release": "bun run fix-workspace-dependencies && bunx changeset publish",
+    "reinstall": "rm -rf node_modules/ && rm bun.lockb &&   find . -name 'node_modules' -type d -prune -exec rm -rf '{}' + && bun install"
   },
   "keywords": [],
   "author": "",

diff --git a/packages/anonymous-auth-expo/package.json b/packages/anonymous-auth-expo/package.json
@@ -8,7 +8,7 @@
     "ios": "expo start --ios",
     "web": "expo start --web",
     "codegen": "graphql-code-generator",
-    "dev": "PLUGIN_DEV=true bun --hot index.ts",
+    "dev": "zemble-bun index.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "typecheck": "tsc --noEmit"

diff --git a/packages/apple-app-site-association/package.json b/packages/apple-app-site-association/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "main": "plugin.ts",
   "scripts": {
-    "dev": "PLUGIN_DEV=true bun --hot plugin.ts",
+    "dev": "zemble-bun plugin.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "typecheck": "tsc --noEmit"

diff --git a/packages/auth-anonymous/package.json b/packages/auth-anonymous/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "plugin.ts",
   "scripts": {
-    "dev": "PLUGIN_DEV=true bun --hot plugin.ts",
+    "dev": "zemble-bun plugin.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "typecheck": "tsc --noEmit",

diff --git a/packages/auth-api-token/package.json b/packages/auth-api-token/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "plugin.ts",
   "scripts": {
-    "dev": "PLUGIN_DEV=true bun --hot plugin.ts",
+    "dev": "zemble-bun plugin.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "graphql-codegen": "graphql-codegen",

diff --git a/packages/auth-expo/package.json b/packages/auth-expo/package.json
@@ -7,7 +7,7 @@
     "android": "expo start --android",
     "ios": "expo start --ios",
     "web": "expo start --web",
-    "dev": "PLUGIN_DEV=true bun --hot index.ts",
+    "dev": "zemble-bun index.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "typecheck": "tsc --noEmit"

diff --git a/packages/auth-otp/package.json b/packages/auth-otp/package.json
@@ -5,7 +5,7 @@
   "main": "plugin.ts",
   "scripts": {
     "test": "bun test",
-    "dev": "PLUGIN_DEV=true bun --hot plugin.ts",
+    "dev": "zemble-bun plugin.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "typecheck": "tsc --noEmit",

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "test": "bun test",
-    "dev": "PLUGIN_DEV=true bun --hot plugin.ts",
+    "dev": "zemble-bun plugin.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "graphql-codegen": "graphql-codegen",
@@ -22,6 +22,7 @@
     "@envelop/generic-auth": "^6.0.1",
     "@graphql-tools/wrap": "^10.0.1",
     "@zemble/core": "workspace:*",
+    "@zemble/bun": "workspace:*",
     "@zemble/graphql": "workspace:*",
     "graphql": "^16.8.0",
     "graphql-scalars": "^1.22.2",

diff --git a/packages/bull/package.json b/packages/bull/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "plugin.ts",
   "scripts": {
-    "dev": "REDIS_URL=redis://localhost:6379 PLUGIN_DEV=true bun --hot plugin.ts",
+    "dev": "REDIS_URL=redis://localhost:6379 zemble-bun plugin.ts",
     "lint": "eslint .",
     "lint-quiet": "eslint . --quiet",
     "graphql-codegen": "graphql-codegen",

diff --git a/packages/core/utils/readDir.ts → packages/bull/utils/readDir.ts b/packages/core/utils/readDir.ts → packages/bull/utils/readDir.ts
diff --git a/packages/bull/utils/setupQueues.ts b/packages/bull/utils/setupQueues.ts
@@ -1,10 +1,9 @@
 /* eslint-disable no-underscore-dangle */
-import readDir from '@zemble/core/utils/readDir'
 import * as fs from 'node:fs'
 import * as path from 'node:path'
 
 import '@zemble/graphql'
-
+import readDir from './readDir'
 import createClient from '../clients/redis'
 import { type BullPluginConfig } from '../plugin'
 import ZembleQueueBull from '../ZembleQueueBull'
@@ -43,6 +42,7 @@ const setupQueues = (pluginPath: string, pubSub: Zemble.PubSubType, config: Bull
   }
 
   if (hasQueues) {
+    console.log('[bull-plugin] Initializing queues from ', queuePath)
     const redisUrl = config?.redisUrl
 
     if (redisUrl || process.env.NODE_ENV === 'test') {

diff --git a/packages/bun/.eslintrc b/packages/bun/.eslintrc
@@ -0,0 +1,5 @@
+{
+  "extends": [
+      "../../.eslintrc"
+  ]
+}
diff --git a/packages/bun/cli.ts b/packages/bun/cli.ts
@@ -0,0 +1,7 @@
+#!/usr/bin/env bun --hot
+
+import cliRunner from '@zemble/core/cli-runner'
+
+import bunRunner from './runner'
+
+void cliRunner(bunRunner)