Setting up SDK workspace infrastructure #3505

FranjoMindek · 2025-12-16T11:29:19Z

Description

Part of issue: #2247
More specifically, part 1 of: #2247 (comment)

Confirmed working:

examples/kitchen-sink
- wasp compile ✅
- wasp start ✅
- wasp build ✅
- wasp build start ✅

Type of change

🔧 Just code/docs improvement
🐞 Bug fix
🚀 New/improved feature
💥 Breaking change

Checklist

FranjoMindek · 2025-12-16T11:32:37Z

waspc/data/Generator/templates/sdk/wasp/core/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  // TODO: Eventually switch to user's config.
+  "extends": "../tsconfig.sdk.json",


tsconfig.sdk.json is our old sdk/wasp/tsconfig.json

FranjoMindek · 2025-12-16T11:37:21Z

waspc/data/Generator/templates/sdk/wasp/tsconfig.sdk.json

+    "skipLibCheck": true,
+    "allowJs": true,
+    "composite": true,
+


I've removed rootDir and outDir fields.
Those are handled by core/tsconfig.json and user-core/tsconfig.json respectively.

This is because when using extends, the paths inside the extended tsconfig are calculated relatively to the extended tsconfig, not the tsconfig which extended it, which can be confusing.
E.g.
tsconfig.sdk.json has outDir: "."
core/tsconfig.json extends ../tsconfig.sdk.json
core/tsconfig.json will have outDir: ".." NOT outDir: "."

That's why I define them in referenced tsconfigs directly.

FranjoMindek · 2025-12-16T11:53:28Z

waspc/data/Generator/templates/sdk/wasp/tsconfig.sdk.json

+       While this is great, we still want to dig deeper at some point to understand
+       better why Vite HMR misbehaves when the SDK is recompiled:
+       https://github.com/wasp-lang/wasp/issues/1934
+    */


I've also removed

"types": [ /* This is needed to properly support Vitest testing with jest-dom matchers. Types for jest-dom are not recognized automatically and Typescript complains about missing types e.g. when using `toBeInTheDocument` and other matchers. */ "@testing-library/jest-dom" ],

Because we no longer require it since moving jest-dom types to vite-end.d.ts file: https://github.com/wasp-lang/wasp/pull/2656/files

Full tested table:
vite - import '@testing-library/jest-dom' present in src/vite-env.d.ts
sdk - testing-library/jest-dom present in sdk/wasp/tsconfig.json's types
user - node_modules/@testing-library present in ./tsconfig.json's typeRoots of user's tsconfig
compiles - wasp compile
IDE - editor support, no "squiggly lines"

vite sdk user compiles IDE note

❌ ✅ ✅ ✅ ✅ ← state before #2656 PR

✅ ✅ ❌ ✅ ✅ ← current state

✅ ❌ ❌ ✅ ✅ ← the change I'm making

❌ ✅ ❌ ✅ ❌ runtime error (wasp start)

❌ ❌ ❌ ❌ ❌

❌ ❌ ✅ ❌ ✅

✅ ✅ ✅ ✅ ✅

FranjoMindek · 2025-12-16T12:13:24Z

waspc/src/Wasp/Generator/SdkGenerator/Common.hs

 sdkRootDirInGeneratedCodeDir :: Path' (Rel ProjectRootDir) (Dir SdkRootDir)
-sdkRootDirInGeneratedCodeDir = [reldir|sdk/wasp|]
+sdkRootDirInGeneratedCodeDir = [reldir|sdk/wasp/user-core|]



This solution mostly hardcodes paths to get the minimum changes to make a full vertical line work.
Making the new SDK paths infrastructure is for the next PR.

cloudflare-workers-and-pages · 2025-12-16T14:28:13Z

Deploying wasp-docs-on-main with Cloudflare Pages

Latest commit:	`d208fef`
Status:	✅ Deploy successful!
Preview URL:	https://9d8903f7.wasp-docs-on-main.pages.dev
Branch Preview URL:	https://franjo-initial-workspaces.wasp-docs-on-main.pages.dev

View logs

FranjoMindek · 2025-12-16T14:34:51Z

waspc/data/Generator/templates/sdk/wasp/user-core/server/index.ts

 export { type ServerSetupFn } from './types/index.js'
 // PUBLIC API
-export { HttpError } from './HttpError.js'
+export { HttpError } from '../../core/server/HttpError.js'


Problem: package.json does not support the array options for exports field.
E.g., "./server": ["./dist/core/server/index.js", "./dist/user-core/server/index.js"], is not possible.

