Skip to content

Commit

Permalink
Change to pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
cregourd committed Oct 29, 2024
1 parent b13c11e commit e9447a8
Show file tree
Hide file tree
Showing 16 changed files with 14,140 additions and 16,490 deletions.
1 change: 0 additions & 1 deletion .yarnrc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion apps/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"eslint": "7.32.0",
"eslint-config-custom": "workspace:*",
"postcss": "^8.4.24",
"prisma": "^5.13.0",
"prisma": "5.14.0",
"tailwindcss": "^3.3.2",
"ts-node": "^10.9.1",
"tsconfig": "workspace:*",
Expand Down
10 changes: 3 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
"name": "next-admin",
"version": "0.0.0",
"private": true,
"workspaces": [
"apps/*",
"packages/*"
],
"scripts": {
"start": "turbo run start",
"start:example": "turbo run start --filter=example",
Expand All @@ -22,7 +18,7 @@
"database": "dotenv turbo run database",
"reset-database": "dotenv turbo run reset-database",
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
"publish-packages": "yarn build:packages && changeset publish",
"publish-packages": "pnpm build:packages && changeset publish",
"changeset-version": "(changeset version) && cp packages/next-admin/CHANGELOG.md apps/docs/pages/changelog/index.md && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install",
"clean": "turbo run clean"
},
Expand All @@ -40,13 +36,13 @@
"@radix-ui/react-slot": "^1.0.2",
"prettier-plugin-tailwindcss": "^0.6.6"
},
"packageManager": "[email protected]",
"packageManager": "[email protected]",
"repository": {
"type": "git",
"url": "https://github.com/premieroctet/next-admin.git"
},
"homepage": "https://next-admin.js.org",
"resolutions": {
"overrides": {
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"prettier": ">= 3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/generator-prisma/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@premieroctet/next-admin-generator-prisma",
"version": "0.0.1-rc.2",
"version": "0.0.1-rc.3",
"description": "Prisma generator for Next-Admin",
"bin": "dist/index.js",
"main": "dist/index.js",
Expand Down Expand Up @@ -33,12 +33,12 @@
"clean": "rm -rf dist"
},
"dependencies": {
"@premieroctet/next-admin-json-schema": "workspace:*",
"@prisma/generator-helper": "^5.20.0",
"@prisma/internals": "^5.20.0",
"prisma-json-schema-generator": "5.1.5"
},
"devDependencies": {
"@premieroctet/next-admin-json-schema": "workspace:^",
"@types/json-schema": "^7.0.15",
"eslint": "^7.32.0",
"eslint-config-custom": "workspace:*",
Expand Down
14 changes: 11 additions & 3 deletions packages/next-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
}
},
"peerDependencies": {
"@prisma/client": ">=4",
"@prisma/client": ">=5",
"next": ">=12",
"prisma": ">=4",
"prisma": ">=5",
"react": ">=17",
"react-dom": ">=17",
"typescript": ">=4"
Expand All @@ -103,31 +103,39 @@
"body-parser": "^1.20.2",
"class-variance-authority": "^0.6.0",
"clsx": "^1.2.1",
"csstype": "^3.1.3",
"dnd-kit-sortable-tree": "^0.1.73",
"formidable": "^3.5.1",
"lodash.clonedeep": "^4.5.0",
"lodash.get": "^4.4.2",
"lodash.merge": "^4.6.2",
"lodash.range": "^3.2.0",
"lodash.set": "^4.3.2",
"lodash.unset": "^4.5.2",
"lodash.update": "^4.10.2",
"next-connect": "^1.0.0-next.3",
"next-themes": "^0.3.0",
"nextjs-toploader": "^1.6.6",
"nprogress": "^0.2.0",
"tailwind-merge": "^2.3.0",
"util": "^0.12.5",
"zod": "^3.23.8"
},
"devDependencies": {
"@premieroctet/next-admin-json-schema": "workspace:^",
"@premieroctet/next-admin-json-schema": "workspace:*",
"@testing-library/react": "^14.1.2",
"@types/body-parser": "^1.19.2",
"@types/jest": "^29.5.1",
"@types/json-schema": "^7.0.11",
"@types/lodash.clonedeep": "^4.5.9",
"@types/lodash.debounce": "^4.0.9",
"@types/lodash.get": "^4.4.9",
"@types/lodash.merge": "^4.6.9",
"@types/lodash.range": "^3.2.7",
"@types/lodash.set": "^4.3.9",
"@types/lodash.unset": "^4.5.9",
"@types/lodash.update": "^4.10.9",
"@types/nprogress": "^0.2.3",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.0",
"autoprefixer": "^10.4.14",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-admin/src/components/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { EllipsisVerticalIcon, TrashIcon } from "@heroicons/react/24/outline";
import { ColumnDef, RowSelectionState } from "@tanstack/react-table";
import clsx from "clsx";
import debounce from "lodash/debounce";
import debounce from "lodash.debounce";
import { ChangeEvent, useEffect, useState, useTransition } from "react";
import { ITEMS_PER_PAGE } from "../config";
import ClientActionDialogProvider from "../context/ClientActionDialogContext";
Expand Down
2 changes: 1 addition & 1 deletion packages/next-admin/src/components/MainLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { merge } from "lodash";
import merge from "lodash.merge";
import { ThemeProvider } from "next-themes";
import { PropsWithChildren } from "react";
import { ColorSchemeProvider } from "../context/ColorSchemeContext";
Expand Down
2 changes: 1 addition & 1 deletion packages/next-admin/src/components/NextAdmin.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { merge } from "lodash";
import merge from "lodash.merge";
import dynamic from "next/dynamic";
import { AdminComponentProps, CustomUIProps } from "../types";
import { getSchemaForResource } from "../utils/jsonSchema";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface BaseProps {

type ButtonProps = PropsWithChildren<
{
format: any;
format: string;
icon: React.ReactElement;
title?: string;
} & BaseProps
Expand Down
2 changes: 1 addition & 1 deletion packages/next-admin/src/components/inputs/Selector.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Transition, TransitionChild } from "@headlessui/react";
import debounce from "lodash/debounce";
import debounce from "lodash.debounce";
import {
ChangeEvent,
createRef,
Expand Down
1 change: 0 additions & 1 deletion packages/next-admin/src/context/ConfigContext.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"use client";
import { Prisma } from "@prisma/client";
import React, { useContext, useMemo } from "react";
import { ModelName, NextAdminOptions, Schema } from "../types";

Expand Down
2 changes: 1 addition & 1 deletion packages/next-admin/src/utils/prisma.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { NextAdminJsonSchemaData } from "@premieroctet/next-admin-json-schema";
import { Prisma, PrismaClient } from "@prisma/client";
import { cloneDeep } from "lodash";
import cloneDeep from "lodash.clonedeep";
import { ITEMS_PER_PAGE } from "../config";
import {
EditOptions,
Expand Down
2 changes: 1 addition & 1 deletion packages/next-admin/src/utils/props.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Prisma } from "@prisma/client";
import { cloneDeep } from "lodash";
import cloneDeep from "lodash.clonedeep";
import {
AdminComponentProps,
EditOptions,
Expand Down
Loading

0 comments on commit e9447a8

Please sign in to comment.