From 6d6077ec01b86df625cef91bf476e6cf0ba81abd Mon Sep 17 00:00:00 2001 From: Carlos Precioso Date: Wed, 21 May 2025 13:48:20 +0200 Subject: [PATCH 1/6] Add build to bundle --- waspc/data/Generator/templates/server/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waspc/data/Generator/templates/server/package.json b/waspc/data/Generator/templates/server/package.json index 14f6464bbe..a3b4c88473 100644 --- a/waspc/data/Generator/templates/server/package.json +++ b/waspc/data/Generator/templates/server/package.json @@ -6,7 +6,7 @@ "type": "module", "comment-filip": "The server.js location changed because we have now included client source files above .wasp/out/server/src.", "scripts": { - "bundle": "rollup --config --silent", + "bundle": "tsc --build && rollup --config --silent", "start": "node --enable-source-maps -r dotenv/config bundle/server.js", "bundle-and-start": "npm run bundle && npm run start", "watch": "nodemon --exec 'npm run bundle-and-start || exit 1'", From 9367121ce38d726bf3f63cf13f2c411d9c0f120d Mon Sep 17 00:00:00 2001 From: Carlos Precioso Date: Wed, 21 May 2025 13:48:26 +0200 Subject: [PATCH 2/6] Snapshots --- .../waspBuild-golden/waspBuild/.wasp/build/.waspchecksums | 2 +- .../waspBuild-golden/waspBuild/.wasp/build/server/package.json | 2 +- .../waspCompile-golden/waspCompile/.wasp/out/.waspchecksums | 2 +- .../waspCompile/.wasp/out/server/package.json | 2 +- .../waspComplexTest/.wasp/out/.waspchecksums | 2 +- .../waspComplexTest/.wasp/out/server/package.json | 2 +- .../waspJob-golden/waspJob/.wasp/out/.waspchecksums | 2 +- .../waspJob-golden/waspJob/.wasp/out/server/package.json | 2 +- .../waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums | 2 +- .../waspMigrate/.wasp/out/server/package.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) 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 index a51b04a794..790d7a33ba 100644 --- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums @@ -466,7 +466,7 @@ "file", "server/package.json" ], - "0ce311426f452b535325628ae341b6d6526d0c10b93849b9369914e7c94f13e2" + "e251aa3fe25a7636c4c26ecfbc46242e14c222eb694e50d4616e3e4164cbc3ac" ], [ [ 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 index b4faf7c92a..acbd7b251d 100644 --- 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 @@ -31,7 +31,7 @@ "prisma": {}, "private": true, "scripts": { - "bundle": "rollup --config --silent", + "bundle": "tsc --build && rollup --config --silent", "bundle-and-start": "npm run bundle && npm run start", "db-migrate-prod": "prisma migrate deploy --schema=../db/schema.prisma", "db-seed": "npm run bundle && node --enable-source-maps -r dotenv/config bundle/dbSeed.js", 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 index 6352a54c27..312a5aa06a 100644 --- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums @@ -473,7 +473,7 @@ "file", "server/package.json" ], - "0ce311426f452b535325628ae341b6d6526d0c10b93849b9369914e7c94f13e2" + "e251aa3fe25a7636c4c26ecfbc46242e14c222eb694e50d4616e3e4164cbc3ac" ], [ [ 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 index b4faf7c92a..acbd7b251d 100644 --- 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 @@ -31,7 +31,7 @@ "prisma": {}, "private": true, "scripts": { - "bundle": "rollup --config --silent", + "bundle": "tsc --build && rollup --config --silent", "bundle-and-start": "npm run bundle && npm run start", "db-migrate-prod": "prisma migrate deploy --schema=../db/schema.prisma", "db-seed": "npm run bundle && node --enable-source-maps -r dotenv/config bundle/dbSeed.js", 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 index adeea3c072..73f37048cf 100644 --- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums @@ -935,7 +935,7 @@ "file", "server/package.json" ], - "bcc70dc10dbec4f941c00f709bab7c574d13af1eb6c9bdd68d07bb8cbeb47009" + "01e131d89fe777d750aae346a031de875ca6d12842e5a06684e9c60c535d1904" ], [ [ diff --git a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/package.json b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/package.json index ebdc8b7c94..8a3ca38ed7 100644 --- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/package.json +++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/server/package.json @@ -31,7 +31,7 @@ "prisma": {}, "private": true, "scripts": { - "bundle": "rollup --config --silent", + "bundle": "tsc --build && rollup --config --silent", "bundle-and-start": "npm run bundle && npm run start", "db-migrate-prod": "prisma migrate deploy --schema=../db/schema.prisma", "db-seed": "npm run bundle && node --enable-source-maps -r dotenv/config bundle/dbSeed.js", diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums index 7076557150..d82b31f319 100644 --- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums @@ -543,7 +543,7 @@ "file", "server/package.json" ], - "0ce311426f452b535325628ae341b6d6526d0c10b93849b9369914e7c94f13e2" + "e251aa3fe25a7636c4c26ecfbc46242e14c222eb694e50d4616e3e4164cbc3ac" ], [ [ diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/package.json b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/package.json index b4faf7c92a..acbd7b251d 100644 --- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/package.json +++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/server/package.json @@ -31,7 +31,7 @@ "prisma": {}, "private": true, "scripts": { - "bundle": "rollup --config --silent", + "bundle": "tsc --build && rollup --config --silent", "bundle-and-start": "npm run bundle && npm run start", "db-migrate-prod": "prisma migrate deploy --schema=../db/schema.prisma", "db-seed": "npm run bundle && node --enable-source-maps -r dotenv/config bundle/dbSeed.js", diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums index 43a7c5428d..1a57e0087b 100644 --- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums @@ -473,7 +473,7 @@ "file", "server/package.json" ], - "bcc70dc10dbec4f941c00f709bab7c574d13af1eb6c9bdd68d07bb8cbeb47009" + "01e131d89fe777d750aae346a031de875ca6d12842e5a06684e9c60c535d1904" ], [ [ diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/package.json b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/package.json index ebdc8b7c94..8a3ca38ed7 100644 --- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/package.json +++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/server/package.json @@ -31,7 +31,7 @@ "prisma": {}, "private": true, "scripts": { - "bundle": "rollup --config --silent", + "bundle": "tsc --build && rollup --config --silent", "bundle-and-start": "npm run bundle && npm run start", "db-migrate-prod": "prisma migrate deploy --schema=../db/schema.prisma", "db-seed": "npm run bundle && node --enable-source-maps -r dotenv/config bundle/dbSeed.js", From bc97d47e676c9e4e103e9f2f9f5c2e0aca5da6cb Mon Sep 17 00:00:00 2001 From: Carlos Precioso Date: Wed, 21 May 2025 13:48:31 +0200 Subject: [PATCH 3/6] Changelog --- waspc/ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/waspc/ChangeLog.md b/waspc/ChangeLog.md index cbe0cdff3d..0f3cb43542 100644 --- a/waspc/ChangeLog.md +++ b/waspc/ChangeLog.md @@ -40,6 +40,7 @@ Follow the [the official migration guide](https://wasp.sh/docs/migration-guides/ - Modernized our TypeScript support for bundlers ([#2656](https://github.com/wasp-lang/wasp/pull/2656)) - Added support for jump-to-definition for Wasp symbols ([#2656](https://github.com/wasp-lang/wasp/pull/2656)) - `userSignupFields` types are now correctly propagated to client auth methods. ([#2641](https://github.com/wasp-lang/wasp/pull/2641)) +- The generated server code is now type-checked before building ([#2778](https://github.com/wasp-lang/wasp/pull/2778)) ## 0.16.4 From c5d762e3b22e41f11ca222cf4747b3ca5e7bce53 Mon Sep 17 00:00:00 2001 From: Carlos Precioso Date: Wed, 28 May 2025 17:46:38 +0200 Subject: [PATCH 4/6] Copy tsconfig file --- waspc/cli/src/Wasp/Cli/Command/Build.hs | 7 +++++++ waspc/data/Generator/templates/Dockerfile | 1 + 2 files changed, 8 insertions(+) diff --git a/waspc/cli/src/Wasp/Cli/Command/Build.hs b/waspc/cli/src/Wasp/Cli/Command/Build.hs index 8f8e034190..aa87f2e108 100644 --- a/waspc/cli/src/Wasp/Cli/Command/Build.hs +++ b/waspc/cli/src/Wasp/Cli/Command/Build.hs @@ -34,6 +34,7 @@ import Wasp.Project.Common packageJsonInWaspProjectDir, packageLockJsonInWaspProjectDir, srcDirInWaspProjectDir, + srcTsConfigInWaspLangProject, ) import Wasp.Util.IO (copyDirectory, copyFile, doesDirectoryExist, removeDirectory) import Wasp.Util.Json (updateJsonFile) @@ -104,6 +105,7 @@ build = do let packageJsonInBuildDir = buildDir castRel packageJsonInWaspProjectDir let packageLockJsonInBuildDir = buildDir castRel packageLockJsonInWaspProjectDir + let tsconfigJsonInBuildDir = buildDir castRel srcTsConfigInWaspLangProject liftIO $ copyFile @@ -115,6 +117,11 @@ build = do (waspProjectDir packageLockJsonInWaspProjectDir) packageLockJsonInBuildDir + liftIO $ + copyFile + (waspProjectDir srcTsConfigInWaspLangProject) + tsconfigJsonInBuildDir + -- A hacky quick fix for https://github.com/wasp-lang/wasp/issues/2368 -- We should remove this code once we implement a proper solution. ExceptT $ updateJsonFile removeWaspConfigFromDevDependenciesArray packageJsonInBuildDir diff --git a/waspc/data/Generator/templates/Dockerfile b/waspc/data/Generator/templates/Dockerfile index 29042fe965..1b49102e66 100644 --- a/waspc/data/Generator/templates/Dockerfile +++ b/waspc/data/Generator/templates/Dockerfile @@ -33,6 +33,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/. From 268c91b1075a64971d47ed9cf03adb724e6ccbe2 Mon Sep 17 00:00:00 2001 From: Carlos Precioso Date: Wed, 28 May 2025 18:12:02 +0200 Subject: [PATCH 5/6] Updat snapshots --- .../waspBuild-golden/files.manifest | 1 + .../waspBuild/.wasp/build/.waspchecksums | 2 +- .../waspBuild/.wasp/build/Dockerfile | 1 + .../waspBuild/.wasp/build/tsconfig.json | 34 +++++++++++++++++++ .../waspCompile/.wasp/out/.waspchecksums | 2 +- .../waspCompile/.wasp/out/Dockerfile | 1 + .../waspComplexTest/.wasp/out/.waspchecksums | 2 +- .../waspComplexTest/.wasp/out/Dockerfile | 1 + .../waspJob/.wasp/out/.waspchecksums | 2 +- .../waspJob/.wasp/out/Dockerfile | 1 + .../waspMigrate/.wasp/out/.waspchecksums | 2 +- .../waspMigrate/.wasp/out/Dockerfile | 1 + 12 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/tsconfig.json diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest b/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest index 572b6927ac..bea8953a2e 100644 --- a/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest +++ b/waspc/e2e-test/test-outputs/waspBuild-golden/files.manifest @@ -288,6 +288,7 @@ waspBuild/.wasp/build/src/Main.css waspBuild/.wasp/build/src/MainPage.jsx waspBuild/.wasp/build/src/vite-env.d.ts waspBuild/.wasp/build/src/waspLogo.png +waspBuild/.wasp/build/tsconfig.json waspBuild/.wasp/build/web-app/.npmrc waspBuild/.wasp/build/web-app/README.md waspBuild/.wasp/build/web-app/index.html 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 index e6b8acf479..cacd9ef815 100644 --- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/.waspchecksums @@ -424,7 +424,7 @@ "file", "Dockerfile" ], - "0a244b8e1f4a86228b613cfc6c370142759297c1cbfa7f71f5c6ccd4bb05db55" + "3ae5c9ce56794a1380463267c9c78b90eb98caeab1cd3486d88e8a43f152b42d" ], [ [ 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 index f78f7f0cb7..407c58e6b2 100644 --- a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/Dockerfile +++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/Dockerfile @@ -32,6 +32,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/. diff --git a/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/tsconfig.json b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/tsconfig.json new file mode 100644 index 0000000000..ac792df14f --- /dev/null +++ b/waspc/e2e-test/test-outputs/waspBuild-golden/waspBuild/.wasp/build/tsconfig.json @@ -0,0 +1,34 @@ +// =============================== IMPORTANT ================================= +// This file is mainly used for Wasp IDE support. +// +// Wasp will compile your code with slightly different (less strict) compilerOptions. +// You can increase the configuration's strictness (e.g., by adding +// "noUncheckedIndexedAccess": true), but you shouldn't reduce it (e.g., by +// adding "strict": false). Just keep in mind that this will only affect your +// IDE support, not the actual compilation. +// +// Full TypeScript configurability is coming very soon :) +{ + "compilerOptions": { + "module": "esnext", + "composite": true, + "target": "esnext", + "moduleResolution": "bundler", + "jsx": "preserve", + "strict": true, + "esModuleInterop": true, + "isolatedModules": true, + "moduleDetection": "force", + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], + "skipLibCheck": true, + "allowJs": true, + "outDir": ".wasp/out/user" + }, + "include": [ + "src" + ] +} 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 index 093a05f790..96e21d4aac 100644 --- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/.waspchecksums @@ -424,7 +424,7 @@ "file", "Dockerfile" ], - "0a244b8e1f4a86228b613cfc6c370142759297c1cbfa7f71f5c6ccd4bb05db55" + "3ae5c9ce56794a1380463267c9c78b90eb98caeab1cd3486d88e8a43f152b42d" ], [ [ 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 index f78f7f0cb7..407c58e6b2 100644 --- a/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/Dockerfile +++ b/waspc/e2e-test/test-outputs/waspCompile-golden/waspCompile/.wasp/out/Dockerfile @@ -32,6 +32,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/. 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 index c2fda46ef9..5c29f9e60f 100644 --- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums @@ -886,7 +886,7 @@ "file", "Dockerfile" ], - "f9f1ca52eb9e344f4c9f6ddd151a31c17c355cc875fec44dc3bd537fdac504a6" + "5f260f7bbe676b188c546705718c0a50ebced44c5e0224995d737c49e42c9abf" ], [ [ 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 index c392765515..178f8a4053 100644 --- a/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/Dockerfile +++ b/waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/Dockerfile @@ -32,6 +32,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/. diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums index 51bef8497b..0ec58bba37 100644 --- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/.waspchecksums @@ -494,7 +494,7 @@ "file", "Dockerfile" ], - "0a244b8e1f4a86228b613cfc6c370142759297c1cbfa7f71f5c6ccd4bb05db55" + "3ae5c9ce56794a1380463267c9c78b90eb98caeab1cd3486d88e8a43f152b42d" ], [ [ diff --git a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/Dockerfile b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/Dockerfile index f78f7f0cb7..407c58e6b2 100644 --- a/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/Dockerfile +++ b/waspc/e2e-test/test-outputs/waspJob-golden/waspJob/.wasp/out/Dockerfile @@ -32,6 +32,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/. diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums index d0366efa43..382f07d277 100644 --- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums +++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/.waspchecksums @@ -424,7 +424,7 @@ "file", "Dockerfile" ], - "f9f1ca52eb9e344f4c9f6ddd151a31c17c355cc875fec44dc3bd537fdac504a6" + "5f260f7bbe676b188c546705718c0a50ebced44c5e0224995d737c49e42c9abf" ], [ [ diff --git a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/Dockerfile b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/Dockerfile index c392765515..178f8a4053 100644 --- a/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/Dockerfile +++ b/waspc/e2e-test/test-outputs/waspMigrate-golden/waspMigrate/.wasp/out/Dockerfile @@ -32,6 +32,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/. From 10ac5b906092ffc6c675e979bad0f0dbb84530d2 Mon Sep 17 00:00:00 2001 From: Carlos Precioso Date: Tue, 3 Jun 2025 16:11:05 +0200 Subject: [PATCH 6/6] Add comment --- waspc/cli/src/Wasp/Cli/Command/Build.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/waspc/cli/src/Wasp/Cli/Command/Build.hs b/waspc/cli/src/Wasp/Cli/Command/Build.hs index aa87f2e108..ac3d969b3d 100644 --- a/waspc/cli/src/Wasp/Cli/Command/Build.hs +++ b/waspc/cli/src/Wasp/Cli/Command/Build.hs @@ -117,6 +117,8 @@ build = do (waspProjectDir packageLockJsonInWaspProjectDir) packageLockJsonInBuildDir + -- We need the main tsconfig.json file since the built server's TS config + -- extends from it. liftIO $ copyFile (waspProjectDir srcTsConfigInWaspLangProject)