Merge branch 'main' into release

wasp-lang · Oct 27, 2023 · 4762ae4 · 4762ae4
2 parents be8d0af + 4aeddfb
commit 4762ae4
Show file tree

Hide file tree

Showing 31 changed files with 48 additions and 65 deletions.
diff --git a/waspc/ChangeLog.md b/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

diff --git a/waspc/data/Generator/templates/Dockerfile b/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

diff --git a/waspc/e2e-test/GoldenTest.hs b/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 ()

diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/Dockerfile b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/Dockerfile
diff --git a/...est-outputs/waspBuild-golden/waspBuild/.wasp/build/installedFullStackNpmDependencies.json b/...est-outputs/waspBuild-golden/waspBuild/.wasp/build/installedFullStackNpmDependencies.json
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/package.json b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/server/package.json
diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/package.json b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/web-app/package.json
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/Dockerfile b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/Dockerfile
diff --git a/...t-outputs/waspCompile-golden/waspCompile/.wasp/out/installedFullStackNpmDependencies.json b/...t-outputs/waspCompile-golden/waspCompile/.wasp/out/installedFullStackNpmDependencies.json
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/package.json b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/server/package.json
diff --git a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/package.json b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/web-app/package.json
diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums
diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/Dockerfile b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/Dockerfile
diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/db/package.json b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/db/package.json
diff --git a/...s/waspComplexTest-golden/waspComplexTest/.wasp/out/installedFullStackNpmDependencies.json b/...s/waspComplexTest-golden/waspComplexTest/.wasp/out/installedFullStackNpmDependencies.json