Skip to content

Commit

Permalink
Merge branch 'main' into filip-path-aliases
Browse files Browse the repository at this point in the history
  • Loading branch information
sodic committed Jan 27, 2025
2 parents e3f89ad + 89d584c commit 73a96fa
Show file tree
Hide file tree
Showing 56 changed files with 398 additions and 244 deletions.
2 changes: 1 addition & 1 deletion examples/hackathon-submissions/main.wasp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
app hackathonBetaSubmissions {
wasp: {
version: "^0.15.0"
version: "^0.16.0"
},
title: "Hackathon Submissions"
}
Expand Down
19 changes: 11 additions & 8 deletions examples/hackathon-submissions/package-lock.json

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

25 changes: 16 additions & 9 deletions examples/hackathon-submissions/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
// =============================== IMPORTANT =================================
// This file is mainly used for Wasp IDE support.
//
// This file is only used for Wasp IDE support. You can change it to configure
// your IDE checks, but none of these options will affect the TypeScript
// compiler. Proper TS compiler configuration in Wasp is coming soon :)
// 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",
// Needed because this is used as a project reference.
"composite": true,
"target": "esnext",
// We're bundling all code in the end so this is the most appropriate option,
// it's also important for autocomplete to work properly.
Expand All @@ -20,6 +27,7 @@
"dom.iterable",
"esnext"
],
"skipLibCheck": true,
"allowJs": true,
"typeRoots": [
// This is needed to properly support Vitest testing with jest-dom matchers.
Expand All @@ -32,10 +40,9 @@
// Source 2: https://github.com/testing-library/jest-dom/issues/546#issuecomment-1889884843
"node_modules/@types"
],
// Since this TS config is used only for IDE support and not for
// compilation, the following directory doesn't exist. We need to specify
// it to prevent this error:
// https://stackoverflow.com/questions/42609768/typescript-error-cannot-write-file-because-it-would-overwrite-input-file
"outDir": ".wasp/phantom"
}
"outDir": ".wasp/out/user"
},
"include": [
"src"
]
}
2 changes: 1 addition & 1 deletion examples/streaming/main.wasp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
app streaming {
wasp: {
version: "^0.15.0"
version: "^0.16.0"
},
title: "streaming"
}
Expand Down
17 changes: 11 additions & 6 deletions examples/streaming/package-lock.json

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

25 changes: 16 additions & 9 deletions examples/streaming/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
// =============================== IMPORTANT =================================
// This file is mainly used for Wasp IDE support.
//
// This file is only used for Wasp IDE support. You can change it to configure
// your IDE checks, but none of these options will affect the TypeScript
// compiler. Proper TS compiler configuration in Wasp is coming soon :)
// 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",
// Needed because this is used as a project reference.
"composite": true,
"target": "esnext",
// We're bundling all code in the end so this is the most appropriate option,
// it's also important for autocomplete to work properly.
Expand All @@ -20,6 +27,7 @@
"dom.iterable",
"esnext"
],
"skipLibCheck": true,
"allowJs": true,
"typeRoots": [
// This is needed to properly support Vitest testing with jest-dom matchers.
Expand All @@ -32,10 +40,9 @@
// Source 2: https://github.com/testing-library/jest-dom/issues/546#issuecomment-1889884843
"node_modules/@types"
],
// Since this TS config is used only for IDE support and not for
// compilation, the following directory doesn't exist. We need to specify
// it to prevent this error:
// https://stackoverflow.com/questions/42609768/typescript-error-cannot-write-file-because-it-would-overwrite-input-file
"outDir": ".wasp/phantom"
}
"outDir": ".wasp/out/user"
},
"include": [
"src"
]
}
2 changes: 1 addition & 1 deletion examples/thoughts/main.wasp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { App, ExtImport } from 'wasp-config'

const app = new App('Thoughts', {
title: 'Thoughts',
wasp: { version: '^0.15.0' }
wasp: { version: '^0.16.0' }
});

app.db({
Expand Down
22 changes: 20 additions & 2 deletions examples/thoughts/package-lock.json

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

2 changes: 1 addition & 1 deletion examples/thoughts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"prisma": "5.19.1",
"typescript": "^5.1.0",
"vite": "^4.3.9",
"wasp-config": "file:../../../../../.local/share/wasp-lang/0.15.0/data/packages/wasp-config"
"wasp-config": "file:../../../../../.local/share/wasp-lang/0.16.0-rc2/data/packages/wasp-config"
}
}
24 changes: 15 additions & 9 deletions examples/thoughts/tsconfig.src.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
// =============================== IMPORTANT =================================
// This file is mainly used for Wasp IDE support.
//
// This file is only used for Wasp IDE support. You can change it to configure
// your IDE checks, but none of these options will affect the TypeScript
// compiler. Proper TS compiler configuration in Wasp is coming soon :)
// 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",
// Needed because this is used as a project reference.
"composite": true,
"target": "esnext",
// We're bundling all code in the end so this is the most appropriate option,
// it's also important for autocomplete to work properly.
Expand All @@ -20,6 +27,7 @@
"dom.iterable",
"esnext"
],
"skipLibCheck": true,
"allowJs": true,
"typeRoots": [
// This is needed to properly support Vitest testing with jest-dom matchers.
Expand All @@ -32,11 +40,9 @@
// Source 2: https://github.com/testing-library/jest-dom/issues/546#issuecomment-1889884843
"node_modules/@types"
],
// Since this TS config is used only for IDE support and not for
// compilation, the following directory doesn't exist. We need to specify
// it to prevent this error:
// https://stackoverflow.com/questions/42609768/typescript-error-cannot-write-file-because-it-would-overwrite-input-file
"outDir": ".wasp/phantom"
"outDir": ".wasp/out/user"
},
"include": ["src"]
"include": [
"src"
]
}
2 changes: 1 addition & 1 deletion examples/todo-typescript/main.wasp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
app TodoTypescript {
wasp: {
version: "^0.15.0"
version: "^0.16.0"
},
title: "ToDo TypeScript",

Expand Down
19 changes: 11 additions & 8 deletions examples/todo-typescript/package-lock.json

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

Loading

0 comments on commit 73a96fa

Please sign in to comment.