Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions waspc/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,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.5

Expand Down
9 changes: 9 additions & 0 deletions waspc/cli/src/Wasp/Cli/Command/Build.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -104,6 +105,7 @@ build = do

let packageJsonInBuildDir = buildDir </> castRel packageJsonInWaspProjectDir
let packageLockJsonInBuildDir = buildDir </> castRel packageLockJsonInWaspProjectDir
let tsconfigJsonInBuildDir = buildDir </> castRel srcTsConfigInWaspLangProject

liftIO $
copyFile
Expand All @@ -115,6 +117,13 @@ build = do
(waspProjectDir </> packageLockJsonInWaspProjectDir)
packageLockJsonInBuildDir

-- We need the main tsconfig.json file since the built server's TS config
-- extends from it.
liftIO $
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add a comment that explains that we need this tsconfig.json file since the server config references the user TS config file. It took me a bit to figure this out when I was reviewing this.

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
Expand Down
1 change: 1 addition & 0 deletions waspc/data/Generator/templates/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/.
Expand Down
2 changes: 1 addition & 1 deletion waspc/data/Generator/templates/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading