Move SDK generator files to match the new folder structure #3653
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # waspc/data/Generator/templates/sdk/wasp/tsconfig.json
…ranch' into franjo/tsconfig-tracker-bullet-2 # Conflicts: # waspc/cli/src/Wasp/Cli/Command/Build.hs # waspc/src/Wasp/Generator/SdkGenerator.hs # waspc/src/Wasp/Generator/SdkGenerator/Common.hs
…re-sdk-files # Conflicts: # waspc/src/Wasp/Generator/SdkGenerator.hs # waspc/src/Wasp/Generator/SdkGenerator/Auth/OAuthAuthG.hs # waspc/src/Wasp/Generator/SdkGenerator/Common.hs # waspc/src/Wasp/Generator/SdkGenerator/Core/Common.hs # waspc/src/Wasp/Generator/SdkGenerator/Root/Common.hs # waspc/src/Wasp/Generator/SdkGenerator/UserCore/AuthG.hs # waspc/src/Wasp/Generator/SdkGenerator/UserCore/Client/OperationsGenerator.hs # waspc/src/Wasp/Generator/SdkGenerator/UserCore/Common.hs # waspc/src/Wasp/Generator/SdkGenerator/UserCore/EnvValidation.hs # waspc/src/Wasp/Generator/SdkGenerator/UserCore/Server/EmailSenderG.hs # waspc/waspc.cabal
FranjoMindek
temporarily deployed
to
railway-deploy-test
GitHub Actions
Inactive
FranjoMindek
temporarily deployed
to
fly-deploy-test
GitHub Actions
Inactive
This was referenced Jan 23, 2026
Deploying wasp-docs-on-main with
|
| Latest commit: |
1b5e01c
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://e0caef32.wasp-docs-on-main.pages.dev |
| Branch Preview URL: | https://franjo-restructure-sdk-files.wasp-docs-on-main.pages.dev |
@wasp.sh/wasp-cli
@wasp.sh/wasp-cli-darwin-arm64-unknown
@wasp.sh/wasp-cli-darwin-x64-unknown
@wasp.sh/wasp-cli-linux-x64-glibc
@wasp.sh/wasp-cli-linux-x64-musl
commit: |
sodic
approved these changes
Jan 23, 2026
Contributor
sodic
left a comment
sodic
left a comment
There was a problem hiding this comment.
Very nice!
If my assumptions about no changes are correct, this is starting to look great.
Nice work!
| let userNpmDeps = N.getUserNpmDepsForPackage spec | ||
| errorOrWaspFrameworkNpmDeps = | ||
| N.buildWaspFrameworkNpmDeps spec (SG.npmDepsFromWasp spec) (WG.npmDepsFromWasp spec) | ||
| N.buildWaspFrameworkNpmDeps spec (ServerGenerator.npmDepsFromWasp spec) (WebAppGenerator.npmDepsFromWasp spec) |
Contributor
There was a problem hiding this comment.
It's kind of long so I'd go the other way. But any way is fine, you choose. As long as it's consistent :)
| import Wasp.Generator.SdkGenerator.Core.Common (mkTmplFd) | ||
|
|
||
| genCoreTsconfigProject :: AppSpec -> Generator [FileDraft] | ||
| genCoreTsconfigProject _spec = |
Contributor
There was a problem hiding this comment.
During the refactoring PR, we were removing these redundant _spec arguments. We should decide what do do with them and keep it consistent.
Contributor
Author
There was a problem hiding this comment.
Removed this one
Contributor
There was a problem hiding this comment.
I'm assuming this is just moved stuff, no changes.
Contributor
Author
There was a problem hiding this comment.
Yep, most of old sdk generator is here.
Contributor
There was a problem hiding this comment.
I'm assuming this is just moved stuff, no changes.
FranjoMindek
changed the base branch from
franjo/tsconfig-tracker-bullet-2
to
main
…re-sdk-files # Conflicts: # waspc/src/Wasp/Generator/SdkGenerator.hs
FranjoMindek
changed the base branch from
main
to
franjo/tsconfig-tracker-bullet-2
…re-sdk-files # Conflicts: # waspc/src/Wasp/Generator/NpmInstall/Common.hs # waspc/src/Wasp/Generator/SdkGenerator.hs
FranjoMindek
temporarily deployed
to
fly-deploy-test
GitHub Actions
Inactive
FranjoMindek
temporarily deployed
to
railway-deploy-test
GitHub Actions
Inactive
…re-sdk-files # Conflicts: # waspc/src/Wasp/Generator/SdkGenerator.hs # waspc/src/Wasp/Generator/SdkGenerator/UserCore/Client/OperationsGenerator.hs # waspc/src/Wasp/Generator/SdkGenerator/UserCore/Server/OperationsGenerator.hs
FranjoMindek
had a problem deploying
to
fly-deploy-test
GitHub Actions
Failure
FranjoMindek
had a problem deploying
to
railway-deploy-test
GitHub Actions
Failure
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Moves generator files so that they follow the templates structure.
Declutters
SdkGenerator.hsa lot.Type of change
Checklist
I tested my change in a Wasp app to verify that it works as intended.
🧪 Tests and apps:
examples/kitchen-sink/e2e-tests.waspc/data/Cli/templates, as needed.examples/, as needed.examples/tutorials) I updated the tutorial in the docs (and vice versa).📜 Documentation:
web/docs/.🆕 Changelog: (if change is more than just code/docs improvement)
waspc/ChangeLog.mdwith a user-friendly description of the change.web/docs/migration-guides/.versioninwaspc/waspc.cabalto reflect the changes I introduced.