Skip to content

Commit

Permalink
Next.js 15 + Bug Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
BellCubeDev committed Oct 23, 2024
1 parent 8b33be6 commit f9192da
Show file tree
Hide file tree
Showing 37 changed files with 1,283 additions and 691 deletions.
6 changes: 6 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
DATABASE_URL = 'postgresql://postgres:postgres@localhost:54322/postgres'
DIRECT_URL = 'postgresql://postgres:postgres@localhost:54322/postgres'

# Folder & file for the Stockedhome config
CONFIG_DIR = './config'

IS_SAAS = false

# Address for your web server to be used in metadata and prefilled in the mobile app.
EXPO_PUBLIC_DEFAULT_SERVER = 'https://10.0.0.128/'
NEXT_PUBLIC_BASEURL = 'https://10.0.0.128/'


SITE_PORT=3000
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ pids
*.seed
*.pid.lock

# Other Stuff
/auto-imports.d.ts
tsconfig.vitest-temp.json

# ==============
# Preset
# ==============
Expand Down
3 changes: 2 additions & 1 deletion config/config.saas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ captcha:
# A publicly-accessible site key uniquely identifying your site for the CAPTCHA provider.
#
# This can be removed if the CAPTCHA provider is `none`.
siteKey: 0x4AAAAAAAi0czv5UTMVuCgL # TODO: update this
# TODO: update this for SAAS
siteKey: 0x4AAAAAAAi0czv5UTMVuCgL

supabase:
url: http://supabase.stockedhome.app:54321
17 changes: 15 additions & 2 deletions docker-compose-setup/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@ SUPABASE_STUDIO_PORT=4080

USE_SAAS_UX=false

# Config


# A custom name for the configuration file to use.
#
# For example, the SAAS servers for Stockedhome would use `config.saas.yaml` as the configuration file.
#
# This value is relative to CONFIG_DIR (if set) and should ideally only be a file name.
# When running under Docker, remember that the Docker container has a different file system than the host machine.
CONFIG_FILE = 'config.yaml'

# In addition to a randomly-generated, per-password "salt" value, this value will be added to every password before hashing.
#
# This helps increase security in the case that the database is compromised but the application itself is not.
Expand Down Expand Up @@ -133,5 +144,7 @@ SUPABASE_PUBLIC_URL=http://localhost:${SUPABASE_STUDIO_PORT}



# OPTIONAL: URL of your web server, used for SEO metadata
# NEXT_PUBLIC_BASEURL = 'https://self.bellcube.dev/'
# OPTIONAL: Base URL of your web server, used for SEO metadata and the Web App Manifest.
#
# For an example, the default is "https://stockedhome.app/"
NEXT_PUBLIC_BASEURL = ''
2 changes: 2 additions & 0 deletions docker-compose-setup/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ services:
ANDROID_APP_SHA256_CERT_FINGERPRINTS: ${ANDROID_APP_SHA256_CERT_FINGERPRINTS}
KEEP_ALIVE_TIMEOUT: 10
USE_SAAS_UX: ${USE_SAAS_UX}
NODE_ENV: production
NEXT_PUBLIC_BASEURL: ${NEXT_PUBLIC_BASEURL:-https://stockedhome.app}


studio:
Expand Down
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "stockedhome-application",
"version": "0.0.1",
"private": true,
"packageManager": "pnpm@9.8.0",
"packageManager": "pnpm@9.12.2",
"devDependencies": {
"eslint": "^9.11.1",
"expo-doctor": "^1.10.1",
"turbo": "^2.1.2",
"eslint": "^9.13.0",
"expo-doctor": "^1.11.2",
"turbo": "^2.2.3",
"typescript": "^5.6.2"
},
"prisma": {
Expand Down Expand Up @@ -37,20 +37,21 @@
"**/expo-router/**"
],
"dependencies": {
"@prisma/client": "^5.21.1",
"prisma": "^5.21.1",
"@babel/core": "7.25.2",
"@babel/preset-env": "7.25.4",
"@babel/preset-flow": "^7.24.7",
"@babel/preset-flow": "^7.25.9",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-regular-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/react-native-fontawesome": "^0.3.2",
"@gorhom/bottom-sheet": "^4.6.4",
"@prisma/client": "^5.15.1",
"@react-native/assets-registry": "file:./src/forks/assets-registry",
"@stockedhome/codegen": "link:codegen/results",
"@stockedhome/expo-app": "file:./src/platforms/expo",
"@stockedhome/next-app": "file:./src/platforms/next",
"@tanstack/react-query": "^5.56.2",
"@tanstack/react-query": "^5.59.15",
"@trpc/client": "11.0.0-rc.413",
"@trpc/next": "11.0.0-rc.413",
"@trpc/react-query": "11.0.0-rc.413",
Expand All @@ -70,16 +71,16 @@
"lib": "file:./src/lib",
"maxmind": "^4.3.21",
"memorable-moniker": "^0.5.1",
"next": "^14.2.15",
"next": "^15.0.1",
"octokit": "^4.0.2",
"openapi-typescript-codegen": "^0.29.0",
"prisma": "^5.15.1",
"react-native-web": "~0.19.12",
"react-native-web": "~0.19.13",
"smtp-address-parser": "1.1.0",
"supabase": "^1.200.3",
"supabase": "^1.207.9",
"superjson": "^2.2.1",
"tsx": "^4.19.1",
"vitest": "^2.1.1",
"unplugin-auto-import": "^0.18.3",
"vitest": "^2.1.3",
"zod": "^3.23.8",
"zod-to-json-schema": "^3.23.3"
},
Expand All @@ -104,7 +105,7 @@
"@hexagon/base64": "patches/@hexagon__base64.patch"
},
"overrides": {
"next": "^14.2.15",
"next": "^15.0.1",
"expo": "~51.0.36",
"expo-build-properties": "^0.12.3",
"expo-crypto": "~13.0.2",
Expand Down
Loading

0 comments on commit f9192da

Please sign in to comment.