nitro-web 0.0.74 → 0.0.76

package/components/auth/auth.api.js

@@ -6,7 +6,7 @@ import { Strategy as JwtStrategy, ExtractJwt } from 'passport-jwt'
 import db from 'monastery'
 import jsonwebtoken from 'jsonwebtoken'
 import { sendEmail } from 'nitro-web/server'
-import { isArray, pick, isString, ucFirst, fullNameSplit } from 'nitro-web/util'
+import { isArray, pick, ucFirst, fullNameSplit } from 'nitro-web/util'
 
 let authConfig = null
 const JWT_SECRET = process.env.JWT_SECRET || 'replace_this_with_secure_env_secret'
@@ -106,7 +106,7 @@ async function store(req, res) {
 async function signup(req, res) {
   try {
     const desktop = req.query.desktop
-    let user = await this.userCreate(req.body, this.findUserFromProvider)
+    let user = await this.userCreate(req.body)
     sendEmail({
       config: authConfig,
       template: 'welcome',
@@ -315,8 +315,12 @@ export async function signinAndGetStore(user, isDesktop, getStore) {
   return { ...store, jwt }
 }
 
-export async function userCreate({ name, business, email, password, findUserFromProvider }) {
+export async function userCreate({ name, business, email, password }) {
   try {
+    if (!this.findUserFromProvider) {
+      throw new Error('this.findUserFromProvider doesn\'t exist, make sure the context is available when calling this function')
+    }
+
     const options = { blacklist: ['-_id'] }
     const isMultiTenant = !authConfig.isNotMultiTenant
     const userId = db.id()

package/components/partials/form/field.tsx

@@ -22,7 +22,7 @@ type FieldExtraProps = {
   /** icon to show in the input */
   icon?: React.ReactNode
   iconPos?: 'left' | 'right'
-  /** Pass dependencies to break memoization, handy for onChange/onInputChange */
+  /** Dependencies to break the implicit memoization of onChange/onInputChange */
   deps?: unknown[]
   placeholder?: string
 }
@@ -181,25 +181,19 @@ function ColorSvg({ hex }: { hex?: string }) {
 }
 
 export function isFieldCached(prev: IsFieldCachedProps, next: IsFieldCachedProps) {
+  // Check if the field is cached, onChange/onInputChange doesn't affect the cache
   const path = prev.name
   const state = prev.state || {}
-  // If state/satte-error values have changed, re-render!
-  if (deepFind(state, path) !== deepFind(next.state || {}, path)) {
-    // console.log(1, 'state changed', path)
-    return false
-  }
-  if (getErrorFromState(state, path) !== getErrorFromState(next.state || {}, path)) {
-    // console.log(2, 'error changed', path)
-    return false
-  }
-  // If deps have changed, re-render!
-  if ((next.deps?.length !== prev.deps?.length) || next.deps?.some((v, i) => v !== prev.deps?.[i])) {
-    // console.log(3, 'deps changed', path)
-    return false
-  }
-  // If any other props have changed, except onChange/onInputChange, re-render!
-  // In most cases, onChange/onInputChange remain the same and reference the same function...
-  for (const k in prev) {
+  // If the state value has changed, re-render!
+  if (deepFind(state, path) !== deepFind(next.state || {}, path)) return false
+  // If the state error has changed, re-render!
+  if (getErrorFromState(state, path) !== getErrorFromState(next.state || {}, path)) return false
+  // If `deps` have changed, handy for onChange/onInputChange, re-render!
+  if ((next.deps?.length !== prev.deps?.length) || next.deps?.some((v, i) => v !== prev.deps?.[i])) return false
+
+  // Check if any prop has changed, except `onChange`/`onInputChange`
+  const allKeys = new Set([...Object.keys(prev), ...Object.keys(next)])
+  for (const k of allKeys) {
     if (k === 'state' || k === 'onChange' || k === 'onInputChange') continue
     if (prev[k as keyof typeof prev] !== next[k as keyof typeof next]) {
       // console.log(4, 'changed', path, k)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-web",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "repository": "github:boycce/nitro-web",
   "homepage": "https://boycce.github.io/nitro-web/",
   "description": "Nitro is a battle-tested, modular base project to turbocharge your projects, styled using Tailwind 🚀",

package/server/email/reset-password.html

@@ -1,6 +1,6 @@
 <!-- 
-  - You can view templates at http://localhost:3001/email/reset-password
-  - To modify the css, add your own /server/email/partials/email.css file
+  - You can view templates at http://localhost:3000/email/reset-password
+  - To modify the css, add your own ./server/email/partials/email.css file
   - You can copy any nitro email .swig/html template to your project, and modify it
 -->
   

package/server/email/welcome.html

@@ -1,6 +1,6 @@
 <!-- 
-  - You can view templates at http://localhost:3001/email/welcome
-  - To modify the css, add your own /server/email/partials/email.css file
+  - You can view templates at http://localhost:3000/email/welcome
+  - To modify the css, add your own ./server/email/partials/email.css file
   - You can copy any nitro email .swig/html template to your project, and modify it
 -->
 

package/server/router.js

@@ -98,7 +98,8 @@ export async function setupRouter (config) {
   let indexExists = !!fs.existsSync(distDir + 'index.html')
 
   // Register email routes for development
-  // E.g. http://localhost:3001/email/welcome
+  // E.g. http://localhost:3001/email/welcome Or
+  // E.g. http://localhost:3000/email/welcome (with webpack-dev-server proxy)
   if (env == 'development') {
     expressApp.get('/email/partials/email.css', (req, res) => {
       // first check if there is a custom email.css in the emailTemplateDir