diff --git a/web/docs/migrate-from-0-11-to-0-12.md b/web/docs/migration-guides/migrate-from-0-11-to-0-12.md similarity index 99% rename from web/docs/migrate-from-0-11-to-0-12.md rename to web/docs/migration-guides/migrate-from-0-11-to-0-12.md index 3d9394197c..97ae4b9e91 100644 --- a/web/docs/migrate-from-0-11-to-0-12.md +++ b/web/docs/migration-guides/migrate-from-0-11-to-0-12.md @@ -2,7 +2,7 @@ title: Migration from 0.11.X to 0.12.X --- -import { EmailPill, UsernameAndPasswordPill, GithubPill, GooglePill } from "./auth/Pills"; +import { EmailPill, UsernameAndPasswordPill, GithubPill, GooglePill } from "../auth/Pills"; :::note Migrating to the latest version @@ -71,9 +71,9 @@ The main differences are: no longer start with `@server` or `@client`. - Your project now features a top-level `public` dir. Wasp will publicly serve all the files it finds in this directory. Read more about it - [here](/project/static-assets.md). + [here](../project/static-assets.md). -Our [Overview docs](./tutorial/02-project-structure.md) explain the new +Our [Overview docs](../tutorial/02-project-structure.md) explain the new structure in detail, while this page provides a [quick guide](#migrating-your-project-to-the-new-structure) for migrating existing projects. @@ -160,7 +160,7 @@ Auth field customization is no longer possible using the `_waspCustomValidations ::: -You can read more about the new auth system in the [Accessing User Data](./auth/entities) section. +You can read more about the new auth system in the [Accessing User Data](../auth/entities) section. ## How to Migrate? @@ -597,7 +597,7 @@ You can follow these steps to migrate to the new auth system (assuming you alrea If you want to properly type the `profile` object, we recommend you use a validation library like Zod to define the shape of the `profile` object. - Read more about this and the `defineUserSignupFields` function in the [Auth Overview - Defining Extra Fields](./auth/overview.md#1-defining-extra-fields) section. + Read more about this and the `defineUserSignupFields` function in the [Auth Overview - Defining Extra Fields](../auth/overview.md#1-defining-extra-fields) section. @@ -693,7 +693,7 @@ Your app should be working correctly and using new auth, but to finish the migra After doing the steps above successfully locally and making sure everything is working, it is time to push these changes to the deployed app again. - _Deploy the app again_, either via `wasp deploy` or manually. Check our [Deployment docs](advanced/deployment/overview.md) for more details. + _Deploy the app again_, either via `wasp deploy` or manually. Check our [Deployment docs](../advanced/deployment/overview.md) for more details. The database migrations will automatically run on successful deployment of the server and delete the now redundant auth-related `User` columns from the database. diff --git a/web/docs/migrate-from-0-12-to-0-13.md b/web/docs/migration-guides/migrate-from-0-12-to-0-13.md similarity index 90% rename from web/docs/migrate-from-0-12-to-0-13.md rename to web/docs/migration-guides/migrate-from-0-12-to-0-13.md index f303f71c9e..8fe518ebad 100644 --- a/web/docs/migrate-from-0-12-to-0-13.md +++ b/web/docs/migration-guides/migrate-from-0-12-to-0-13.md @@ -42,7 +42,7 @@ Follow the steps below to migrate: If you are migrating a deployed app, you will need to define the `WASP_SERVER_URL` server env variable in your deployment environment. - Read more about setting env variables in production [here](./project/env-vars#defining-env-vars-in-production). + Read more about setting env variables in production [here](../project/env-vars#defining-env-vars-in-production). ::: 2. **Update the redirect URLs** for the OAuth providers @@ -64,7 +64,7 @@ Follow the steps below to migrate: - Check the new redirect URLs for [Google](./auth/social-auth/google.md#3-creating-a-google-oauth-app) and [GitHub](./auth/social-auth/github.md#3-creating-a-github-oauth-app) in Wasp's docs. + Check the new redirect URLs for [Google](../auth/social-auth/google.md#3-creating-a-google-oauth-app) and [GitHub](../auth/social-auth/github.md#3-creating-a-github-oauth-app) in Wasp's docs. 3. **Update the `configFn`** for the OAuth providers @@ -129,7 +129,7 @@ Follow the steps below to migrate: - Wasp now directly forwards what it receives from the OAuth providers. You can check the data format for [Google](./auth/social-auth/google.md#data-received-from-google) and [GitHub](./auth/social-auth/github.md#data-received-from-github) in Wasp's docs. + Wasp now directly forwards what it receives from the OAuth providers. You can check the data format for [Google](../auth/social-auth/google.md#data-received-from-google) and [GitHub](../auth/social-auth/github.md#data-received-from-github) in Wasp's docs. That's it! diff --git a/web/docs/migrate-from-0-13-to-0-14.md b/web/docs/migration-guides/migrate-from-0-13-to-0-14.md similarity index 97% rename from web/docs/migrate-from-0-13-to-0-14.md rename to web/docs/migration-guides/migrate-from-0-13-to-0-14.md index 97bd5fd064..8c6ec01c1e 100644 --- a/web/docs/migrate-from-0-13-to-0-14.md +++ b/web/docs/migration-guides/migrate-from-0-13-to-0-14.md @@ -396,7 +396,7 @@ All that's left to do is migrate the database. To avoid type errors, it's best to take care of database migrations after you've migrated the rest of the code. So, just keep reading, and we will remind you to migrate the database as [the last step of the migration guide](#migrate-the-database). -Read more about the [Prisma Schema File](./data-model/prisma-file.md) and how Wasp uses it to generate the database schema and Prisma client. +Read more about the [Prisma Schema File](../data-model/prisma-file.md) and how Wasp uses it to generate the database schema and Prisma client. ### Migrate how you access user auth fields @@ -659,8 +659,8 @@ wasp db migrate-dev This command generates the Prisma client based on the `schema.prisma` file. -Read more about the [Prisma Schema File](./data-model/prisma-file.md) and how Wasp uses it to generate the database schema and Prisma client. +Read more about the [Prisma Schema File](../data-model/prisma-file.md) and how Wasp uses it to generate the database schema and Prisma client. That's it! -You should now be able to run your app with the new Wasp 0.14.0. We recommend reading through the updated [Accessing User Data](./auth/entities/entities.md) section to get a better understanding of the new API. +You should now be able to run your app with the new Wasp 0.14.0. We recommend reading through the updated [Accessing User Data](../auth/entities/entities.md) section to get a better understanding of the new API. diff --git a/web/docs/migration-guides/migrate-from-0-14-to-0-15.md b/web/docs/migration-guides/migrate-from-0-14-to-0-15.md new file mode 100644 index 0000000000..7e2f4c3ee1 --- /dev/null +++ b/web/docs/migration-guides/migrate-from-0-14-to-0-15.md @@ -0,0 +1,40 @@ +--- +title: Migration from 0.14.X to 0.15.X +--- + +## What's new in 0.15.0? + +### TS SDK for Wasp (preview) + +TODO: write this section + +### Prisma 5 + +TODO: write this section + +### React Router 6 + +TODO: write this section + +## How to migrate? + +To migrate your app to Wasp 0.15.x, you must: + +1. Bump the version in `main.wasp` ... + +### Bump the version + +Let's start with something simple. Update the version field in your Wasp file to `^0.15.0`: + +```wasp title="main.wasp" +app MyApp { + wasp: { + // highlight-next-line + version: "^0.15.0" + }, +} +``` + +That's it! + +You should now be able to run your app with the new Wasp 0.15.0. \ No newline at end of file diff --git a/web/package-lock.json b/web/package-lock.json index 2d42b1dfb3..789c4a068e 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -4557,7 +4557,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001474", + "version": "1.0.30001662", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001662.tgz", + "integrity": "sha512-sgMUVwLmGseH8ZIrm1d51UbrhqMCH3jvS7gF/M6byuHOnKyLOBL7W8yz5V02OHwgLGA36o/AFhWzzh4uc5aqTA==", "funding": [ { "type": "opencollective", @@ -17628,7 +17630,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001474" + "version": "1.0.30001662", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001662.tgz", + "integrity": "sha512-sgMUVwLmGseH8ZIrm1d51UbrhqMCH3jvS7gF/M6byuHOnKyLOBL7W8yz5V02OHwgLGA36o/AFhWzzh4uc5aqTA==" }, "ccount": { "version": "1.1.0" diff --git a/web/sidebars.js b/web/sidebars.js index 48dd6ea98f..87fc395380 100644 --- a/web/sidebars.js +++ b/web/sidebars.js @@ -29,7 +29,7 @@ module.exports = { { type: 'link', label: 'Examples', - href: 'https://github.com/wasp-lang/wasp/tree/release/examples' + href: 'https://github.com/wasp-lang/wasp/tree/release/examples', }, { type: 'category', @@ -50,7 +50,7 @@ module.exports = { }, 'data-model/crud', 'data-model/backends', - 'data-model/prisma-file' + 'data-model/prisma-file', ], }, { @@ -76,7 +76,7 @@ module.exports = { ], }, 'auth/entities/entities', - 'auth/auth-hooks' + 'auth/auth-hooks', ], }, { @@ -139,18 +139,22 @@ module.exports = { }, { type: 'category', - label: 'Miscellaneous', - collapsed: false, + label: 'Migration guides', + collapsed: true, collapsible: true, items: [ - 'contributing', - 'telemetry', - 'vision', - 'contact', - 'migrate-from-0-11-to-0-12', - 'migrate-from-0-12-to-0-13', - 'migrate-from-0-13-to-0-14' + 'migration-guides/migrate-from-0-14-to-0-15', + 'migration-guides/migrate-from-0-13-to-0-14', + 'migration-guides/migrate-from-0-12-to-0-13', + 'migration-guides/migrate-from-0-11-to-0-12', ], }, + { + type: 'category', + label: 'Miscellaneous', + collapsed: true, + collapsible: true, + items: ['contributing', 'telemetry', 'vision', 'contact'], + }, ], }