Merge pull request #342 from Irev-Dev/kurt/341-upgade-redwood

Upgrade redwood

app/api/db/schema.prisma

@@ -1,4 +1,4 @@
-datasource DS {
+datasource db {
   provider = "postgresql"
   url      = env("DATABASE_URL")
 }

app/api/package.json

@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "^0.31.0",
+    "@redwoodjs/api": "^0.33.0",
-    "@redwoodjs/api-server": "^0.31.0",
+    "@redwoodjs/api-server": "^0.33.0",
     "cloudinary": "^1.23.0"
   }
 }

app/api/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "noEmit": true,
+    "allowJs": true,
+    "esModuleInterop": true,
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "baseUrl": "./",
+    "paths": {
+      "src/*": ["./src/*"]
+    },
+    "typeRoots": ["../node_modules/@types", "./node_modules/@types"],
+    "types": ["jest"]
+  },
+  "include": ["src", "../.redwood/**/*"]
+}

app/graphql.config.js

@@ -1,7 +1,5 @@
-const { getConfig } = require('@redwoodjs/internal')
+const { getPaths } = require('@redwoodjs/internal')
-
-const config = getConfig()
 
 module.exports = {
-  schema: `http://${config.api.host}:${config.api.port}/graphql`,
+  schema: getPaths().generated.schema,
 }

app/package.json

@@ -8,20 +8,25 @@
   },
   "scripts": {},
   "devDependencies": {
-    "@redwoodjs/core": "^0.31.0"
+    "@redwoodjs/core": "^0.33.0"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",
     "rules": {
-      "react/no-unescaped-entities": ["error", {"forbid": [">", "}", "\""]}]
+      "react/no-unescaped-entities": [
+        "error",
+        {
+          "forbid": [
+            ">",
+            "}",
+            "\""
+          ]
+        }
+      ]
     }
   },
   "engines": {
     "node": ">=14",
     "yarn": ">=1.15"
-  },
-  "resolutions": {
-    "react": "17.0.1",
-    "react-dom": "17.0.1"
   }
 }

app/redwood.toml

@@ -15,3 +15,6 @@
   schemaPath = "./api/db/schema.prisma"
 [browser]
   open = true
+
+[experimental]
+  esbuild = true

app/web/package.json

@@ -16,10 +16,10 @@
     "@headlessui/react": "^1.0.0",
     "@material-ui/core": "^4.11.0",
     "@monaco-editor/react": "^4.0.11",
-    "@redwoodjs/auth": "^0.31.0",
+    "@redwoodjs/auth": "^0.33.0",
-    "@redwoodjs/forms": "^0.31.0",
+    "@redwoodjs/forms": "^0.33.0",
-    "@redwoodjs/router": "^0.31.0",
+    "@redwoodjs/router": "^0.33.0",
-    "@redwoodjs/web": "^0.31.0",
+    "@redwoodjs/web": "^0.33.0",
     "browser-fs-access": "^0.17.2",
     "cloudinary-react": "^1.6.7",
     "controlkit": "^0.1.9",
@@ -34,8 +34,8 @@
     "opencascade.js": "^0.1.15",
     "pako": "^2.0.3",
     "prop-types": "^15.7.2",
-    "react": "^17.0.1",
+    "react": "^17.0.2",
-    "react-dom": "^17.0.1",
+    "react-dom": "^17.0.2",
     "react-dropzone": "^11.2.1",
     "react-ga": "^3.3.0",
     "react-helmet": "^6.1.0",

app/web/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "noEmit": true,
+    "allowJs": true,
+    "esModuleInterop": true,
+    "target": "esnext",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "baseUrl": "./",
+    "paths": {
+      "src/*": ["./src/*"]
+    },
+    "typeRoots": ["../node_modules/@types", "./node_modules/@types"],
+    "types": ["jest"],
+    "jsx": "preserve",
+  },
+  "include": ["src", "../.redwood/**/*"]
+}