Skip to content

Commit

Permalink
chore: to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
belgattitude committed Mar 1, 2023
1 parent dc9bb0b commit e973079
Show file tree
Hide file tree
Showing 11 changed files with 223 additions and 275 deletions.
5 changes: 5 additions & 0 deletions .changeset/lemon-eagles-study.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nextjs-app": minor
---

Use @prisma/nextjs-monorepo-workaround-plugin for standalone monorepo support
5 changes: 5 additions & 0 deletions .changeset/slow-camels-drop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@your-org/db-main-prisma": minor
---

Use jsonProtocol preview feature available in prisma 4.11.0
7 changes: 7 additions & 0 deletions apps/nextjs-app/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ module.exports = {
'jsx-a11y/anchor-is-valid': 'off',
},
overrides: [
{
files: ['next.config.mjs'],
rules: {
'import/order': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
},
},
{
files: ['src/pages/\\_*.{ts,tsx}'],
rules: {
Expand Down
10 changes: 9 additions & 1 deletion apps/nextjs-app/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import path from 'node:path';
import url from 'node:url';
import withBundleAnalyzer from '@next/bundle-analyzer';
import { withSentryConfig } from '@sentry/nextjs'; // https://docs.sentry.io/platforms/javascript/guides/nextjs/

import { createSecureHeaders } from 'next-secure-headers';
import pc from 'picocolors';
import nextI18nConfig from './next-i18next.config.js';

// @ts-ignore
import { PrismaPlugin } from '@prisma/nextjs-monorepo-workaround-plugin';

const workspaceRoot = path.resolve(
path.dirname(url.fileURLToPath(import.meta.url)),
'..',
Expand Down Expand Up @@ -269,6 +271,12 @@ const nextConfig = {
})
);

// Nex with Prisma 4.11.0 (helps standalone build in monorepos)
// https://www.prisma.io/docs/guides/database/troubleshooting-orm/help-articles/nextjs-prisma-client-monorepo
if (isServer) {
config.plugins.push(new PrismaPlugin());
}

config.module.rules.push({
test: /\.svg$/,
issuer: /\.(js|ts)x?$/,
Expand Down
5 changes: 3 additions & 2 deletions apps/nextjs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"@nextvalid/zod-request": "0.4.0",
"@pothos/core": "3.27.1",
"@pothos/plugin-errors": "3.11.0",
"@pothos/plugin-prisma": "3.41.1",
"@prisma/client": "4.10.1",
"@pothos/plugin-prisma": "3.41.3",
"@prisma/client": "4.11.0",
"@sentry/nextjs": "7.39.0",
"@sentry/react": "7.39.0",
"@soluble/cache-interop": "0.11.1",
Expand Down Expand Up @@ -106,6 +106,7 @@
"@next/bundle-analyzer": "13.2.3",
"@next/env": "13.2.3",
"@playwright/test": "1.31.1",
"@prisma/nextjs-monorepo-workaround-plugin": "4.11.0",
"@size-limit/file": "8.2.4",
"@svgr/webpack": "6.5.1",
"@tailwindcss/aspect-ratio": "0.4.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/api-gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"typecheck": "tsc --project ./tsconfig.json --noEmit"
},
"dependencies": {
"@graphql-mesh/config": "^10.1.6",
"@graphql-mesh/graphql": "^0.34.6",
"@graphql-mesh/openapi": "^0.35.17",
"@graphql-mesh/runtime": "^0.46.14"
"@graphql-mesh/config": "^10.1.7",
"@graphql-mesh/graphql": "^0.34.7",
"@graphql-mesh/openapi": "^0.35.18",
"@graphql-mesh/runtime": "^0.46.15"
},
"devDependencies": {
"@graphql-mesh/cli": "0.82.24",
Expand Down
6 changes: 3 additions & 3 deletions packages/db-main-prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
},
"devDependencies": {
"@pothos/core": "3.27.1",
"@pothos/plugin-prisma": "3.41.1",
"@prisma/client": "4.10.1",
"@pothos/plugin-prisma": "3.41.3",
"@prisma/client": "4.11.0",
"@soluble/dsn-parser": "1.6.0",
"@types/node": "18.14.2",
"@vitest/coverage-istanbul": "0.29.2",
Expand All @@ -55,7 +55,7 @@
"npm-run-all": "4.1.5",
"picocolors": "1.0.0",
"prettier": "2.8.4",
"prisma": "4.10.1",
"prisma": "4.11.0",
"rimraf": "4.1.2",
"transliteration": "2.3.5",
"tsup": "6.6.3",
Expand Down
1 change: 1 addition & 0 deletions packages/db-main-prisma/prisma/schema.prisma
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
generator client {
provider = "prisma-client-js"
previewFeatures = ["jsonProtocol"]
// output = "../src/generated"
}

Expand Down
6 changes: 3 additions & 3 deletions packages/eslint-config-bases/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
},
"dependencies": {
"@rushstack/eslint-patch": "^1.2.0",
"@typescript-eslint/eslint-plugin": "^5.53.0",
"@typescript-eslint/parser": "^5.53.0",
"@typescript-eslint/eslint-plugin": "^5.54.0",
"@typescript-eslint/parser": "^5.54.0",
"eslint-config-prettier": "^8.6.0",
"eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-import": "^2.27.5",
Expand All @@ -79,7 +79,7 @@
"eslint-plugin-regexp": "^1.12.0",
"eslint-plugin-sonarjs": "^0.18.0",
"eslint-plugin-storybook": "^0.6.11",
"eslint-plugin-tailwindcss": "^3.9.0",
"eslint-plugin-tailwindcss": "^3.10.1",
"eslint-plugin-testing-library": "^5.10.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"autoprefixer": "10.4.13",
"babel-loader": "9.1.2",
"babel-plugin-macros": "3.1.0",
"babel-plugin-polyfill-corejs3": "0.6.0",
"babel-plugin-polyfill-corejs3": "0.7.1",
"core-js": "3.29.0",
"cross-env": "7.0.3",
"eslint": "8.35.0",
Expand Down
Loading

0 comments on commit e973079

Please sign in to comment.