From fdd3d4b4480e77190d1eb83151203334805b7ea3 Mon Sep 17 00:00:00 2001
From: Antony Jones <ant@enzy.org>
Date: Mon, 12 Jul 2021 19:43:03 +0100
Subject: [PATCH 1/5] be a bit smarter about building the site locally (#5262)

Co-authored-by: Antony Jones <antony@beyonk.com>
---
 site/README.md                                |   8 +-
 site/package-lock.json                        | 227 ------------------
 site/package.json                             |   7 +-
 ...et-contributors.js => get_contributors.js} |  10 +-
 site/scripts/update.js                        |   8 +
 site/scripts/update_template.js               |  13 +-
 6 files changed, 37 insertions(+), 236 deletions(-)
 rename site/scripts/{get-contributors.js => get_contributors.js} (83%)
 create mode 100644 site/scripts/update.js

diff --git a/site/README.md b/site/README.md
index ca75a89953..502cc42e17 100644
--- a/site/README.md
+++ b/site/README.md
@@ -6,12 +6,17 @@ Set up the site sub-project:
 git clone https://github.com/sveltejs/svelte.git
 cd site
 npm ci
-npm run update
 npm run dev
 ```
 
 and navigate to [localhost:3000](http://localhost:3000).
 
+The first time you run the site locally, it will update the list of Contributors and REPL dependencies. After this it won't run again unless you force it by running:
+
+```bash
+npm run update
+```
+
 ## Running using the local copy of Svelte
 
 By default, the REPL will fetch the most recent version of Svelte from https://unpkg.com/svelte. When running the site locally, you can also use your local copy of Svelte.
@@ -25,7 +30,6 @@ npm ci
 PUBLISH=1 npm run build
 cd site
 npm ci
-npm run update
 npm run dev
 ```
 
diff --git a/site/package-lock.json b/site/package-lock.json
index 299a560e4e..8303a89e35 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -1851,19 +1851,6 @@
       "integrity": "sha512-Se+LaxqXlVXGvmexKGPvnUIYC1jwXu1H6Pkyb3uBM5d8/NELMYCHs/4/roD7721NxrTLyv7e5nXd5/QLBO+10g==",
       "dev": true
     },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
     "debug": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
@@ -1950,15 +1937,6 @@
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
     "es-abstract": {
       "version": "1.18.0-next.1",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
@@ -2139,12 +2117,6 @@
       "integrity": "sha512-YSwLaGMOgSBx9roJlNLL12c+FRiw7VECphinc6mGucphc/ZxTHgdEz6gmJqH6NOzYEd/yr64hwjom5pZ+tJVpg==",
       "dev": true
     },
-    "graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-      "dev": true
-    },
     "growl": {
       "version": "1.10.5",
       "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
@@ -2178,12 +2150,6 @@
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true
     },
-    "hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
     "html-minifier": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
@@ -2237,12 +2203,6 @@
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
       "dev": true
     },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
     "is-buffer": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
@@ -2396,12 +2356,6 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
     "json5": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
@@ -2471,18 +2425,6 @@
         }
       }
     },
-    "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      }
-    },
     "locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -2569,12 +2511,6 @@
       "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz",
       "integrity": "sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA=="
     },
-    "memorystream": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
-      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=",
-      "dev": true
-    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -2724,12 +2660,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@@ -2852,35 +2782,6 @@
         }
       }
     },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "npm-run-all": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
-      "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "memorystream": "^0.3.1",
-        "minimatch": "^3.0.4",
-        "pidtree": "^0.3.0",
-        "read-pkg": "^3.0.0",
-        "shell-quote": "^1.6.1",
-        "string.prototype.padend": "^3.0.0"
-      }
-    },
     "object-inspect": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
@@ -3003,16 +2904,6 @@
       "integrity": "sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==",
       "dev": true
     },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      }
-    },
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
@@ -3025,27 +2916,12 @@
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
-    },
     "path-parse": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
-    "path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      }
-    },
     "pg": {
       "version": "7.18.2",
       "resolved": "https://registry.npmjs.org/pg/-/pg-7.18.2.tgz",
@@ -3120,18 +2996,6 @@
       "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "dev": true
     },
-    "pidtree": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz",
-      "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==",
-      "dev": true
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true
-    },
     "pixelmatch": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz",
@@ -3204,17 +3068,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      }
-    },
     "readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -3441,27 +3294,6 @@
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
       "dev": true
     },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "shell-quote": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz",
-      "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
-      "dev": true
-    },
     "shelljs": {
       "version": "0.8.4",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
@@ -3519,38 +3351,6 @@
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
     },
-    "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
-      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
-      "dev": true
-    },
     "split2": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
@@ -3581,17 +3381,6 @@
         "strip-ansi": "^4.0.0"
       }
     },
-    "string.prototype.padend": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz",
-      "integrity": "sha512-eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      }
-    },
     "string.prototype.trimend": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
@@ -3629,12 +3418,6 @@
         "ansi-regex": "^3.0.0"
       }
     },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
