Merge branch 'beta'

Author: macrozone

.github/workflows/release.yaml

@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - main
+      - beta
 
 jobs:
   build:

package.json

@@ -3,10 +3,11 @@
   "private": true,
   "devDependencies": {
     "@babel/core": "^7.15.8",
+    "@morgothulhu/nexus-plugin-prisma": "^5.5.2",
     "@babel/plugin-proposal-decorators": "^7.15.8",
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.15.0",
-    "@prisma/client": "^3.15.2",
+    "@prisma/client": "^5.5.2",
     "@types/jest": "^27.0.2",
     "@types/lodash": "^4.14.171",
     "@types/node": "^13.13.4",
@@ -31,7 +32,6 @@
     "lint-staged": ">=10",
     "lodash": "^4.17.15",
     "nexus": "^1.0.0",
-    "nexus-plugin-prisma": "^0.35.0",
     "path": "^0.12.7",
     "plain-tag": "^0.1.3",
     "pluralize": "~7.0.0",
@@ -45,7 +45,7 @@
     "semantic-release-monorepo": "^7.0.2",
     "ts-jest": "^27.0.5",
     "ts-node": "^8.9.1",
-    "typescript": "^4.4.3"
+    "typescript": "^5.2.2"
   },
   "scripts": {
     "clean": "lerna run clean --stream --parallel",

packages/backend/package.json

@@ -29,10 +29,11 @@
     "pluralize": "^7.0.0"
   },
   "peerDependencies": {
-    "nexus": ">=1.0.0"
+    "nexus": ">=1.0.0",
+    "@morgothulhu/nexus-plugin-prisma": "*"
   },
   "devDependencies": {
     "rimraf": "^3.0.2",
-    "typescript": "^4.4.3"
+    "typescript": "^5.2.2"
   }
 }

packages/backend/src/addCrudResolvers.ts

@@ -1,7 +1,7 @@
 import { ResourceOptions, CommonOptions } from "./types";
 import setupCrudResolvers from "./setupCrudResolvers";
 import { extendType, arg, intArg } from "nexus";
-import * as Helpers from "nexus-plugin-prisma/src/typegen/helpers";
+import * as Helpers from "@morgothulhu/nexus-plugin-prisma/src/typegen/helpers";
 
 const addCrudResolvers = <
   AliasPrefix extends string,

packages/backend/src/setupCrudResolvers.ts

@@ -1,5 +1,5 @@
 import { upperFirst, lowerFirst } from "lodash";
-import * as Helpers from "nexus-plugin-prisma/src/typegen/helpers";
+import * as Helpers from "@morgothulhu/nexus-plugin-prisma/src/typegen/helpers";
 
 import pluralize from "pluralize";
 import { ResourceOptions, CommonOptions } from "./types";

packages/backend/src/types.ts

@@ -1,5 +1,5 @@
-import * as Helpers from "nexus-plugin-prisma/src/typegen/helpers";
-import { BaseRelationOptions } from "nexus-plugin-prisma/typegen";
+import * as Helpers from "@morgothulhu/nexus-plugin-prisma/src/typegen/helpers";
+import { BaseRelationOptions } from "@morgothulhu/nexus-plugin-prisma/typegen";
 
 type Prefix<What extends string, Prefix extends string> = Prefix extends ``
   ? Uncapitalize<What>

packages/backend/yarn.lock

@@ -86,10 +86,10 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-typescript@^4.4.3:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
-  integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
+typescript@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
 wrappy@1:
   version "1.0.2"

packages/dataprovider/.prisma/edge.d.ts

@@ -0,0 +1 @@
+export * from './index'