This means that when we split sdk/wasp into core and user-core tsconfig projects, we will need to:

Re-export core exports in appropriate user-core files.
Example is HttpError above.

Change our package.json to export ./dist/user-core/<FILE> instead of ./dist/<FILE>.

To make relative import/export paths work even in built files, we need to recreate the same structure they had in source files.

That's why we have:

sdk/wasp/ ├── tsconfig.json ├── package.json ├── ... ├── core/ │ ├── tsconfig.json │ └── ... ├── user-core/ │ ├── tsconfig.json │ └── ... └── dist/ ├── core/ │ ├── .tsbuildinfo │ └── ... └── user-core/ ├── .tsbuildinfo └── ...

FranjoMindek · 2025-12-16T14:44:42Z

waspc/data/Generator/templates/sdk/wasp/package.json

  "type": "module",
  "scripts": {
-      "build": "tsc && node ./scripts/copy-assets.js",
+      "build": "tsc -b && node ./copy-assets.js",


-b flag is necessary to build referenced projects.

https://www.typescriptlang.org/docs/handbook/project-references.html#build-mode-for-typescript

FranjoMindek · 2025-12-16T14:51:16Z

waspc/data/Generator/templates/sdk/wasp/package.json

      {=!  Used by our code, undocumented (but accessible) for users. =}
-      "./core/serialization": "./dist/core/serialization/index.js",
-      "./core/auth": "./dist/core/auth.js",
+      "./core/serialization": "./dist/user-core/core/serialization/index.js",


How to handle exports once we actually split all of the files?

We will probably have 3 situations:

Old sdk/wasp/ file is moved fully to core/
Probably will point to ./dist/core/ or we can still force the exports through ./dist/user-core/.

Old sdk/wasp/ file is moved fully to user-core/
Probably will point to ./dist/user-core/

Old sdk/wasp/ file is partially moved to core/ and partially moved to user-core/
Probably will re-export core/ stuff in user-core/ and point to ./dist/user-core.
Like with HttpError above.

Maybe a separate project/dir for public API?
Research!

FranjoMindek · 2025-12-17T12:41:47Z

waspc/cli/src/Wasp/Cli/Command/Build.hs

  -- We are using the same SDK location for both build and start. Read this issue
  -- for the full story: https://github.com/wasp-lang/wasp/issues/1769
-  let sdkDir = waspProjectDir </> dotWaspDirInWaspProjectDir </> generatedCodeDirInDotWaspDir </> sdkRootDirInProjectRootDir
+  let sdkDir = waspProjectDir </> dotWaspDirInWaspProjectDir </> generatedCodeDirInDotWaspDir </> realSdkRootDirInGeneratedCodeDir


Since I made sdkRootDirInProjectRootDir have a value of sdk/wasp/user-core to minimize changes for for SDK template files, the build wasn't properly copying as I need to copy the root dir.

realSdkRootDirInGeneratedCodeDir instead points to sdk/wasp which makes it work.

pkg-pr-new · 2025-12-17T12:43:09Z

Open in StackBlitz

@wasp.sh/wasp-cli

npx https://pkg.pr.new/wasp-lang/wasp/@wasp.sh/wasp-cli@3505

@wasp.sh/wasp-cli-darwin-arm64-unknown

npx https://pkg.pr.new/wasp-lang/wasp/@wasp.sh/wasp-cli-darwin-arm64-unknown@3505

@wasp.sh/wasp-cli-darwin-x64-unknown

npx https://pkg.pr.new/wasp-lang/wasp/@wasp.sh/wasp-cli-darwin-x64-unknown@3505

@wasp.sh/wasp-cli-linux-x64-glibc

npx https://pkg.pr.new/wasp-lang/wasp/@wasp.sh/wasp-cli-linux-x64-glibc@3505

@wasp.sh/wasp-cli-linux-x64-musl

npx https://pkg.pr.new/wasp-lang/wasp/@wasp.sh/wasp-cli-linux-x64-musl@3505

commit: d4ece09

FranjoMindek · 2025-12-17T12:44:14Z

...data/Generator/templates/sdk/wasp/user-core/auth/forms/internal/email/ForgotPasswordForm.tsx

@@ -1,6 +1,6 @@
 import { useContext } from 'react'
 import { useForm } from 'react-hook-form'
-import { requestPasswordReset } from '../../../email/actions/passwordReset.js'


When I moved the whole folder, VSC organized all imports automatically for the moved files.
I tried to minimize the large changes (sorting) and left ones which I deem more beneficial:

removal of .jsx or .js suffixes

unused imports

The rest were reverted to best of my abilities.

We can discuss if we want to revert all of them.

Should be okay because of: #2493

We still don't bundle SDK individually, but through the server.

FranjoMindek · 2025-12-17T12:49:25Z

waspc/src/Wasp/Generator/SdkGenerator/Common.hs

    </> sdkRootDirInGeneratedCodeDir

+realSdkRootDirInGeneratedCodeDir :: Path' (Rel ProjectRootDir) (Dir SdkRootDir)
+realSdkRootDirInGeneratedCodeDir = [reldir|sdk/wasp|]


Used only for wasp build command.

waspc/data/Generator/templates/sdk/wasp/core/tsconfig.json

FranjoMindek added 4 commits December 12, 2025 14:10

init

9626609

some improvements

b41dd62

work

f280a32

remove

15d0ef8

FranjoMindek commented Dec 16, 2025

View reviewed changes

FranjoMindek marked this pull request as draft December 16, 2025 13:44

FranjoMindek added 2 commits December 16, 2025 15:25

imports

52a81de

Merge branch 'main' into franjo/initial-workspaces

d208fef

FranjoMindek had a problem deploying to fly-deploy-test December 16, 2025 14:28 — with GitHub Actions Failure

FranjoMindek commented Dec 16, 2025

View reviewed changes

revert

b80c2e9

FranjoMindek had a problem deploying to fly-deploy-test December 16, 2025 16:27 — with GitHub Actions Error

revert

76139ac

FranjoMindek had a problem deploying to fly-deploy-test December 16, 2025 16:28 — with GitHub Actions Error

revert

94835a3

FranjoMindek had a problem deploying to fly-deploy-test December 16, 2025 16:28 — with GitHub Actions Error

revert

3c1f5dd

FranjoMindek had a problem deploying to fly-deploy-test December 16, 2025 16:31 — with GitHub Actions Failure

fix build copy

6799ad5

FranjoMindek temporarily deployed to fly-deploy-test December 17, 2025 12:28 — with GitHub Actions Inactive

FranjoMindek commented Dec 17, 2025

View reviewed changes

ormolu

1f3c6c6

FranjoMindek temporarily deployed to fly-deploy-test December 17, 2025 12:53 — with GitHub Actions Inactive

FranjoMindek commented Dec 18, 2025

View reviewed changes

waspc/data/Generator/templates/sdk/wasp/core/tsconfig.json Outdated Show resolved Hide resolved

remove tsbuildinfo path

d4ece09

FranjoMindek temporarily deployed to fly-deploy-test December 18, 2025 13:51 — with GitHub Actions Inactive

This was referenced Dec 18, 2025

Implement tsconfig project references infrastructure for SDK #3517

Open

Remove leftover jest-dom types from the SDK. #3522

Open

vite	sdk	user	compiles	IDE	note
❌	✅	✅	✅	✅	← state before #2656 PR
✅	✅	❌	✅	✅	← current state
✅	❌	❌	✅	✅	← the change I'm making
❌	✅	❌	✅	❌	runtime error (wasp start)
❌	❌	❌	❌	❌
❌	❌	✅	❌	✅
✅	✅	✅	✅	✅

Uh oh!

Setting up SDK workspace infrastructure #3505

Are you sure you want to change the base?

Setting up SDK workspace infrastructure #3505

Uh oh!

Conversation

FranjoMindek commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of change

Checklist

Uh oh!

FranjoMindek Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cloudflare-workers-and-pages bot commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying wasp-docs-on-main with Cloudflare Pages

Uh oh!

FranjoMindek Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pkg-pr-new bot commented Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FranjoMindek Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

FranjoMindek Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

FranjoMindek commented Dec 16, 2025 •

edited

Loading

FranjoMindek Dec 16, 2025 •

edited

Loading

FranjoMindek Dec 16, 2025 •

edited

Loading

FranjoMindek Dec 16, 2025 •

edited

Loading

cloudflare-workers-and-pages bot commented Dec 16, 2025 •

edited

Loading

FranjoMindek Dec 16, 2025 •

edited

Loading

FranjoMindek Dec 16, 2025 •

edited

Loading

FranjoMindek Dec 16, 2025 •

edited

Loading

FranjoMindek Dec 17, 2025 •

edited

Loading

pkg-pr-new bot commented Dec 17, 2025 •

edited

Loading

FranjoMindek Dec 17, 2025 •

edited

Loading