-    },
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@@ -3766,16 +3549,6 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
diff --git a/site/package.json b/site/package.json
index 68e447ded5..5c8d9e0ad3 100644
--- a/site/package.json
+++ b/site/package.json
@@ -3,11 +3,11 @@
   "version": "1.0.0",
   "description": "Docs and examples for Svelte",
   "scripts": {
-    "dev": "npm run copy-workers && sapper dev",
+    "dev": "node scripts/update.js && npm run copy-workers && sapper dev",
     "copy-workers": "node scripts/copy-workers.js",
     "migrate": "node-pg-migrate -r dotenv/config",
-    "build": "npm run copy-workers && sapper build --legacy",
-    "update": "node scripts/update_template.js && node scripts/get-contributors.js",
+    "build": "node scripts/update.js && npm run copy-workers && sapper build --legacy",
+    "update": "node scripts/update.js --force=true",
     "start": "node __sapper__/build",
     "test": "mocha -r esm test/**",
     "deploy": "make deploy"
@@ -50,7 +50,6 @@
     "mocha": "^6.2.0",
     "node-fetch": "^2.6.1",
     "node-pg-migrate": "^3.22.0",
-    "npm-run-all": "^4.1.5",
     "rollup": "^2.30.0",
     "rollup-plugin-svelte": "^7.0.0",
     "rollup-plugin-terser": "^7.0.0",
diff --git a/site/scripts/get-contributors.js b/site/scripts/get_contributors.js
similarity index 83%
rename from site/scripts/get-contributors.js
rename to site/scripts/get_contributors.js
index ff52652ffd..4e360a019f 100644
--- a/site/scripts/get-contributors.js
+++ b/site/scripts/get_contributors.js
@@ -3,8 +3,16 @@ const fs = require('fs');
 const fetch = require('node-fetch');
 const Jimp = require('jimp');
 
+const force = process.env.FORCE_UPDATE === 'true';
+
 process.chdir(__dirname);
 
+const outputFile = `../src/routes/_contributors.js`;
+if (!force && fs.existsSync(outputFile)) {
+	console.info(`[update/contributors] ${outputFile} exists. Skipping`);
+	process.exit(0);
+}
+
 const base = `https://api.github.com/repos/sveltejs/svelte/contributors`;
 const { GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET } = process.env;
 
@@ -48,7 +56,7 @@ async function main() {
 
 	const str = `[\n\t${authors.map(a => `'${a.login}'`).join(',\n\t')}\n]`;
 
-	fs.writeFileSync(`../src/routes/_contributors.js`, `export default ${str};`);
+	fs.writeFileSync(outputFile, `export default ${str};`);
 }
 
 main();
diff --git a/site/scripts/update.js b/site/scripts/update.js
new file mode 100644
index 0000000000..904e11bbd9
--- /dev/null
+++ b/site/scripts/update.js
@@ -0,0 +1,8 @@
+const sh = require('shelljs');
+
+sh.env['FORCE_UPDATE'] = process.argv.includes('--force=true');
+
+Promise.all([
+	sh.exec('node ./scripts/get_contributors.js'),
+	sh.exec('node ./scripts/update_template.js')
+]);
diff --git a/site/scripts/update_template.js b/site/scripts/update_template.js
index 9d897c064f..e683fad08e 100644
--- a/site/scripts/update_template.js
+++ b/site/scripts/update_template.js
@@ -1,7 +1,16 @@
 const sh = require('shelljs');
 const fs = require('fs');
+const path = require('path');
 
-sh.cd(__dirname + '/../');
+const force = process.env.FORCE_UPDATE === 'true';
+
+sh.cd(path.join(__dirname, '..'));
+
+const outputFile = 'static/svelte-app.json';
+if (!force && fs.existsSync(outputFile)) {
+	console.info(`[update/template] ${outputFile} exists. Skipping`);
+	process.exit(0);
+}
 
 // fetch svelte app
 sh.rm('-rf','scripts/svelte-app');
@@ -22,4 +31,4 @@ for (const path of sh.find(appPath).filter(p => fs.lstatSync(p).isFile()) ) {
 	files.push({ path: path.slice(appPath.length + 1), data });
 }
 
-fs.writeFileSync('static/svelte-app.json', JSON.stringify(files));
\ No newline at end of file
+fs.writeFileSync(outputFile, JSON.stringify(files));

From 23f8f4ba6d769f65da7b9dd1308f65d218300e36 Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Wed, 14 Jul 2021 01:33:55 +0800
Subject: [PATCH 2/5] [feat] centralise parse errors (#6519)

Co-authored-by: pngwn <hello@pngwn.io>
---
 src/compiler/parse/errors.ts                  | 192 ++++++++++++++++++
 src/compiler/parse/index.ts                   |  27 +--
 src/compiler/parse/read/context.ts            |  17 +-
 src/compiler/parse/read/expression.ts         |   6 +-
 src/compiler/parse/read/script.ts             |  19 +-
 src/compiler/parse/read/style.ts              |  29 +--
 src/compiler/parse/state/mustache.ts          |  71 +++----
 src/compiler/parse/state/tag.ts               | 104 +++-------
 .../samples/error-comment-unclosed/error.json |   2 +-
 9 files changed, 277 insertions(+), 190 deletions(-)
 create mode 100644 src/compiler/parse/errors.ts

diff --git a/src/compiler/parse/errors.ts b/src/compiler/parse/errors.ts
new file mode 100644
index 0000000000..b563b7572a
--- /dev/null
+++ b/src/compiler/parse/errors.ts
@@ -0,0 +1,192 @@
+// All parser errors should be listed and accessed from here
+
+import list from '../utils/list';
+
+/**
+ * @internal
+ */
+export default {
+	css_syntax_error: (message) => ({
+		code: 'css-syntax-error',
+		message
+	}),
+	duplicate_attribute: {
+		code: 'duplicate-attribute',
+		message: 'Attributes need to be unique'
+	},
+	duplicate_element: (slug: string, name: string) => ({
+		code: `duplicate-${slug}`,
+		message: `A component can only have one <${name}> tag`
+	}),
+	duplicate_style: {
+		code: 'duplicate-style',
+		message: 'You can only have one top-level <style> tag per component'
+	},
+	empty_attribute_shorthand: {
+		code: 'empty-attribute-shorthand',
+		message: 'Attribute shorthand cannot be empty'
+	},
+	empty_directive_name: (type: string) => ({
+		code: 'empty-directive-name',
+		message: `${type} name cannot be empty`
+	}),
+	empty_global_selector: {
+		code: 'css-syntax-error',
+		message: ':global() must contain a selector'
+	},
+	expected_block_type: {
+		code: 'expected-block-type',
+		message: 'Expected if, each or await'
+	},
+	expected_name: {
+		code: 'expected-name',
+		message: 'Expected name'
+	},
+	invalid_catch_placement_unclosed_block: (block) => ({
+		code: 'invalid-catch-placement',
+		message: `Expected to close ${block} before seeing {:catch} block`
+	}),
+	invalid_catch_placement_without_await: {
+		code: 'invalid-catch-placement',
+		message: 'Cannot have an {:catch} block outside an {#await ...} block'
+	},
+	invalid_component_definition: {
+		code: 'invalid-component-definition',
+		message: 'invalid component definition'
+	},
+	invalid_closing_tag_unopened: (name: string) => ({
+		code: 'invalid-closing-tag',
+		message: `</${name}> attempted to close an element that was not open`
+	}),
+	invalid_closing_tag_autoclosed: (name: string, reason: string) => ({
+		code: 'invalid-closing-tag',
+		message: `</${name}> attempted to close <${name}> that was already automatically closed by <${reason}>`
+	}),
+	invalid_debug_args: {
+		code: 'invalid-debug-args',
+		message:
+			'{@debug ...} arguments must be identifiers, not arbitrary expressions'
+	},
+	invalid_declaration: {
+		code: 'invalid-declaration',
+		message: 'Declaration cannot be empty'
+	},
+	invalid_directive_value: {
+		code: 'invalid-directive-value',
+		message: 'Directive value must be a JavaScript expression enclosed in curly braces'
+	},
+	invalid_elseif: {
+		code: 'invalid-elseif',
+		message: '\'elseif\' should be \'else if\''
+	},
+	invalid_elseif_placement_outside_if: {
+		code: 'invalid-elseif-placement',
+		message: 'Cannot have an {:else if ...} block outside an {#if ...} block'
+	},
+	invalid_elseif_placement_unclosed_block: (block) => ({
+		code: 'invalid-elseif-placement',
+		message: `Expected to close ${block} before seeing {:else if ...} block`
+	}),
+	invalid_else_placement_outside_if: {
+		code: 'invalid-else-placement',
+		message: 'Cannot have an {:else} block outside an {#if ...} or {#each ...} block'
+	},
+	invalid_else_placement_unclosed_block: (block) => ({
+		code: 'invalid-else-placement',
+		message: `Expected to close ${block} before seeing {:else} block`
+	}),
+	invalid_element_content: (slug: string, name: string) => ({
+		code: `invalid-${slug}-content`,
+		message: `<${name}> cannot have children`
+	}),
+	invalid_element_placement: (slug: string, name: string) => ({
+		code: `invalid-${slug}-placement`,
+		message: `<${name}> tags cannot be inside elements or blocks`
+	}),
+	invalid_ref_directive: (name: string) => ({
+		code: 'invalid-ref-directive',
+		message: `The ref directive is no longer supported — use \`bind:this={${name}}\` instead`
+	}),
+	invalid_ref_selector: {
+		code: 'invalid-ref-selector',
+		message: 'ref selectors are no longer supported'
+	},
+	invalid_self_placement: {
+		code: 'invalid-self-placement',
+		message: '<svelte:self> components can only exist inside {#if} blocks, {#each} blocks, or slots passed to components'
+	},
+	invalid_script_instance: {
+		code: 'invalid-script',
+		message: 'A component can only have one instance-level <script> element'
+	},
+	invalid_script_module: {
+		code: 'invalid-script',
+		message: 'A component can only have one <script context="module"> element'
+	},
+	invalid_script_context_attribute: {
+		code: 'invalid-script',
+		message: 'context attribute must be static'
+	},
+	invalid_script_context_value: {
+		code: 'invalid-script',
+		message: 'If the context attribute is supplied, its value must be "module"'
+	},
+	invalid_tag_name: {
+		code: 'invalid-tag-name',
+		message: 'Expected valid tag name'
+	},
+	invalid_tag_name_svelte_element: (tags: string[], match: string) => ({
+		code: 'invalid-tag-name',
+		message: `Valid <svelte:...> tag names are ${list(tags)}${
+			match ? ' (did you mean ' + match + '?)' : ''
+		}`
+	}),
+	invalid_then_placement_unclosed_block: (block) => ({
+		code: 'invalid-then-placement',
+		message: `Expected to close ${block} before seeing {:then} block`
+	}),
+	invalid_then_placement_without_await: {
+		code: 'invalid-then-placement',
+		message: 'Cannot have an {:then} block outside an {#await ...} block'
+	},
+	invalid_void_content: (name: string) => ({
+		code: 'invalid-void-content',
+		message: `<${name}> is a void element and cannot have children, or a closing tag`
+	}),
+	missing_component_definition: {
+		code: 'missing-component-definition',
+		message: '<svelte:component> must have a \'this\' attribute'
+	},
+	unclosed_script: {
+		code: 'unclosed-script',
+		message: '<script> must have a closing tag'
+	},
+	unclosed_style: {
+		code: 'unclosed-style',
+		message: '<style> must have a closing tag'
+	},
+	unclosed_comment: {
+		code: 'unclosed-comment',
+		message: 'comment was left open, expected -->'
+	},
+	unexpected_block_close: {
+		code: 'unexpected-block-close',
+		message: 'Unexpected block closing tag'
+	},
+	unexpected_eof: {
+		code: 'unexpected-eof',
+		message: 'Unexpected end of input'
+	},
+	unexpected_eof_token: (token: string) => ({
+		code: 'unexpected-eof',
+		message: `Unexpected ${token}`
+	}),
+	unexpected_token: (token: string) => ({
+		code: 'unexpected-token',
+		message: `Expected ${token}`
+	}),
+	unexpected_token_destructure: {
+		code: 'unexpected-token',
+		message: 'Expected identifier or destructure pattern'
+	}
+};
diff --git a/src/compiler/parse/index.ts b/src/compiler/parse/index.ts
index 27067caf26..836fb670cf 100644
--- a/src/compiler/parse/index.ts
+++ b/src/compiler/parse/index.ts
@@ -5,6 +5,7 @@ import { reserved } from '../utils/names';
 import full_char_code_at from '../utils/full_char_code_at';
 import { TemplateNode, Ast, ParserOptions, Fragment, Style, Script } from '../interfaces';
 import error from '../utils/error';
+import parser_errors from './errors';
 
 type ParserState = (parser: Parser) => (ParserState | void);
 
@@ -106,17 +107,18 @@ export class Parser {
 		});
 	}
 
