Merge pull request #371 from Irev-Dev/release

sync main with release after debugging email verification

app/.gitignore

@@ -1 +1,3 @@
 dist
+web/types/graphql.d.ts
+api/types/graphql.d.ts

app/api/jest.config.js

@@ -1,6 +1 @@
-const { getConfig } = require('@redwoodjs/core')
+module.exports = require('@redwoodjs/testing/config/jest/api')
-
-const config = getConfig({ type: 'jest', target: 'node' })
-config.displayName.name = 'api'
-
-module.exports = config

app/api/package.json

@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "@redwoodjs/api": "^0.33.0",
+    "@redwoodjs/api": "^0.34.1",
-    "@redwoodjs/api-server": "^0.33.0",
     "@sentry/node": "^6.5.1",
-    "cloudinary": "^1.23.0"
+    "cloudinary": "^1.23.0",
+    "graphql-tag": "^2.12.4"
   }
-}
+}

app/api/src/functions/identity-signup.js

@@ -2,6 +2,7 @@ import { createUserInsecure } from 'src/services/users/users.js'
 import { db } from 'src/lib/db'
 import { sentryWrapper } from 'src/lib/sentry'
 import { enforceAlphaNumeric, generateUniqueString } from 'src/services/helpers'
+import 'graphql-tag'
 
 const unWrappedHandler = async (req, _context) => {
   const body = JSON.parse(req.body)

app/api/src/services/helpers.js

@@ -20,7 +20,7 @@ export const foreignKeyReplacement = (input) => {
 }
 
 export const enforceAlphaNumeric = (string) =>
-  string.replace(/([^a-zA-Z\d_:])/g, '-')
+  (string || '').replace(/([^a-zA-Z\d_:])/g, '-')
 
 export const generateUniqueString = async (
   seed,

app/netlify.toml

@@ -4,7 +4,16 @@ publish = "web/dist"
 functions = "api/dist/functions"
 
 [dev]
-  command = "yarn rw dev"
+  # To use [Netlify Dev](https://www.netlify.com/products/dev/),
+  # install netlify-cli from https://docs.netlify.com/cli/get-started/#installation
+  # and then use netlify link https://docs.netlify.com/cli/get-started/#link-and-unlink-sites
+  # to connect your local project to a site already on Netlify
+  # then run netlify dev and our app will be accessible on the port specified below
+  framework = "redwoodjs"
+  # Set targetPort to the [web] side port as defined in redwood.toml
+  targetPort = 8910
+  # Point your browser to this port to access your RedwoodJS app
+  port = 8888
 
 [[redirects]]
   from = "/*"

app/package.json

@@ -8,7 +8,7 @@
   },
   "scripts": {},
   "devDependencies": {
-    "@redwoodjs/core": "^0.33.0"
+    "@redwoodjs/core": "^0.34.1"
   },
   "eslintConfig": {
     "extends": "@redwoodjs/eslint-config",

app/web/jest.config.js

@@ -1,6 +1 @@
-const { getConfig } = require('@redwoodjs/core')
+module.exports = require('@redwoodjs/testing/config/jest/api')
-
-const config = getConfig({ type: 'jest', target: 'browser' })
-config.displayName.name = 'web'
-
-module.exports = config

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.33.0",
+    "@redwoodjs/auth": "^0.34.1",
-    "@redwoodjs/forms": "^0.33.0",
+    "@redwoodjs/forms": "^0.34.1",
-    "@redwoodjs/router": "^0.33.0",
+    "@redwoodjs/router": "^0.34.1",
-    "@redwoodjs/web": "^0.33.0",
+    "@redwoodjs/web": "^0.34.1",
     "@sentry/browser": "^6.5.1",
     "browser-fs-access": "^0.17.2",
     "cloudinary-react": "^1.6.7",
@@ -58,4 +58,4 @@
     "tailwindcss": "^2.1.2",
     "worker-loader": "^3.0.7"
   }
-}
+}