Skip to content

Commit

Permalink
Merge branch 'main' into zac/refactor-tree-updates-promise-all
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Jan 22, 2025
2 parents 1bba787 + ab0fa30 commit 1d536de
Show file tree
Hide file tree
Showing 118 changed files with 4,386 additions and 3,713 deletions.
1 change: 0 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"onlyUpdatePeerDependentsWhenOutOfRange": true
},
"ignore": [
"course-builder-docs",
"course-builder-web",
"astro-party",
"astro-test",
Expand Down
5 changes: 5 additions & 0 deletions .changeset/five-camels-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@coursebuilder/ui": patch
---

add instructor mdx component
5 changes: 5 additions & 0 deletions .changeset/fuzzy-monkeys-cough.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@coursebuilder/ui": patch
---

add testimonial mdx component
7 changes: 7 additions & 0 deletions .changeset/lovely-cooks-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@coursebuilder/commerce-next": patch
"@coursebuilder/next": patch
"create-course-app": patch
---

bump next
22 changes: 22 additions & 0 deletions .cursorrules
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
We are using Next.js 15+, which means server components (RSC) and server actions.

This is a turborepo monorepo.

- `/packages/*` contains our libraries. we use tsup regularly.
- `/apps/*` contains the apps we are building, mostly in nextjs but also astro

@coursebuilder/ui is our shadcn/ui style library of components

always:

- check in sensibly instead of running in circles
- work in steps, think through them
- evaluate the full context of the work to understand what exists
- use the logger and think about observability

you should:

- always check the plan, if there isn't a plan ask for one
- run tests in the package/app not the root
- ask questions
- don't over engineer everything, we can be pragmatic
3 changes: 3 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
run: pnpm turbo build --filter "./packages/*"
- name: Test
run: pnpm test
env:
NODE_ENV: test
DATABASE_URL: "file::memory:?cache=shared"

lint:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions apps/ai-hero/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,5 @@ TYPESENSE_COLLECTION_NAME="content_production"
NEXT_PUBLIC_TYPESENSE_HOST="TYPESENSE_HOST"
NEXT_PUBLIC_TYPESENSE_API_KEY="TYPESENSE_API_KEY"
NEXT_PUBLIC_TYPESENSE_PORT="443"

AXIOM_TOKEN=any-token
7 changes: 0 additions & 7 deletions apps/ai-hero/mdx-components.tsx

This file was deleted.

15 changes: 11 additions & 4 deletions apps/ai-hero/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"typecheck": "tsc --noEmit",
"index-typesense": "tsx ./scripts/index-content.ts",
"test": "vitest run -c vitest.config.ts",
"test:e2e": "playwright test"
"test:e2e": "playwright test",
"posts": "tsx scripts/posts-cli.ts"
},
"dependencies": {
"@amplitude/analytics-browser": "^2.6.1",
Expand All @@ -42,6 +43,7 @@
"@aws-sdk/client-textract": "^3.525.0",
"@aws-sdk/credential-providers": "^3.525.0",
"@aws-sdk/s3-request-presigner": "^3.441.0",
"@axiomhq/js": "^1.3.1",
"@casl/ability": "^6.5.0",
"@code-hike/mdx": "^0.9.0",
"@codemirror/lang-markdown": "^6.3.2",
Expand Down Expand Up @@ -99,6 +101,7 @@
"@uploadthing/react": "7.1.5",
"@upstash/ratelimit": "^1.0.1",
"@upstash/redis": "^1.28.4",
"@vercel/flags": "^3.0.1",
"ai": "3.0.19",
"axios": "^1.5.1",
"class-variance-authority": "^0.7.0",
Expand All @@ -112,7 +115,6 @@
"date-fns": "^2.30.0",
"date-fns-tz": "^2.0.1",
"dotenv-flow": "^4.1.0",
"drizzle-orm": "0.36.0",
"feed": "^4.2.2",
"formik": "2.2.9",
"framer-motion": "^12.0.0-alpha.1",
Expand All @@ -130,7 +132,7 @@
"memoize-one": "^6.0.0",
"mjml": "^4.15.3",
"nanoid": "^5.0.2",
"next": "15.2.0-canary.6",
"next": "15.2.0-canary.19",
"next-auth": "5.0.0-beta.25",
"next-axiom": "^1.1.1",
"next-cloudinary": "^6.5.1",
Expand Down Expand Up @@ -191,6 +193,7 @@
"zod-to-json-schema": "^3.22.4"
},
"devDependencies": {
"@clack/prompts": "^0.6.3",
"@mux/mux-node": "^7.3.2",
"@tailwindcss/typography": "^0.5.10",
"@types/base-64": "^1.0.1",
Expand All @@ -204,15 +207,19 @@
"@types/react-gravatar": "^2.6.13",
"@types/styled-components": "^5.1.29",
"autoprefixer": "^10.4.14",
"better-sqlite3": "9.4.3",
"concurrently": "^8.2.2",
"dotenv-cli": "^7.3.0",
"drizzle-kit": "0.27.1",
"drizzle-orm": "0.36.0",
"encoding": "^0.1.13",
"eslint": "^8.47.0",
"eslint-config-next": "15.0.2",
"msw": "^2.7.0",
"mysql2": "^3.6.1",
"partykit": "0.0.104",
"postcss": "^8.4.27",
"picocolors": "^1.1.1",
"postcss": "^8.4.47",
"prettier": "^3.2.5",
"prettier-plugin-tailwindcss": "^0.5.12",
"shiki": "1.1.7",
Expand Down
Binary file added apps/ai-hero/public/assets/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1d536de

Please sign in to comment.