Merge branch 'release'

Author: infomiho

mage/.env.vault

@@ -8,16 +8,16 @@ DOTENV_VAULT_DEVELOPMENT="87scyumyYSTY7eZPRqgy4mZ5eAvaFfKA3Vc7iK8uaDFAC1dMbQ6mhA
 DOTENV_VAULT_DEVELOPMENT_VERSION=3
 
 # ci
-DOTENV_VAULT_CI="E1dE5vBw3NYOiSCctThKodXFVhSj7lGQEbZuwhbwgOLpe2WCX1r6xA7xxTN7qUnHTz4WLdBtgbX/2KAxgobRarYTA2S1zX5YV0c07T8HYcD2eH/6YZkY64EHIsqWbejl6BcdM09Vw/GRl9vuXsVqaDITUZeQyLVN6mDrAw=="
-DOTENV_VAULT_CI_VERSION=2
+DOTENV_VAULT_CI="LVE+nC/3UUOh20WUKOYOOrRT2zvbNtKiRgiThzG+SLAoKHXWn/M8ngZ2BIDHxfgO6Ks1MutVXZrUh+dZ+zzflcryrBn1zssS3A0Txl7Nsd0Kg2rMnwMBXEPhFsCTcaP0bNduYkXdtY7NJcOj8Y3vUI25Vf9oq3d8ZUn9y4yqpf+8BL5AOFft8t5qhlktJA=="
+DOTENV_VAULT_CI_VERSION=3
 
 # staging
-DOTENV_VAULT_STAGING="tEd/HUqX/oqqf/QoUR9gDKmTHHEZT2gOzBXWk5joNqVDPQI8fmsIhVS3TjlKIht23J532aOXkLGfonvbouKXMEFct83XLIakg5trVR5Dsxc70n3NJq5eEbVDp8Jb6qJd52MNvO5iYCGTxF8s7G5xXU/NRsK1YhLwMdCYJg=="
-DOTENV_VAULT_STAGING_VERSION=2
+DOTENV_VAULT_STAGING="NEASFQ4azVVfZoebEJvF4K3PP6ptvddJ0Ae1d/rXMsGYm8/SfsvjEO9aKs2YTh63AspjzNyQ3PzwiYXfRZpJhS/RXUno7nzKVCcUeA9UXP9DoHCoMHzblnezwsdkj1qoQM92KPcoVyfSAnE1plG8r9/NlshhSliMtZR63akGK/A1wOJvdxNufqS8kY3zQA=="
+DOTENV_VAULT_STAGING_VERSION=3
 
 # production
-DOTENV_VAULT_PRODUCTION="5HEjSzjP4ZHqPuH94QIgEeZaa/YR2uLRY1AIDwc8ZBmZDgAhFvaH1UL77uO8qpi9Cs+/AGgVKPN8gIPM9AEZz2abPHAt2nEF8LeEM5ptscP8mgbIUPWwbS1LL9oEnf+gx5Nk82fAcC2Lh8H1XIbJLEnvVGrUSiyfYTkUUQ=="
-DOTENV_VAULT_PRODUCTION_VERSION=2
+DOTENV_VAULT_PRODUCTION="wjCRpcHxoHowGOM5c4VvDH+TU3NTSCZnS5lIaomzbN85k6SLW4+Q7DbCMVMgp66hj0eI7N5yhpfPj/ABac+ZlKnRNO0bhm895AaRXVl9+wVyVXO3rlHBxRiU4KfRzeEazi8lnwftX9c5PKlyTuNlDZX9508zs/OrA+4DMNVR80vwP3iSwGXoe6rtc8zSZA=="
+DOTENV_VAULT_PRODUCTION_VERSION=3
 
 #/----------------settings/metadata-----------------/
 DOTENV_VAULT="vlt_22aba11993b57e97e747de16f2e1066c9ed1c23b200ce0f42853ea453c835909"

mage/.gitignore

@@ -17,3 +17,7 @@
 **/.DS_Store
 # Emacs specific
 .projectile
+
+.env*
+.flaskenv*
+!.env.project

