feat: custom generator

.changeset/cool-meals-obey.md

@@ -0,0 +1,5 @@
+---
+"@premieroctet/next-admin": major
+---
+
+feat: add custom generator (#414)

.changeset/fifty-chairs-travel.md

@@ -0,0 +1,6 @@
+---
+"@premieroctet/next-admin-generator-prisma": patch
+"@premieroctet/next-admin-json-schema": patch
+---
+
+feat: new json-schema libraries (#414)

.changeset/four-comics-deny.md

@@ -0,0 +1,5 @@
+---
+"@premieroctet/next-admin-cli": patch
+---
+
+Apply dist/

.changeset/lemon-bears-attend.md

@@ -0,0 +1,5 @@
+---
+"@premieroctet/next-admin-cli": patch
+---
+
+feat: support new generator (#414)

.changeset/nasty-clouds-deny.md

@@ -0,0 +1,5 @@
+---
+"@premieroctet/next-admin-generator-prisma": patch
+---
+
+Change next-admin-json-schema dependenciy

.changeset/pre.json

@@ -0,0 +1,22 @@
+{
+  "mode": "pre",
+  "tag": "rc",
+  "initialVersions": {
+    "docs": "0.0.0",
+    "example": "0.0.0",
+    "@premieroctet/next-admin-cli": "0.0.4",
+    "eslint-config-custom": "0.0.0",
+    "@premieroctet/next-admin-generator-prisma": "0.0.0",
+    "@premieroctet/next-admin-json-schema": "0.0.0",
+    "@premieroctet/next-admin": "6.1.5",
+    "tsconfig": "0.0.0"
+  },
+  "changesets": [
+    "cool-meals-obey",
+    "fifty-chairs-travel",
+    "four-comics-deny",
+    "lemon-bears-attend",
+    "nasty-clouds-deny",
+    "sour-garlics-dress"
+  ]
+}

.changeset/sour-garlics-dress.md

@@ -0,0 +1,5 @@
+---
+"@premieroctet/next-admin": patch
+---
+
+Merge main

.github/workflows/check-changeset.yml

@@ -18,6 +18,6 @@ jobs:
         with:
           node-version: 20
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
       - name: Check for changeset
-        run: yarn changeset status
+        run: pnpm changeset status

.github/workflows/e2e.yml

@@ -14,36 +14,38 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 20
-          cache: "yarn"
+          cache: "pnpm"
       - name: Cache playwright dependencies
         id: cache-playwright
         uses: actions/cache@v3
         with:
           path: ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-playwright-${{ hashFiles('**/pnpm-lock.yaml') }}
       - name: Start docker-compose
         run: docker compose up -d
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
+      - name: Setup packages (Build)
+        run: pnpm setup:packages
       - name: Run linter
-        run: yarn lint
+        run: pnpm lint
       - name: Run typecheck
-        run: yarn typecheck
+        run: pnpm typecheck
       - name: Install playwright dependencies
         if: steps.cache-playwright.outputs.cache-hit != 'true'
         run: npx playwright install --with-deps
       - name: Fill database
-        run: yarn database
+        run: pnpm database
       - name: Build packages
-        run: yarn build:example
+        run: pnpm build:example
       - name: Start server
-        run: yarn start:example &
+        run: pnpm start:example &
       - name: Run tests
         run: |
-          yarn test
-          yarn turbo test:e2e 
-          cd apps/example && yarn prisma db seed && cd -
-          BASE_URL=http://localhost:3000/pagerouter/admin yarn test:e2e
+          pnpm test
+          pnpm turbo test:e2e 
+          cd apps/example && pnpm prisma db seed && cd -
+          BASE_URL=http://localhost:3000/pagerouter/admin pnpm test:e2e
       - uses: actions/upload-artifact@v3
         if: always()
         with:

.github/workflows/release.yml

@@ -25,16 +25,16 @@ jobs:
           node-version: 20
 
       - name: Install Dependencies
-        run: yarn install
+        run: pnpm install
 
-      - name: Link
-        run: yarn lint
+      - name: Lint
+        run: pnpm lint
 
       - name: Create Release Pull Request or Publish (${{ github.ref_name }})
         uses: changesets/action@v1
         with:
-          version: yarn changeset-version
-          publish: yarn publish-package
+          version: pnpm changeset-version
+          publish: pnpm publish-packages
           title: ${{github.ref_name}} — Version Packages
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/reset-database.yml

@@ -13,9 +13,9 @@ jobs:
       - name: Enable corepack
         run: corepack enable
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
       - name: Reset database
         env:
           POSTGRES_PRISMA_URL: ${{ secrets.POSTGRES_PRISMA_URL }}
           POSTGRES_URL_NON_POOLING: ${{ secrets.POSTGRES_URL_NON_POOLING }}
-        run: yarn reset-database
+        run: pnpm reset-database

.github/workflows/vercel-deploy.yml

@@ -27,10 +27,13 @@ jobs:
           node-version: 20
 
       - name: Install Dependencies
-        run: yarn install
+        run: pnpm install
+
+      - name: Setup packages (Build)
+        run: pnpm setup:packages
 
       - name: Install Vercel CLI
-        run: npm install --global vercel@latest
+        run: npm install --global vercel@37.6.1
 
       - name: Pull Vercel Environment Information (Docs)
         run: vercel pull --yes --environment=${{ inputs.environment }} --token=${{ secrets.VERCEL_TOKEN }}

CONTRIBUTING.md

@@ -6,11 +6,14 @@ An auto generated admin from Prisma models for your Next.js app.
 
 ### Apps and Packages
 
-- `docs`: a [Next.js](https://nextjs.org/) app
-- `web`: another [Next.js](https://nextjs.org/) app
-- `next-admin`: the admin library used by both `web` and `docs` applications
-- `eslint-config-custom`: `eslint` configurations (includes `eslint-config-next` and `eslint-config-prettier`)
-- `tsconfig`: `tsconfig.json`s used throughout the monorepo
+- `apps/docs`: a [Next.js](https://nextjs.org/) app
+- `apps/example`: a [Next.js](https://nextjs.org/) app that uses the `next-admin` package
+- `packages/next-admin`: the admin library used by both `web` and `docs` applications
+- `packages/cli`: a CLI to generate the admin in your Next.js app
+- `packages/generator-prisma`: a CLI to generate a json schema of your Prisma models
+- `packages/json-schema`: a packages to normalize the Prisma schema to a json schema (primarily used to type the generated and next-admin packages)
+- `packages/eslint-config-custom`: `eslint` configurations (includes `eslint-config-next` and `eslint-config-prettier`)
+- `packagestsconfig`: `tsconfig.json`s used throughout the monorepo
 
 ### Utilities
 
@@ -20,6 +23,54 @@ This turborepo has some additional tools already setup for you:
 - [ESLint](https://eslint.org/) for code linting
 - [Prettier](https://prettier.io) for code formatting
 
+### Setup 
+
+To setup the project, run the following command:
+
+```
+pnpm install
+```
+
+Then you need to create a `.env` file in the `apps/example` project with the following content:
+
+```
+DATABASE_URL="postgresql://user:password@localhost:5432/dbname"
+```
+
+And run the following command to setup the packages:
+
+```
+pnpm setup:packages
+```
+
+The `setup:packages` command will build packages, generate Prisma and then build `next-admin` package. 
+
+### Prisma (first time setup)
+
+To setup the database, run the following command:
+
+```
+pnpm database
+```
+
+### Develop
+
+To develop all apps and packages, run the following command:
+
+```
+pnpm dev
+docker-compose up
+cd apps/example && pnpm database
+```
+
+### Build
+
+To build all apps and packages, run the following command:
+
+```
+pnpm build
+```
+
 ### Workflow
 
 The project workflow uses GitHub Actions to run tests, build, deploy (prod - preview - docs) and publish packages. To handle versioning up and publishing, we use [Changesets](https://github.com/changesets/changesets)
@@ -29,7 +80,7 @@ The project workflow uses GitHub Actions to run tests, build, deploy (prod - pre
 To increase the version of a package, you need to create a `changeset` file. You can create a `changeset` file by running the following command:
 
 ```sh
-yarn changeset
+pnpm changeset
 ```
 
 Any PR without a `changeset` file will just trigger the tests and eventually deploy/preview the app.
@@ -52,24 +103,6 @@ If you want to fix a previous major version, you can create a PR on the relative
 
 Once a fix has been released, you can cherry-pick the fix on the `develop` branch if that fix is still relevant.
 
-### Build
-
-To build all apps and packages, run the following command:
-
-```
-yarn run build
-```
-
-### Develop
-
-To develop all apps and packages, run the following command:
-
-```
-yarn run dev
-docker-compose up
-cd apps/example && yarn database
-```
-
 ### E2E
 
 Tests are using Playwright to test directly with a browser.

apps/docs/README.md

@@ -3,7 +3,7 @@
 First, run the development server:
 
 ```bash
-yarn dev
+pnpm dev
 ```
 
 Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

apps/docs/package.json

@@ -6,11 +6,12 @@
     "dev": "next dev --port 3001",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint"
+    "lint": "next lint",
+    "clean": "rm -rf .next"
   },
   "dependencies": {
     "@heroicons/react": "^2.1.1",
-    "@premieroctet/next-admin": "6.1.6",
+    "@premieroctet/next-admin": "7.0.0-rc.1",
     "clsx": "^2.1.0",
     "framer-motion": "^11.0.8",
     "mini-svg-data-uri": "^1.4.4",

apps/docs/pages/docs/api/create-handler-function.mdx

@@ -1,8 +1,8 @@
-
 import { Callout, Tabs } from "nextra/components";
 import OptionsTable from "../../../components/OptionsTable";
 
 # `createHandler` function
+
 <Callout type="info">
   This is the documentation for the latest version of Next Admin. If you are using an older version (`<5.0.0`), please refer to the [documentation](/v4/docs)
 </Callout>
@@ -12,21 +12,21 @@ import OptionsTable from "../../../components/OptionsTable";
 <OptionsTable
   options={[
     {
-      name: 'prisma',
-      description: 'Your Prisma client instance. This is mandatory.'
-    },
-    {
-      name: 'schema',
-      description: 'Your JSON Schema generated by Prisma. This is mandatory.'
+      name: "prisma",
+      description: "Your Prisma client instance. This is mandatory.",
     },
     {
-      name: 'onRequest',
-      description: 'A function that is executed before any request. Useful for authentication.'
+      name: "onRequest",
+      description:
+        "A function that is executed before any request. Useful for authentication.",
     },
     {
-      name: 'options',
-      description: <>Your Next Admin <a href="/docs/api/options">options</a> - optional. </>
+      name: "options",
+      description: (
+        <>
+          Your Next Admin <a href="/docs/api/options">options</a> - optional.{" "}
+        </>
+      ),
     },
-
   ]}
 />

apps/docs/pages/docs/api/get-next-admin-props-function.mdx

@@ -1,8 +1,8 @@
-
 import { Callout, Tabs } from "nextra/components";
 import OptionsTable from "../../../components/OptionsTable";
 
 # `getNextAdminProps` function
+
 <Callout type="info">
   This is the documentation for the latest version of Next Admin. If you are using an older version (`<5.0.0`), please refer to the [documentation](/v4/docs)
 </Callout>
@@ -31,10 +31,6 @@ import OptionsTable from "../../../components/OptionsTable";
               name: 'apiBasePath',
               description: 'The base path of your admin API. It is used to build the admin API URL. It is mandatory.'
             },
-            {
-              name: 'schema',
-              description: <>The JSON schema generated by the <code>prisma generate</code> command.</>
-            },
             {
               name: 'prisma',
               description: 'Your Prisma client instance.'
@@ -70,10 +66,6 @@ import OptionsTable from "../../../components/OptionsTable";
           name: 'apiBasePath',
           description: <>The base path of your admin API. It is used to build the admin API URL. It is optional and defaults to <code>/api/admin</code>.</>
         },
-        {
-          name: 'schema',
-          description: <>The JSON schema generated by the <code>prisma generate</code> command.</>
-        },
         {
           name: 'prisma',
           description: 'Your Prisma client instance.'
@@ -94,8 +86,9 @@ import OptionsTable from "../../../components/OptionsTable";
           name: 'options',
           description: <>The <a href="/docs/api/options">options</a> object - optional.</>
         }
-        
+
       ]}
       />
+
   </Tabs.Tab>
 </Tabs>