chore(deps): update dependencies

Author: smarlhens

.prettierrc

@@ -1,15 +1,8 @@
 {
   "printWidth": 120,
-  "tabWidth": 2,
-  "useTabs": false,
-  "semi": true,
   "singleQuote": true,
-  "quoteProps": "as-needed",
   "trailingComma": "es5",
-  "bracketSpacing": true,
   "arrowParens": "always",
-  "htmlWhitespaceSensitivity": "css",
-  "proseWrap": "preserve",
   "endOfLine": "lf",
   "overrides": [
     {

README.md

@@ -35,6 +35,10 @@ Navigate to [localhost:5000](http://localhost:5000). You should see your app run
 
 By default, the server will only respond to requests from localhost. To allow connections from other computers, edit the `sirv` commands in package.json to include the option `--host 0.0.0.0`.
 
+<<<<<<< HEAD
+=======
+If you're using [Visual Studio Code](https://code.visualstudio.com/) we recommend installing the official extension [Svelte for VS Code](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode). If you are using other editors you may need to install a plugin in order to get syntax highlighting and intellisense.
+>>>>>>> template/master
 
 ## Building and running in production mode
 
@@ -57,6 +61,7 @@ If you're building a single-page app (SPA) with multiple routes, sirv needs to b
 "start": "sirv public --single"
 ```
 
+<<<<<<< HEAD
 
 ## Deploying to the web
 
@@ -66,17 +71,47 @@ Install `now` if you haven't already:
 
 ```bash
 npm install -g now
+=======
+## Using TypeScript
+
+This template comes with a script to set up a TypeScript development environment, you can run it immediately after cloning the template with:
+
+```bash
+node scripts/setupTypeScript.js
+```
+
+Or remove the script via:
+
+```bash
+rm scripts/setupTypeScript.js
+```
+
+## Deploying to the web
+
+### With [Vercel](https://vercel.com)
+
+Install `vercel` if you haven't already:
+
+```bash
+npm install -g vercel
+>>>>>>> template/master
 ```
 
 Then, from within your project folder:
 
 ```bash
 cd public
+<<<<<<< HEAD
 now deploy --name my-project
 ```
 
 As an alternative, use the [Now desktop client](https://zeit.co/download) and simply drag the unzipped project folder to the taskbar icon.
 
+=======
+vercel deploy --name my-project
+```
+
+>>>>>>> template/master
 ### With [surge](https://surge.sh/)
 
 Install `surge` if you haven't already: