Updated e2e tests.

waspc/README.md

@@ -354,7 +354,7 @@ If it happens just once every so it is probably nothing to worry about. If it ha
 
 ### Typical Release Process
 - Update ChangeLog.md with release notes, update version in waspc.cabal, and open a PR for feedback.
-- After approval, squash and merge mentioned PR into `main`.
+- After approval and after all the checks (CI) passed, squash and merge mentioned PR into `main`.
 - Update your local repository state to have all remote changes (`git fetch`).
 - Update `main` to contain changes from `release` by running `git merge release` while on the `main` branch. Resolve any conflicts.
 - Fast-forward `release` to this new, updated `main` by running `git merge main` while on the `release` branch.

waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums

@@ -11,7 +11,7 @@
             "file",
             "Dockerfile"
         ],
-        "23e349c902e95729709edde1e2605da6d464d666cf40271ce3aacdebb7760c40"
+        "576e1a40a9d7e838cdbe23a504c9a8d4d53d8614e2bcd2d01838fa63541674b6"
     ],
     [
         [

waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/Dockerfile

@@ -5,16 +5,24 @@
 FROM node:18-alpine3.17 AS node
 
 
+# We split Dockerfile into base, server-builder and server-production.
+# This way we have separate situations -> in server-builder we build all
+# we need to run the server, and then in server-production we start fresh
+# and just copy what we need from server-builder, avoiding intermediate
+# artifacts and any settings / pollution we don't need in production
+# but only for building.
+
+
 FROM node AS base
 RUN apk --no-cache -U upgrade # To ensure any potential security patches are applied.
-
-
-FROM base AS server-builder
-RUN apk add --no-cache build-base libtool autoconf automake python3
 # 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
+RUN apk add --no-cache build-base libtool autoconf automake
 WORKDIR /app
 # Install npm packages, resulting in node_modules/.
 COPY server/package*.json ./server/
@@ -24,6 +32,8 @@ RUN cd server && npm install
 # TODO: Use pm2?
 # TODO: Use non-root user (node).
 FROM base AS server-production
+# In case they want to use python3 in their app.
+RUN apk add --no-cache python3
 ENV NODE_ENV production
 WORKDIR /app
 COPY --from=server-builder /app/server/node_modules ./server/node_modules

waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/main.wasp

@@ -1,7 +1,7 @@
 app waspBuild {
   db: { system: PostgreSQL },
   wasp: {
-    version: "^0.7.2"
+    version: "^0.7.3"
   },
   title: "waspBuild"
 }

waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums

@@ -11,7 +11,7 @@
             "file",
             "Dockerfile"
         ],
-        "23e349c902e95729709edde1e2605da6d464d666cf40271ce3aacdebb7760c40"
+        "576e1a40a9d7e838cdbe23a504c9a8d4d53d8614e2bcd2d01838fa63541674b6"
     ],
     [
         [

waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/Dockerfile

@@ -5,16 +5,24 @@
 FROM node:18-alpine3.17 AS node
 
 
+# We split Dockerfile into base, server-builder and server-production.
+# This way we have separate situations -> in server-builder we build all
+# we need to run the server, and then in server-production we start fresh
+# and just copy what we need from server-builder, avoiding intermediate
+# artifacts and any settings / pollution we don't need in production
+# but only for building.
+
+
 FROM node AS base
 RUN apk --no-cache -U upgrade # To ensure any potential security patches are applied.
-
-
-FROM base AS server-builder
-RUN apk add --no-cache build-base libtool autoconf automake python3
 # 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
+RUN apk add --no-cache build-base libtool autoconf automake
 WORKDIR /app
 # Install npm packages, resulting in node_modules/.
 COPY server/package*.json ./server/
@@ -24,6 +32,8 @@ RUN cd server && npm install
 # TODO: Use pm2?
 # TODO: Use non-root user (node).
 FROM base AS server-production
+# In case they want to use python3 in their app.
+RUN apk add --no-cache python3
 ENV NODE_ENV production
 WORKDIR /app
 COPY --from=server-builder /app/server/node_modules ./server/node_modules

waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/main.wasp

@@ -1,6 +1,6 @@
 app waspCompile {
   wasp: {
-    version: "^0.7.2"
+    version: "^0.7.3"
   },
   title: "waspCompile"
 }

waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums

@@ -11,7 +11,7 @@
             "file",
             "Dockerfile"
         ],
-        "23e349c902e95729709edde1e2605da6d464d666cf40271ce3aacdebb7760c40"
+        "576e1a40a9d7e838cdbe23a504c9a8d4d53d8614e2bcd2d01838fa63541674b6"
     ],
     [
         [

waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/Dockerfile

@@ -5,16 +5,24 @@
 FROM node:18-alpine3.17 AS node
 
 
+# We split Dockerfile into base, server-builder and server-production.
+# This way we have separate situations -> in server-builder we build all
+# we need to run the server, and then in server-production we start fresh
+# and just copy what we need from server-builder, avoiding intermediate
+# artifacts and any settings / pollution we don't need in production
+# but only for building.
+
+
 FROM node AS base
 RUN apk --no-cache -U upgrade # To ensure any potential security patches are applied.
-
-
-FROM base AS server-builder
-RUN apk add --no-cache build-base libtool autoconf automake python3
 # 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
+RUN apk add --no-cache build-base libtool autoconf automake
 WORKDIR /app
 # Install npm packages, resulting in node_modules/.
 COPY server/package*.json ./server/
@@ -24,6 +32,8 @@ RUN cd server && npm install
 # TODO: Use pm2?
 # TODO: Use non-root user (node).
 FROM base AS server-production
+# In case they want to use python3 in their app.
+RUN apk add --no-cache python3
 ENV NODE_ENV production
 WORKDIR /app
 COPY --from=server-builder /app/server/node_modules ./server/node_modules

waspc/e2e-test/test-outputs/waspJob-golden/waspJob/main.wasp

@@ -1,7 +1,7 @@
 app waspJob {
   db: { system: PostgreSQL },
   wasp: {
-    version: "^0.7.2"
+    version: "^0.7.3"
   },
   title: "waspJob"
 }

waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums

@@ -11,7 +11,7 @@
             "file",
             "Dockerfile"
         ],
-        "a52da8d519ba59a3c3e2c90bad1e8231c084fbf2db4993b1846bdd03cb4651c2"
+        "fc947858a99b55ff5963560b5201f3b54e4f302768ba4ab30f3ebe0cab14fb0f"
     ],
     [
         [

waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/Dockerfile

@@ -5,16 +5,24 @@
 FROM node:18-alpine3.17 AS node
 
 
+# We split Dockerfile into base, server-builder and server-production.
+# This way we have separate situations -> in server-builder we build all
+# we need to run the server, and then in server-production we start fresh
+# and just copy what we need from server-builder, avoiding intermediate
+# artifacts and any settings / pollution we don't need in production
+# but only for building.
+
+
 FROM node AS base
 RUN apk --no-cache -U upgrade # To ensure any potential security patches are applied.
-
-
-FROM base AS server-builder
-RUN apk add --no-cache build-base libtool autoconf automake python3
 # 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
+RUN apk add --no-cache build-base libtool autoconf automake
 WORKDIR /app
 # Install npm packages, resulting in node_modules/.
 COPY server/package*.json ./server/
@@ -26,6 +34,8 @@ RUN cd server && npx prisma generate --schema=../db/schema.prisma
 # TODO: Use pm2?
 # TODO: Use non-root user (node).
 FROM base AS server-production
+# In case they want to use python3 in their app.
+RUN apk add --no-cache python3
 ENV NODE_ENV production
 WORKDIR /app
 COPY --from=server-builder /app/server/node_modules ./server/node_modules

waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/main.wasp

@@ -1,6 +1,6 @@
 app waspMigrate {
   wasp: {
-    version: "^0.7.2"
+    version: "^0.7.3"
   },
   title: "waspMigrate"
 }

waspc/e2e-test/test-outputs/waspNew-golden/waspNew/main.wasp

@@ -1,6 +1,6 @@
 app waspNew {
   wasp: {
-    version: "^0.7.2"
+    version: "^0.7.3"
   },
   title: "waspNew"
 }