Skip to content

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
sodic committed Oct 21, 2024
2 parents 01af22f + 8115daf commit 8e991b9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion web/docs/general/wasp-ts-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Wasp TS config is an **early preview** feature, meaning it is a little rough and
8. Run `wasp ts-setup`. This command will add the `wasp-config` package to your `package.json`'s `devDependencies`.
9. Create an empty `main.wasp.ts` file and rewrite your `main.wasp.old` in it but in TypeScript.

Check out the [reference main.wasp.ts file](#reference-main-wasp-ts-file) below for details on what the TypeScript API for configuring Wasp looks like.
Check out the [reference main.wasp.ts file](#reference-mainwaspts-file) below for details on what the TypeScript API for configuring Wasp looks like.
In short, you'll have to:
1. Import `App` from `wasp-config`
2. Create a new `app` object with `new App()`.
Expand Down
15 changes: 7 additions & 8 deletions web/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ module.exports = {
'https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap',
],
themeConfig: {

announcementBar: {
id: 'LW6',
content: '<b>Launch Week #6</b>: July 17 - 22 🐝 <a href="/blog/2024/07/15/wasp-launch-week-six">See what\'s new</a>',
id: 'LW7',
content:
'<b>Wasp v0.15 is here!</b> 🐝 <a href="/blog/2024/09/30/wasp-launch-week-7">See what\'s new ⚙️</a>',
backgroundColor: '#eab307',
textColor: '#fff',
isCloseable: false,
},

imageZoom: {
// CSS selector to apply the plugin to, defaults to '.markdown img'
//selector: '.markdown img',
Expand Down Expand Up @@ -168,8 +168,7 @@ module.exports = {
// In development, we want "current" docs to be the default docs (served at /docs),
// to make it easier for us a bit. Otherwise, by default, the latest versioned docs
// will be served under /docs.
lastVersion:
includeCurrentVersion ? 'current' : undefined,
lastVersion: includeCurrentVersion ? 'current' : undefined,

// Uncomment line below to build and show only current docs, for faster build times
// during development, if/when needed.
Expand Down Expand Up @@ -292,8 +291,8 @@ module.exports = {
},
{
from: '/docs/migrate-from-0-13-to-0-14',
to: '/docs/migration-guides/migrate-from-0-13-to-0-14'
}
to: '/docs/migration-guides/migrate-from-0-13-to-0-14',
},
],
},
],
Expand Down
8 changes: 5 additions & 3 deletions web/src/components/Nav/Announcement.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Announcement = () => {
let history = useHistory()

const handleLink = () => {
history.push('/blog/2024/07/15/wasp-launch-week-six')
history.push('/blog/2024/09/30/wasp-launch-week-7')

// window.open('https://magic-app-generator.wasp-lang.dev/')
//window.open('https://www.producthunt.com/posts/open-saas')
Expand Down Expand Up @@ -43,7 +43,9 @@ const Announcement = () => {
`}
>
<span className="item-center flex gap-2 px-3">
<span><b>🐝 Launch Week #6: 🐝</b> July 17 - 22</span>
<span>
<b>🐝 Wasp v0.15 is here! 🐝</b>
</span>
</span>

<span className="hidden items-center space-x-2 px-3 lg:flex">
Expand All @@ -54,7 +56,7 @@ const Announcement = () => {
`}
>
{/* Generate your app 🤖 → */}
See what's new 🪩
See what's new ⚙️
</span>
</span>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Wasp TS config is an **early preview** feature, meaning it is a little rough and
8. Run `wasp ts-setup`. This command will add the `wasp-config` package to your `package.json`'s `devDependencies`.
9. Create an empty `main.wasp.ts` file and rewrite your `main.wasp.old` in it but in TypeScript.

Check out the [reference main.wasp.ts file](#reference-main-wasp-ts-file) below for details on what the TypeScript API for configuring Wasp looks like.
Check out the [reference main.wasp.ts file](#reference-mainwaspts-file) below for details on what the TypeScript API for configuring Wasp looks like.
In short, you'll have to:
1. Import `App` from `wasp-config`
2. Create a new `app` object with `new App()`.
Expand Down

0 comments on commit 8e991b9

Please sign in to comment.