-	eat(str: string, required?: boolean, message?: string) {
+	eat(str: string, required?: boolean, error?: { code: string, message: string }) {
 		if (this.match(str)) {
 			this.index += str.length;
 			return true;
 		}
 
 		if (required) {
-			this.error({
-				code: `unexpected-${this.index === this.template.length ? 'eof' : 'token'}`,
-				message: message || `Expected ${str}`
-			});
+			this.error(error ||
+				(this.index === this.template.length
+					? parser_errors.unexpected_eof_token(str)
+					: parser_errors.unexpected_token(str))
+			);
 		}
 
 		return false;
@@ -218,27 +220,18 @@ export default function parse(
 	// TODO we may want to allow multiple <style> tags —
 	// one scoped, one global. for now, only allow one
 	if (parser.css.length > 1) {
-		parser.error({
-			code: 'duplicate-style',
-			message: 'You can only have one top-level <style> tag per component'
-		}, parser.css[1].start);
+		parser.error(parser_errors.duplicate_style, parser.css[1].start);
 	}
 
 	const instance_scripts = parser.js.filter(script => script.context === 'default');
 	const module_scripts = parser.js.filter(script => script.context === 'module');
 
 	if (instance_scripts.length > 1) {
-		parser.error({
-			code: 'invalid-script',
-			message: 'A component can only have one instance-level <script> element'
-		}, instance_scripts[1].start);
+		parser.error(parser_errors.invalid_script_instance, instance_scripts[1].start);
 	}
 
 	if (module_scripts.length > 1) {
-		parser.error({
-			code: 'invalid-script',
-			message: 'A component can only have one <script context="module"> element'
-		}, module_scripts[1].start);
+		parser.error(parser_errors.invalid_script_module, module_scripts[1].start);
 	}
 
 	return {
diff --git a/src/compiler/parse/read/context.ts b/src/compiler/parse/read/context.ts
index a11dfb25c5..1e97baf8a7 100644
--- a/src/compiler/parse/read/context.ts
+++ b/src/compiler/parse/read/context.ts
@@ -9,6 +9,7 @@ import {
 } from '../utils/bracket';
 import { parse_expression_at } from '../acorn';
 import { Pattern } from 'estree';
+import parser_errors from '../errors';
 
 export default function read_context(
 	parser: Parser
@@ -27,10 +28,7 @@ export default function read_context(
 	}
 
 	if (!is_bracket_open(code)) {
-		parser.error({
-			code: 'unexpected-token',
-			message: 'Expected identifier or destructure pattern'
-		});
+		parser.error(parser_errors.unexpected_token_destructure);
 	}
 
 	const bracket_stack = [code];
@@ -42,12 +40,11 @@ export default function read_context(
 			bracket_stack.push(code);
 		} else if (is_bracket_close(code)) {
 			if (!is_bracket_pair(bracket_stack[bracket_stack.length - 1], code)) {
-				parser.error({
-					code: 'unexpected-token',
-					message: `Expected ${String.fromCharCode(
-						get_bracket_close(bracket_stack[bracket_stack.length - 1])
-					)}`
-				});
+				parser.error(
+					parser_errors.unexpected_token(
+						String.fromCharCode(get_bracket_close(bracket_stack[bracket_stack.length - 1]))
+					)
+				);
 			}
 			bracket_stack.pop();
 			if (bracket_stack.length === 0) {
diff --git a/src/compiler/parse/read/expression.ts b/src/compiler/parse/read/expression.ts
index f0f4e15c7a..5464a950ce 100644
--- a/src/compiler/parse/read/expression.ts
+++ b/src/compiler/parse/read/expression.ts
@@ -2,6 +2,7 @@ import { parse_expression_at } from '../acorn';
 import { Parser } from '../index';
 import { Node } from 'estree';
 import { whitespace } from '../../utils/patterns';
+import parser_errors from '../errors';
 
 export default function read_expression(parser: Parser): Node {
 	try {
@@ -20,10 +21,7 @@ export default function read_expression(parser: Parser): Node {
 			if (char === ')') {
 				num_parens -= 1;
 			} else if (!whitespace.test(char)) {
-				parser.error({
-					code: 'unexpected-token',
-					message: 'Expected )'
-				}, index);
+				parser.error(parser_errors.unexpected_token(')'), index);
 			}
 
 			index += 1;
diff --git a/src/compiler/parse/read/script.ts b/src/compiler/parse/read/script.ts
index db76cb8892..c9ac4ac344 100644
--- a/src/compiler/parse/read/script.ts
+++ b/src/compiler/parse/read/script.ts
@@ -2,25 +2,20 @@ import * as acorn from '../acorn';
 import { Parser } from '../index';
 import { Script } from '../../interfaces';
 import { Node, Program } from 'estree';
+import parser_errors from '../errors';
 
 function get_context(parser: Parser, attributes: any[], start: number): string {
 	const context = attributes.find(attribute => attribute.name === 'context');
 	if (!context) return 'default';
 
 	if (context.value.length !== 1 || context.value[0].type !== 'Text') {
-		parser.error({
-			code: 'invalid-script',
-			message: 'context attribute must be static'
-		}, start);
+		parser.error(parser_errors.invalid_script_context_attribute, start);
 	}
 
 	const value = context.value[0].data;
 
 	if (value !== 'module') {
-		parser.error({
-			code: 'invalid-script',
-			message: 'If the context attribute is supplied, its value must be "module"'
-		}, context.start);
+		parser.error(parser_errors.invalid_script_context_value, context.start);
 	}
 
 	return value;
@@ -28,13 +23,9 @@ function get_context(parser: Parser, attributes: any[], start: number): string {
 
 export default function read_script(parser: Parser, start: number, attributes: Node[]): Script {
 	const script_start = parser.index;
-	const error_message = {
-		code: 'unclosed-script',
-		message: '<script> must have a closing tag'
-	};
-	const data = parser.read_until(/<\/script\s*>/, error_message);
+	const data = parser.read_until(/<\/script\s*>/, parser_errors.unclosed_script);
 	if (parser.index >= parser.template.length) {
-		parser.error(error_message);
+		parser.error(parser_errors.unclosed_script);
 	}
 
 	const source = parser.template.slice(0, script_start).replace(/[^\n]/g, ' ') + data;
diff --git a/src/compiler/parse/read/style.ts b/src/compiler/parse/read/style.ts
index c951fa08c1..e4a885a8cc 100644
--- a/src/compiler/parse/read/style.ts
+++ b/src/compiler/parse/read/style.ts
@@ -3,18 +3,15 @@ import { walk } from 'estree-walker';
 import { Parser } from '../index';
 import { Node } from 'estree';
 import { Style } from '../../interfaces';
+import parser_errors from '../errors';
 
 export default function read_style(parser: Parser, start: number, attributes: Node[]): Style {
 	const content_start = parser.index;
-	const error_message = {
-		code: 'unclosed-style',
-		message: '<style> must have a closing tag'
-	};
 
-	const styles = parser.read_until(/<\/style\s*>/, error_message);
+	const styles = parser.read_until(/<\/style\s*>/, parser_errors.unclosed_style);
 
 	if (parser.index >= parser.template.length) {
-		parser.error(error_message);
+		parser.error(parser_errors.unclosed_style);
 	}
 
 	const content_end = parser.index;
@@ -31,10 +28,7 @@ export default function read_style(parser: Parser, start: number, attributes: No
 		});
 	} catch (err) {
 		if (err.name === 'SyntaxError') {
-			parser.error({
-				code: 'css-syntax-error',
-				message: err.message
-			}, err.offset);
+			parser.error(parser_errors.css_syntax_error(err.message), err.offset);
 		} else {
 			throw err;
 		}
@@ -52,26 +46,17 @@ export default function read_style(parser: Parser, start: number, attributes: No
 					const b = node.children[i + 1];
 
 					if (is_ref_selector(a, b)) {
-						parser.error({
-							code: 'invalid-ref-selector',
-							message: 'ref selectors are no longer supported'
-						}, a.loc.start.offset);
+						parser.error(parser_errors.invalid_ref_selector, a.loc.start.offset);
 					}
 				}
 			}
 
 			if (node.type === 'Declaration' && node.value.type === 'Value' && node.value.children.length === 0) {
-				parser.error({
-					code: 'invalid-declaration',
-					message: 'Declaration cannot be empty'
-				}, node.start);
+				parser.error(parser_errors.invalid_declaration, node.start);
 			}
 
 			if (node.type === 'PseudoClassSelector' && node.name === 'global' && node.children === null) {
-				parser.error({
-					code: 'css-syntax-error',
-					message: ':global() must contain a selector'
-				}, node.loc.start.offset);
+				parser.error(parser_errors.empty_global_selector, node.loc.start.offset);
 			}
 
 			if (node.loc) {
diff --git a/src/compiler/parse/state/mustache.ts b/src/compiler/parse/state/mustache.ts
index ccb2d1d487..cc3c24349c 100644
--- a/src/compiler/parse/state/mustache.ts
+++ b/src/compiler/parse/state/mustache.ts
@@ -6,6 +6,7 @@ import { trim_start, trim_end } from '../../utils/trim';
 import { to_string } from '../utils/node';
 import { Parser } from '../index';
 import { TemplateNode } from '../../interfaces';
+import parser_errors from '../errors';
 
 function trim_whitespace(block: TemplateNode, trim_before: boolean, trim_after: boolean) {
 	if (!block.children || block.children.length === 0) return; // AwaitBlock
@@ -66,10 +67,7 @@ export default function mustache(parser: Parser) {
 		} else if (block.type === 'KeyBlock') {
 			expected = 'key';
 		} else {
-			parser.error({
-				code: 'unexpected-block-close',
-				message: 'Unexpected block closing tag'
-			});
+			parser.error(parser_errors.unexpected_block_close);
 		}
 
 		parser.eat(expected, true);
@@ -98,10 +96,7 @@ export default function mustache(parser: Parser) {
 		parser.stack.pop();
 	} else if (parser.eat(':else')) {
 		if (parser.eat('if')) {
-			parser.error({
-				code: 'invalid-elseif',
-				message: "'elseif' should be 'else if'"
-			});
+			parser.error(parser_errors.invalid_elseif);
 		}
 
 		parser.allow_whitespace();
@@ -110,12 +105,11 @@ export default function mustache(parser: Parser) {
 		if (parser.eat('if')) {
 			const block = parser.current();
 			if (block.type !== 'IfBlock') {
-				parser.error({
-					code: 'invalid-elseif-placement',
-					message: parser.stack.some(block => block.type === 'IfBlock')
-						? `Expected to close ${to_string(block)} before seeing {:else if ...} block`
-						: 'Cannot have an {:else if ...} block outside an {#if ...} block'
-				});
+				parser.error(
+					parser.stack.some(block => block.type === 'IfBlock') 
+						? parser_errors.invalid_elseif_placement_unclosed_block(to_string(block)) 
+						: parser_errors.invalid_elseif_placement_outside_if
+				);
 			}
 
 			parser.require_whitespace();
@@ -146,12 +140,11 @@ export default function mustache(parser: Parser) {
 			// :else
 			const block = parser.current();
 			if (block.type !== 'IfBlock' && block.type !== 'EachBlock') {
-				parser.error({
-					code: 'invalid-else-placement',
-					message: parser.stack.some(block => block.type === 'IfBlock' || block.type === 'EachBlock')
-						? `Expected to close ${to_string(block)} before seeing {:else} block`
-						: 'Cannot have an {:else} block outside an {#if ...} or {#each ...} block'
-				});
+				parser.error(
+					parser.stack.some(block => block.type === 'IfBlock' || block.type === 'EachBlock') 
+						? parser_errors.invalid_else_placement_unclosed_block(to_string(block)) 
+						: parser_errors.invalid_else_placement_outside_if
+				);
 			}
 
 			parser.allow_whitespace();
@@ -172,21 +165,18 @@ export default function mustache(parser: Parser) {
 
 		if (is_then) {
 			if (block.type !== 'PendingBlock') {
-				parser.error({
-					code: 'invalid-then-placement',
-					message: parser.stack.some(block => block.type === 'PendingBlock')
-						? `Expected to close ${to_string(block)} before seeing {:then} block`
-						: 'Cannot have an {:then} block outside an {#await ...} block'
-				});
+				parser.error(
+					parser.stack.some(block => block.type === 'PendingBlock')
+						? parser_errors.invalid_then_placement_unclosed_block(to_string(block)) 
+						: parser_errors.invalid_then_placement_without_await 
+				);
 			}
 		} else {
 			if (block.type !== 'ThenBlock' && block.type !== 'PendingBlock') {
-				parser.error({
-					code: 'invalid-catch-placement',
-					message: parser.stack.some(block => block.type === 'ThenBlock' || block.type === 'PendingBlock')
-						? `Expected to close ${to_string(block)} before seeing {:catch} block`
-						: 'Cannot have an {:catch} block outside an {#await ...} block'
-				});
+				parser.error(parser.stack.some(block => block.type === 'ThenBlock' || block.type === 'PendingBlock')
+						? parser_errors.invalid_catch_placement_unclosed_block(to_string(block)) 
+						: parser_errors.invalid_catch_placement_without_await 
+				);
 			}
 		}
 
@@ -224,10 +214,7 @@ export default function mustache(parser: Parser) {
 		} else if (parser.eat('key')) {
 			type = 'KeyBlock';
 		} else {
-			parser.error({
-				code: 'expected-block-type',
-				message: 'Expected if, each, await or key'
-			});
+			parser.error(parser_errors.expected_block_type);
 		}
 
 		parser.require_whitespace();
@@ -286,12 +273,7 @@ export default function mustache(parser: Parser) {
 			if (parser.eat(',')) {
 				parser.allow_whitespace();
 				block.index = parser.read_identifier();
-				if (!block.index) {
-					parser.error({
-						code: 'expected-name',
-						message: 'Expected name'
-					});
-				}
+				if (!block.index) parser.error(parser_errors.expected_name);
 
 				parser.allow_whitespace();
 			}
@@ -371,10 +353,7 @@ export default function mustache(parser: Parser) {
 
 			identifiers.forEach(node => {
 				if (node.type !== 'Identifier') {
-					parser.error({
-						code: 'invalid-debug-args',
-						message: '{@debug ...} arguments must be identifiers, not arbitrary expressions'
-					}, node.start);
+					parser.error(parser_errors.invalid_debug_args, node.start);
 				}
 			});
 
diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
index 5aacc3e8b2..c7def68f6e 100644
--- a/src/compiler/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -6,7 +6,7 @@ import { is_void } from '../../utils/names';
 import { Parser } from '../index';
 import { Directive, DirectiveType, TemplateNode, Text } from '../../interfaces';
 import fuzzymatch from '../../utils/fuzzymatch';
-import list from '../../utils/list';
+import parser_errors from '../errors';
 
 // eslint-disable-next-line no-useless-escape
 const valid_tag_name = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
@@ -58,7 +58,7 @@ export default function tag(parser: Parser) {
 
 	if (parser.eat('!--')) {
 		const data = parser.read_until(/-->/);
-		parser.eat('-->', true, 'comment was left open, expected -->');
+		parser.eat('-->', true, parser_errors.unclosed_comment);
 
 		parser.current().children.push({
 			start,
@@ -81,24 +81,18 @@ export default function tag(parser: Parser) {
 				(name === 'svelte:window' || name === 'svelte:body') &&
 				parser.current().children.length
 			) {
-				parser.error({
-					code: `invalid-${slug}-content`,
-					message: `<${name}> cannot have children`
-				}, parser.current().children[0].start);
+				parser.error(
+					parser_errors.invalid_element_content(slug, name), 
+					parser.current().children[0].start
+				);
 			}
 		} else {
 			if (name in parser.meta_tags) {
-				parser.error({
-					code: `duplicate-${slug}`,
-					message: `A component can only have one <${name}> tag`
-				}, start);
+				parser.error(parser_errors.duplicate_element(slug, name), start);
 			}
 
 			if (parser.stack.length > 1) {
-				parser.error({
-					code: `invalid-${slug}-placement`,
-					message: `<${name}> tags cannot be inside elements or blocks`
-				}, start);
+				parser.error(parser_errors.invalid_element_placement(slug, name), start);
 			}
 
 			parser.meta_tags[name] = true;
@@ -125,10 +119,7 @@ export default function tag(parser: Parser) {
 
 	if (is_closing_tag) {
 		if (is_void(name)) {
-			parser.error({
-				code: 'invalid-void-content',
-				message: `<${name}> is a void element and cannot have children, or a closing tag`
-			}, start);
+			parser.error(parser_errors.invalid_void_content(name), start);
 		}
 
 		parser.eat('>', true);
@@ -136,13 +127,10 @@ export default function tag(parser: Parser) {
 		// close any elements that don't have their own closing tags, e.g. <div><p></div>
 		while (parent.name !== name) {
 			if (parent.type !== 'Element') {
-				const message = parser.last_auto_closed_tag && parser.last_auto_closed_tag.tag === name
-					? `</${name}> attempted to close <${name}> that was already automatically closed by <${parser.last_auto_closed_tag.reason}>`
-					: `</${name}> attempted to close an element that was not open`;
-				parser.error({
-					code: 'invalid-closing-tag',
-					message
-				}, start);
+				const error = parser.last_auto_closed_tag && parser.last_auto_closed_tag.tag === name
+					? parser_errors.invalid_closing_tag_autoclosed(name, parser.last_auto_closed_tag.reason)
+					: parser_errors.invalid_closing_tag_unopened(name);
+				parser.error(error, start);
 			}
 
 			parent.end = start;
@@ -180,18 +168,12 @@ export default function tag(parser: Parser) {
 	if (name === 'svelte:component') {
 		const index = element.attributes.findIndex(attr => attr.type === 'Attribute' && attr.name === 'this');
 		if (!~index) {
-			parser.error({
-				code: 'missing-component-definition',
-				message: "<svelte:component> must have a 'this' attribute"
-			}, start);
+			parser.error(parser_errors.missing_component_definition, start);
 		}
 
 		const definition = element.attributes.splice(index, 1)[0];
 		if (definition.value === true || definition.value.length !== 1 || definition.value[0].type === 'Text') {
-			parser.error({
-				code: 'invalid-component-definition',
-				message: 'invalid component definition'
-			}, definition.start);
+			parser.error(parser_errors.invalid_component_definition, definition.start);
 		}
 
 		element.expression = definition.value[0].expression;
@@ -256,10 +238,7 @@ function read_tag_name(parser: Parser) {
 		}
 
 		if (!legal) {
-			parser.error({
-				code: 'invalid-self-placement',
-				message: '<svelte:self> components can only exist inside {#if} blocks, {#each} blocks, or slots passed to components'
-			}, start);
+			parser.error(parser_errors.invalid_self_placement, start);
 		}
 
 		return 'svelte:self';
@@ -276,20 +255,14 @@ function read_tag_name(parser: Parser) {
 	if (name.startsWith('svelte:')) {
 		const match = fuzzymatch(name.slice(7), valid_meta_tags);
 
-		let message = `Valid <svelte:...> tag names are ${list(valid_meta_tags)}`;
-		if (match) message += ` (did you mean '${match}'?)`;
-
-		parser.error({
-			code: 'invalid-tag-name',
-			message
-		}, start);
+		parser.error(
+			parser_errors.invalid_tag_name_svelte_element(valid_meta_tags, match), 
+			start
+		);
 	}
 
 	if (!valid_tag_name.test(name)) {
-		parser.error({
-			code: 'invalid-tag-name',
-			message: 'Expected valid tag name'
-		}, start);
+		parser.error(parser_errors.invalid_tag_name, start);
 	}
 
 	return name;
@@ -300,10 +273,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 
 	function check_unique(name: string) {
 		if (unique_names.has(name)) {
-			parser.error({
-				code: 'duplicate-attribute',
-				message: 'Attributes need to be unique'
-			}, start);
+			parser.error(parser_errors.duplicate_attribute, start);
 		}
 		unique_names.add(name);
 	}
@@ -331,10 +301,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 			parser.eat('}', true);
 
 			if (name === null) {
-				parser.error({
-					code: 'empty-attribute-shorthand',
-					message: 'Attribute shorthand cannot be empty'
-				}, start);
+				parser.error(parser_errors.empty_attribute_shorthand, start);
 			}
 
 			check_unique(name);
@@ -376,20 +343,14 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		value = read_attribute_value(parser);
 		end = parser.index;
 	} else if (parser.match_regex(/["']/)) {
-		parser.error({
-			code: 'unexpected-token',
-			message: 'Expected ='
-		}, parser.index);
+		parser.error(parser_errors.unexpected_token('='), parser.index);
 	}
 
 	if (type) {
 		const [directive_name, ...modifiers] = name.slice(colon_index + 1).split('|');
 
 		if (directive_name === '') {
-			parser.error({
-				code: 'empty-directive-name',
-				message: `${type} name cannot be empty`
-			}, start + colon_index + 1);
+			parser.error(parser_errors.empty_directive_name(type), start + colon_index + 1);
 		}
 
 		if (type === 'Binding' && directive_name !== 'this') {
@@ -399,18 +360,12 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		}
 
 		if (type === 'Ref') {
-			parser.error({
-				code: 'invalid-ref-directive',
-				message: `The ref directive is no longer supported — use \`bind:this={${directive_name}}\` instead`
-			}, start);
+			parser.error(parser_errors.invalid_ref_directive(directive_name), start);
 		}
 
 		if (value[0]) {
 			if ((value as any[]).length > 1 || value[0].type === 'Text') {
-				parser.error({
-					code: 'invalid-directive-value',
-					message: 'Directive value must be a JavaScript expression enclosed in curly braces'
-				}, value[0].start);
+				parser.error(parser_errors.invalid_directive_value, value[0].start);
 			}
 		}
 
@@ -530,8 +485,5 @@ function read_sequence(parser: Parser, done: () => boolean): TemplateNode[] {
 		}
 	}
 
-	parser.error({
-		code: 'unexpected-eof',
-		message: 'Unexpected end of input'
-	});
+	parser.error(parser_errors.unexpected_eof);
 }
diff --git a/test/parser/samples/error-comment-unclosed/error.json b/test/parser/samples/error-comment-unclosed/error.json
index 8e355fb821..95fa28c35a 100644
--- a/test/parser/samples/error-comment-unclosed/error.json
+++ b/test/parser/samples/error-comment-unclosed/error.json
@@ -1,5 +1,5 @@
 {
-	"code": "unexpected-eof",
+	"code": "unclosed-comment",
 	"message": "comment was left open, expected -->",
 	"start": {
 		"line": 1,

From 28185679256d9e8fd1f863f33c969d3990f4ba82 Mon Sep 17 00:00:00 2001
From: Tan Li Hau <tanhauhau@users.noreply.github.com>
Date: Wed, 14 Jul 2021 08:02:43 +0800
Subject: [PATCH 3/5] fix input value 0 for ssr (#6458)

---
 src/compiler/compile/render_ssr/handlers/Element.ts |  4 +++-
 .../samples/apply-directives-in-order/_config.js    |  2 +-
 test/runtime/samples/binding-circular/_config.js    |  6 ------
 .../binding-select-implicit-option-value/_config.js | 10 ----------
 .../samples/binding-select-in-each-block/_config.js | 13 -------------
 .../samples/binding-select-initial-value/_config.js | 12 ------------
 .../samples/binding-select-late-2/_config.js        |  5 -----
 .../samples/binding-select-multiple/_config.js      | 10 ----------
 test/runtime/samples/binding-select/_config.js      | 12 ------------
 .../samples/bindings-global-dependency/_config.js   |  3 ++-
 .../samples/component-binding-computed/_config.js   |  4 ++++
 .../samples/component-binding-store/_config.js      |  5 +++++
 .../samples/component-slot-fallback-6/_config.js    |  4 ++++
 .../samples/component-slot-spread-props/_config.js  |  6 ++++++
 .../_config.js                                      |  2 +-
 .../store-invalidation-while-update-1/_config.js    |  6 ++++++
 .../store-invalidation-while-update-2/_config.js    |  6 ++++++
 .../samples/bindings-empty-string/_expected.html    |  1 +
 .../samples/bindings-empty-string/main.svelte       |  5 +++++
 .../samples/bindings-zero/_expected.html            |  2 ++
 .../samples/bindings-zero/main.svelte               |  6 ++++++
 21 files changed, 52 insertions(+), 72 deletions(-)
 create mode 100644 test/server-side-rendering/samples/bindings-empty-string/_expected.html
 create mode 100644 test/server-side-rendering/samples/bindings-empty-string/main.svelte
 create mode 100644 test/server-side-rendering/samples/bindings-zero/_expected.html
 create mode 100644 test/server-side-rendering/samples/bindings-zero/main.svelte

diff --git a/src/compiler/compile/render_ssr/handlers/Element.ts b/src/compiler/compile/render_ssr/handlers/Element.ts
index 5ef354a85a..35a15aff63 100644
--- a/src/compiler/compile/render_ssr/handlers/Element.ts
+++ b/src/compiler/compile/render_ssr/handlers/Element.ts
@@ -126,9 +126,11 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
 		} else if (binding.name === 'value' && node.name === 'textarea') {
 			const snippet = expression.node;
 			node_contents = x`${snippet} || ""`;
+		} else if (binding.name === 'value' && node.name === 'select') {
+			// NOTE: do not add "value" attribute on <select />
 		} else {
 			const snippet = expression.node;
-			renderer.add_expression(x`@add_attribute("${name}", ${snippet}, 1)`);
+			renderer.add_expression(x`@add_attribute("${name}", ${snippet}, ${boolean_attributes.has(name) ? 1 : 0})`);
 		}
 	});
 
diff --git a/test/runtime/samples/apply-directives-in-order/_config.js b/test/runtime/samples/apply-directives-in-order/_config.js
index 7c8f87ef85..0c85c97f8b 100644
--- a/test/runtime/samples/apply-directives-in-order/_config.js
+++ b/test/runtime/samples/apply-directives-in-order/_config.js
@@ -9,7 +9,7 @@ export default {
 	`,
 
 	ssrHtml: `
-		<input>
+		<input value="">
 		<p></p>
 	`,
 
diff --git a/test/runtime/samples/binding-circular/_config.js b/test/runtime/samples/binding-circular/_config.js
index 505ed22beb..3e58ab2f98 100644
--- a/test/runtime/samples/binding-circular/_config.js
+++ b/test/runtime/samples/binding-circular/_config.js
@@ -3,11 +3,5 @@ export default {
 		<select>
 			<option value="[object Object]">wheeee</option>
 		</select>
-	`,
-
-	ssrHtml: `
-		<select value="[object Object]">
-			<option value="[object Object]">wheeee</option>
-		</select>
 	`
 };
diff --git a/test/runtime/samples/binding-select-implicit-option-value/_config.js b/test/runtime/samples/binding-select-implicit-option-value/_config.js
index cce1172f6a..1266602a47 100644
--- a/test/runtime/samples/binding-select-implicit-option-value/_config.js
+++ b/test/runtime/samples/binding-select-implicit-option-value/_config.js
@@ -14,16 +14,6 @@ export default {
 		<p>foo: 2</p>
 	`,
 
-	ssrHtml: `
-		<select value=2>
-			<option value='1'>1</option>
-			<option value='2'>2</option>
-			<option value='3'>3</option>
-		</select>
-
-		<p>foo: 2</p>
-	`,
-
 	async test({ assert, component, target, window }) {
 		const select = target.querySelector('select');
 		const options = [...target.querySelectorAll('option')];
diff --git a/test/runtime/samples/binding-select-in-each-block/_config.js b/test/runtime/samples/binding-select-in-each-block/_config.js
index 89f40f8d48..80ea375b78 100644
--- a/test/runtime/samples/binding-select-in-each-block/_config.js
+++ b/test/runtime/samples/binding-select-in-each-block/_config.js
@@ -1,17 +1,4 @@
 export default {
-
-	ssrHtml: `
-		<select value='hullo'>
-			<option value='hullo'>Hullo</option>
-			<option value='world'>World</option>
-		</select>
-
-		<select value='world'>
-			<option value='hullo'>Hullo</option>
-			<option value='world'>World</option>
-		</select>
-	`,
-
 	html: `
 		<select>
 			<option value='hullo'>Hullo</option>
diff --git a/test/runtime/samples/binding-select-initial-value/_config.js b/test/runtime/samples/binding-select-initial-value/_config.js
index d34a987fa5..517107c4fb 100644
--- a/test/runtime/samples/binding-select-initial-value/_config.js
+++ b/test/runtime/samples/binding-select-initial-value/_config.js
@@ -11,18 +11,6 @@ export default {
 		<p>selected: b</p>
 	`,
 
-	ssrHtml: `
-		<p>selected: b</p>
-
-		<select value=b>
-			<option value='a'>a</option>
-			<option value='b'>b</option>
-			<option value='c'>c</option>
-		</select>
-
-		<p>selected: b</p>
-	`,
-
 	props: {
 		selected: 'b'
 	},
diff --git a/test/runtime/samples/binding-select-late-2/_config.js b/test/runtime/samples/binding-select-late-2/_config.js
index 42c45d1366..f4b0088fb9 100644
--- a/test/runtime/samples/binding-select-late-2/_config.js
+++ b/test/runtime/samples/binding-select-late-2/_config.js
@@ -9,11 +9,6 @@ export default {
 		<p>selected: two</p>
 	`,
 
-	ssrHtml: `
-		<select value="two"></select>
-		<p>selected: two</p>
-	`,
-
 	test({ assert, component, target }) {
 		component.items = [ 'one', 'two', 'three' ];
 
diff --git a/test/runtime/samples/binding-select-multiple/_config.js b/test/runtime/samples/binding-select-multiple/_config.js
index b7d6c3589f..70a5620d05 100644
--- a/test/runtime/samples/binding-select-multiple/_config.js
+++ b/test/runtime/samples/binding-select-multiple/_config.js
@@ -4,16 +4,6 @@ export default {
 		selected: [ 'two', 'three' ]
 	},
 
-	ssrHtml: `
-		<select multiple value="two,three">
-			<option value="one">one</option>
-			<option value="two">two</option>
-			<option value="three">three</option>
-		</select>
-
-		<p>selected: two, three</p>
-	`,
-
 	html: `
 		<select multiple>
 			<option value="one">one</option>
diff --git a/test/runtime/samples/binding-select/_config.js b/test/runtime/samples/binding-select/_config.js
index 310315176b..6cdef2651a 100644
--- a/test/runtime/samples/binding-select/_config.js
+++ b/test/runtime/samples/binding-select/_config.js
@@ -11,18 +11,6 @@ export default {
 		<p>selected: one</p>
 	`,
 
-	ssrHtml: `
-		<p>selected: one</p>
-
-		<select value=one>
-			<option value='one'>one</option>
-			<option value='two'>two</option>
-			<option value='three'>three</option>
-		</select>
-
-		<p>selected: one</p>
-	`,
-
 	props: {
 		selected: 'one'
 	},
diff --git a/test/runtime/samples/bindings-global-dependency/_config.js b/test/runtime/samples/bindings-global-dependency/_config.js
index 1180424e81..907aa52e6e 100644
--- a/test/runtime/samples/bindings-global-dependency/_config.js
+++ b/test/runtime/samples/bindings-global-dependency/_config.js
@@ -1,3 +1,4 @@
 export default {
-	html: '<input type="text">'
+	html: '<input type="text">',
+	ssrHtml: '<input type="text" value="">'
 };
diff --git a/test/runtime/samples/component-binding-computed/_config.js b/test/runtime/samples/component-binding-computed/_config.js
index b287014065..f43a6834a8 100644
--- a/test/runtime/samples/component-binding-computed/_config.js
+++ b/test/runtime/samples/component-binding-computed/_config.js
@@ -3,6 +3,10 @@ export default {
 		<label>firstname <input></label>
 		<label>lastname <input></label>
 	`,
+	ssrHtml: `
+		<label>firstname <input value=""></label>
+		<label>lastname <input value=""></label>
+	`,
 
 	async test({ assert, component, target, window }) {
 		const input = new window.Event('input');
diff --git a/test/runtime/samples/component-binding-store/_config.js b/test/runtime/samples/component-binding-store/_config.js
index d17b9e2d80..8bbdab17ee 100644
--- a/test/runtime/samples/component-binding-store/_config.js
+++ b/test/runtime/samples/component-binding-store/_config.js
@@ -4,6 +4,11 @@ export default {
 		<input />
 		<div></div>
 	`,
+	ssrHtml: `
+		<input value=""/>
+		<input value=""/>
+		<div></div>
+	`,
 
 	async test({ assert, component, target, window }) {
 		let count = 0;
diff --git a/test/runtime/samples/component-slot-fallback-6/_config.js b/test/runtime/samples/component-slot-fallback-6/_config.js
index b32d96db2e..be47d31d03 100644
--- a/test/runtime/samples/component-slot-fallback-6/_config.js
+++ b/test/runtime/samples/component-slot-fallback-6/_config.js
@@ -4,6 +4,10 @@ export default {
 		<input>
 		{"value":""}
 	`,
+	ssrHtml: `
+		<input value="">
+		{"value":""}
+	`,
 
 	async test({ assert, target, window }) {
 		const input = target.querySelector('input');
diff --git a/test/runtime/samples/component-slot-spread-props/_config.js b/test/runtime/samples/component-slot-spread-props/_config.js
index 042bdca6ec..7beda8d3d5 100644
--- a/test/runtime/samples/component-slot-spread-props/_config.js
+++ b/test/runtime/samples/component-slot-spread-props/_config.js
@@ -5,6 +5,12 @@ export default {
 			<div class="foo"></div>
 		</div>
 	`,
+	ssrHtml: `
+		<div>
+			<input value="" />
+			<div class="foo"></div>
+		</div>
+	`,
 
 	async test({ assert, component, target }) {
 		component.value = 'foo';
diff --git a/test/runtime/samples/each-block-destructured-default-binding/_config.js b/test/runtime/samples/each-block-destructured-default-binding/_config.js
index 3697e37441..2ba27bff03 100644
--- a/test/runtime/samples/each-block-destructured-default-binding/_config.js
+++ b/test/runtime/samples/each-block-destructured-default-binding/_config.js
@@ -4,7 +4,7 @@ export default {
 		<input />
 	`,
 	ssrHtml: `
-		<input />
+		<input value="" />
 		<input value="hello" />
 	`,
 
diff --git a/test/runtime/samples/store-invalidation-while-update-1/_config.js b/test/runtime/samples/store-invalidation-while-update-1/_config.js
index 6a931afeaf..0f8ff1809b 100644
--- a/test/runtime/samples/store-invalidation-while-update-1/_config.js
+++ b/test/runtime/samples/store-invalidation-while-update-1/_config.js
@@ -5,6 +5,12 @@ export default {
 		<div>simple</div>
 		<button>click me</button>
 	`,
+	ssrHtml: `
+		<input value="">
+		<div></div>
+		<div>simple</div>
+		<button>click me</button>
+	`,
 
 	async test({ assert, component, target, window }) {
 		const input = target.querySelector('input');
diff --git a/test/runtime/samples/store-invalidation-while-update-2/_config.js b/test/runtime/samples/store-invalidation-while-update-2/_config.js
index 6c2538e564..2465b7d444 100644
--- a/test/runtime/samples/store-invalidation-while-update-2/_config.js
+++ b/test/runtime/samples/store-invalidation-while-update-2/_config.js
@@ -5,6 +5,12 @@ export default {
 		<input>
 		<button>click me</button>
 	`,
+	ssrHtml: `
+		<div></div>
+		<div>simple</div>
+		<input value="">
+		<button>click me</button>
+	`,
 
 	async test({ assert, component, target, window }) {
 		const input = target.querySelector('input');
diff --git a/test/server-side-rendering/samples/bindings-empty-string/_expected.html b/test/server-side-rendering/samples/bindings-empty-string/_expected.html
new file mode 100644
index 0000000000..8344e198fa
--- /dev/null
+++ b/test/server-side-rendering/samples/bindings-empty-string/_expected.html
@@ -0,0 +1 @@
+<input value=''>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/bindings-empty-string/main.svelte b/test/server-side-rendering/samples/bindings-empty-string/main.svelte
new file mode 100644
index 0000000000..7257d0f85e
--- /dev/null
+++ b/test/server-side-rendering/samples/bindings-empty-string/main.svelte
@@ -0,0 +1,5 @@
+<script>
+	export let foo = '';
+</script>
+
+<input bind:value={foo} >
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/bindings-zero/_expected.html b/test/server-side-rendering/samples/bindings-zero/_expected.html
new file mode 100644
index 0000000000..d634c4b80f
--- /dev/null
+++ b/test/server-side-rendering/samples/bindings-zero/_expected.html
@@ -0,0 +1,2 @@
+<input value="0" type="number">
+<input value="0" type="range">
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/bindings-zero/main.svelte b/test/server-side-rendering/samples/bindings-zero/main.svelte
new file mode 100644
index 0000000000..5689bb8d9c
--- /dev/null
+++ b/test/server-side-rendering/samples/bindings-zero/main.svelte
@@ -0,0 +1,6 @@
+<script>
+	export let foo = 0;
+</script>
+
+<input type="number" bind:value={foo} >
+<input type="range" bind:value={foo} >
\ No newline at end of file

From ff50bfba6fa21238723cfd5a67c6c77b85fb70ff Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 13 Jul 2021 17:10:37 -0700
Subject: [PATCH 4/5] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b0be8342a..93e1539093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Add `varsReport` compiler option to include all variables reference in the component in the `variables` report ([#6192](https://github.com/sveltejs/svelte/pull/6192))
 * Throw compiler error when passing empty directive names ([#6299](https://github.com/sveltejs/svelte/issues/6299))
 * Throw proper error for `export default function() {}` and `export default class {}` rather than crashing the compiler ([#3275](https://github.com/sveltejs/svelte/issues/3275))
+* Fix usage of falsy `input` values ([#6458](https://github.com/sveltejs/svelte/pull/6458))
 * Fix ordering of elements in keyed `{#each}` ([#6445](https://github.com/sveltejs/svelte/pull/6445))
 * Fix `preserveComments` in SSR mode ([#4730](https://github.com/sveltejs/svelte/issues/4730))
 * Fix compiler error when using `:where()` inside `:global()` ([#6434](https://github.com/sveltejs/svelte/issues/6434))

From 52b67a0497baa5d3a84dd1d4ed746f9f236de23d Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 13 Jul 2021 18:09:16 -0700
Subject: [PATCH 5/5] [chore] fix duplicate import of periscopic (#6527)

---
 src/compiler/compile/render_dom/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/compiler/compile/render_dom/index.ts b/src/compiler/compile/render_dom/index.ts
index 74c0769d09..b2045fccc4 100644
--- a/src/compiler/compile/render_dom/index.ts
+++ b/src/compiler/compile/render_dom/index.ts
@@ -3,13 +3,12 @@ import Component from '../Component';
 import Renderer from './Renderer';
 import { CompileOptions, CssResult } from '../../interfaces';
 import { walk } from 'estree-walker';
-import { extract_names, Scope } from 'periscopic';
+import { extract_names, Node as PeriscopicNode, Scope } from 'periscopic';
 import { invalidate } from './invalidate';
 import Block from './Block';
 import { ClassDeclaration, FunctionExpression, Node, Statement, ObjectExpression, Expression } from 'estree';
 import { apply_preprocessor_sourcemap } from '../../utils/mapped_code';
 import { RawSourceMap, DecodedSourceMap } from '@ampproject/remapping/dist/types/types';
-import { Node as PeriscopicNode } from 'periscopic';
 
 export default function dom(
 	component: Component,