From 3291885f34a7bc545731b0d23337c8510d848883 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 19 Dec 2023 09:36:28 -0800 Subject: [PATCH] chore: a few more branch updates --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- documentation/docs/60-appendix/40-migrating.md | 2 +- documentation/docs/60-appendix/50-additional-resources.md | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a75667a7ffe9..2bec62a8cf72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main pull_request: env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1077995f43e9..a25d80ea4ce1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - master + - main permissions: {} jobs: diff --git a/documentation/docs/60-appendix/40-migrating.md b/documentation/docs/60-appendix/40-migrating.md index 86ed3ddf6ffe..ec55a195da54 100644 --- a/documentation/docs/60-appendix/40-migrating.md +++ b/documentation/docs/60-appendix/40-migrating.md @@ -39,7 +39,7 @@ The bulk of your app, in `src/routes`, can be left where it is, but several proj Your `webpack.config.js` or `rollup.config.js` should be replaced with a `svelte.config.js`, as documented [here](configuration). Svelte preprocessor options should be moved to `config.preprocess`. -You will need to add an [adapter](adapters). `sapper build` is roughly equivalent to [adapter-node](https://github.com/sveltejs/kit/tree/master/packages/adapter-node) while `sapper export` is roughly equivalent to [adapter-static](https://github.com/sveltejs/kit/tree/main/packages/adapter-static), though you might prefer to use an adapter designed for the platform you're deploying to. +You will need to add an [adapter](adapters). `sapper build` is roughly equivalent to [adapter-node](https://github.com/sveltejs/kit/tree/main/packages/adapter-node) while `sapper export` is roughly equivalent to [adapter-static](https://github.com/sveltejs/kit/tree/main/packages/adapter-static), though you might prefer to use an adapter designed for the platform you're deploying to. If you were using plugins for filetypes that are not automatically handled by [Vite](https://vitejs.dev), you will need to find Vite equivalents and add them to the [Vite config](project-structure#project-files-vite-config-js). diff --git a/documentation/docs/60-appendix/50-additional-resources.md b/documentation/docs/60-appendix/50-additional-resources.md index 7d7c0c9aaf1c..0c6f63b7121e 100644 --- a/documentation/docs/60-appendix/50-additional-resources.md +++ b/documentation/docs/60-appendix/50-additional-resources.md @@ -13,8 +13,9 @@ The [Svelte FAQ](https://svelte.dev/faq) and [`vite-plugin-svelte` FAQ](https:// We've written and published a few different SvelteKit sites as examples: - [`sveltejs/realworld`](https://github.com/sveltejs/realworld) contains an example blog site -- [The `sites/kit.svelte.dev` directory](https://github.com/sveltejs/kit/tree/main/sites/kit.svelte.dev) contains the code for this site -- [`sveltejs/sites`](https://github.com/sveltejs/sites) contains the code for [svelte.dev](https://github.com/sveltejs/sites/tree/master/sites/svelte.dev) and for a [HackerNews clone](https://github.com/sveltejs/sites/tree/main/sites/hn.svelte.dev) +- [A HackerNews clone](https://github.com/sveltejs/sites/tree/master/sites/hn.svelte.dev) +- [`kit.svelte.dev`](https://github.com/sveltejs/kit/tree/main/sites/kit.svelte.dev) +- [`svelte.dev`](https://github.com/sveltejs/svelte/tree/main/sites/svelte.dev) SvelteKit users have also published plenty of examples on GitHub, under the [#sveltekit](https://github.com/topics/sveltekit) and [#sveltekit-template](https://github.com/topics/sveltekit-template) topics, as well as on [the Svelte Society site](https://sveltesociety.dev/templates#svelte-kit). Note that these have not been vetted by the maintainers and may not be up to date.