mage/Dockerfile

@@ -22,6 +22,7 @@ WORKDIR /app
 COPY src ./src
 COPY package.json .
 COPY package-lock.json .
+COPY tsconfig*.json .
 COPY server .wasp/build/server
 COPY sdk .wasp/out/sdk
 # Install npm packages, resulting in node_modules/.
@@ -34,16 +35,13 @@ RUN cd .wasp/build/server && npm run bundle
 # TODO: Use pm2?
 # TODO: Use non-root user (node).
 FROM base AS server-production
-RUN curl -sSL https://get.wasp.sh/installer.sh | sh -s -- -v 0.16.4
+RUN curl -sSL https://get.wasp.sh/installer.sh | sh -s -- -v 0.17.1
 ENV PATH "$PATH:/root/.local/bin"
 ENV NODE_ENV production
 WORKDIR /app
 # Copying the top level 'node_modules' because it contains the Prisma packages
 # necessary for migrating the database.
 COPY --from=server-builder /app/node_modules ./node_modules
-# Copying the SDK because the server bundle doesn't bundle the SDK
-# and references the 'wasp' package.
-COPY --from=server-builder /app/.wasp/out/sdk .wasp/out/sdk
 # Copying 'server/node_modules' because we require dotenv package to
 # load environment variables
 # TODO: replace dotenv with native Node.js environment variable loading

mage/fly-client.toml

@@ -1,14 +1,22 @@
-# fly.toml app configuration file generated for wasp-ai-client on 2023-06-29T19:11:34+02:00
+# fly.toml app configuration file generated for wasp-ai-client on 2025-07-18T17:02:10+02:00
 #
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = "wasp-ai-client"
-primary_region = "cdg"
+app = 'wasp-ai-client'
+primary_region = 'cdg'
+
+[build]
 
 [http_service]
   internal_port = 8043
   force_https = true
-  auto_stop_machines = false
-  auto_start_machines = false
+  auto_stop_machines = 'stop'
+  auto_start_machines = true
   min_machines_running = 1
+  processes = ['app']
+
+[[vm]]
+  memory = '1gb'
+  cpu_kind = 'shared'
+  cpus = 1

mage/fly-server.toml

@@ -1,14 +1,22 @@
-# fly.toml app configuration file generated for wasp-ai-server on 2023-06-29T19:11:27+02:00
+# fly.toml app configuration file generated for wasp-ai-server on 2025-07-18T17:01:56+02:00
 #
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = "wasp-ai-server"
-primary_region = "cdg"
+app = 'wasp-ai-server'
+primary_region = 'cdg'
+
+[build]
 
 [http_service]
   internal_port = 8080
   force_https = true
-  auto_stop_machines = false
-  auto_start_machines = false
+  auto_stop_machines = 'stop'
+  auto_start_machines = true
   min_machines_running = 1
+  processes = ['app']
+
+[[vm]]
+  memory = '1gb'
+  cpu_kind = 'shared'
+  cpus = 1

mage/main.wasp

@@ -1,6 +1,6 @@
 app waspAi {
   wasp: {
-    version: "^0.16.0"
+    version: "^0.17.1"
   },
   title: "MAGE - GPT Web App Generator ✨",
   head: [
@@ -22,12 +22,12 @@ app waspAi {
     userEntity: User,
     methods: {
       gitHub: {
-        configFn: import { getGitHubAuthConfig } from "@src/server/auth.js",
-        userSignupFields: import { gitHubUserSignupFields } from "@src/server/auth.ts",
+        configFn: import { getGitHubAuthConfig } from "@src/server/auth",
+        userSignupFields: import { gitHubUserSignupFields } from "@src/server/auth",
       },
       google: {
-        configFn: import { getGoogleAuthConfig } from "@src/server/auth.js",
-        userSignupFields: import { googleUserSignupFields } from "@src/server/auth.ts",
+        configFn: import { getGoogleAuthConfig } from "@src/server/auth",
+        userSignupFields: import { googleUserSignupFields } from "@src/server/auth",
       },
     },
     onAuthFailedRedirectTo: "/",