Merge branch 'main' into miho-fly-min-machines

waspc/ChangeLog.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.11.8
+
+### 🎉 [New Feature] Serving the Client From a Subdirectory
+
+You can now serve the client from a subdirectory. This is useful if you want to serve the client from a subdirectory of your domain, e.g. `https://example.com/my-app/`.
+
+To do this, you need to add the `client.baseDir` property to your `.wasp` file:
+
+```wasp
+app todoApp {
+  // ...
+  client: {
+    baseDir: "/my-app",
+  },
+}
+```
+
+## 0.11.7
+
+### 🐞 Bug fixes / 🔧 small improvements
+- Fixed a bug with Prisma which prevent connections via SSL with our versions of Alpine and OpenSSL. We upgraded to the latest Prisma 4.X.X which fixes this issue.
+
+
 ## 0.11.6
 
 ### 🎉 [New Feature] Enable Customising the Vite Config

waspc/data/Generator/templates/Dockerfile

@@ -16,10 +16,6 @@ FROM node:{= nodeMajorVersion =}-alpine3.17 AS node
 
 FROM node AS base
 RUN apk --no-cache -U upgrade # To ensure any potential security patches are applied.
-# TODO: Remove line below (installation of openssl 1.1) once Prisma adds support for
-#   openssl 3 on alpine. Alpine >= 3.17 has openssl 3 as default.
-#   Relevant GH issue: https://github.com/wasp-lang/wasp/issues/877
-RUN apk add --no-cache openssl1.1-compat
 
 
 FROM base AS server-builder

waspc/data/Generator/templates/react-app/src/router.tsx

@@ -47,7 +47,7 @@ export const routes = {
 export type Routes = RouteDefinitionsToRoutes<typeof routes>
 
 const router = (
-  <Router>
+  <Router basename="{= baseDir =}">
     {=# rootComponent.isDefined =}
     <{= rootComponent.importIdentifier =}>
     {=/ rootComponent.isDefined =}

waspc/data/Generator/templates/react-app/vite.config.ts

@@ -12,9 +12,10 @@ const _waspUserProvidedConfig = {};
 {=/ customViteConfig.isDefined =}
 
 const defaultViteConfig = {
+  base: "{= baseDir =}",
   plugins: [react()],
   server: {
-    port: 3000,
+    port: {= defaultClientPort =},
     host: "0.0.0.0",
     open: true,
   },

waspc/data/Generator/templates/server/src/config.js

@@ -32,7 +32,7 @@ const resolvedConfig = merge(config.all, config[env])
 export default resolvedConfig
 
 function getDevelopmentConfig() {
-  const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL) || 'http://localhost:3000';
+  const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL || '{= defaultClientUrl =}');
   return {
     frontendUrl,
     allowedCORSOrigins: '*',

waspc/e2e-test/GoldenTest.hs

@@ -95,7 +95,8 @@ runGoldenTest goldenTest = do
                     "dev.db",
                     "dev.db-journal",
                     "package-lock.json",
-                    ".gitignore"
+                    ".gitignore",
+                    ".DS_Store"
                   ]
 
     writeFileManifest :: String -> [FilePath] -> FilePath -> IO ()