Merge branch 'main' into release

Author: infomiho

waspc/ChangeLog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 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/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 ()