Merge branch 'master' of https://github.com/sveltejs/svelte

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Svelte changelog
 
+## Unreleased
+
+* Fix code generation error with adjacent inline and block comments ([#4312](https://github.com/sveltejs/svelte/issues/4312))
+
 ## 3.18.0
 
 * Fix infinite loop when instantiating another component during `onMount` ([#3218](https://github.com/sveltejs/svelte/issues/3218))

package-lock.json

@@ -597,9 +597,9 @@
       "dev": true
     },
     "code-red": {
-      "version": "0.0.31",
+      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.31.tgz",
+      "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.32.tgz",
-      "integrity": "sha512-7Gf3vm8pDbs+H/hKsaqOZe0xKlE9Neah12GCfs7qun3fBUaOXwexAMjn0Eo9cvJJvhRMaL0jgPiY9ZGLTWoe8A==",
+      "integrity": "sha512-mE+EZc2vJ4HxiejW5S2CvcVDKtopFEmrqAd9DTBDLCNjLgxekPP8wLi/ZiwDTwZwwW3dzeetaubLaMlIvkhVNw==",
       "dev": true,
       "requires": {
         "acorn": "^7.1.0",

package.json

@@ -70,7 +70,7 @@
     "acorn": "^7.1.0",
     "agadoo": "^1.1.0",
     "c8": "^5.0.1",
-    "code-red": "0.0.31",
+    "code-red": "0.0.32",
     "codecov": "^3.5.0",
     "css-tree": "1.0.0-alpha22",
     "eslint": "^6.3.0",

site/Makefile

@@ -14,9 +14,9 @@ sapper:
 
 docker:
 	@echo "\n~> building docker image"
-	@gcloud builds submit -t $(IMAGE)
+	@gcloud builds submit --project $(PROJECT) -t $(IMAGE)
 
 
 deploy: sapper docker
 	@echo "\n~> deploying $(SERVICE) to Cloud Run servers"
-	@gcloud beta run deploy $(SERVICE) --allow-unauthenticated --platform managed --region us-central1 --image $(IMAGE) --memory=512Mi
+	@gcloud beta run deploy $(SERVICE) --project $(PROJECT) --allow-unauthenticated --platform managed --region us-central1 --image $(IMAGE) --memory=512Mi

site/content/docs/00-introduction.md

@@ -2,8 +2,8 @@
 title: Before we begin
 ---
 
-> Temporary note: This document is a work-in-progress. Please forgive any missing or misleading parts, and don't be shy about asking for help in the [Discord chatroom](chat). The [tutorial](tutorial) is more complete; start there.
-
 This page contains detailed API reference documentation. It's intended to be a resource for people who already have some familiarity with Svelte.
 
 If that's not you (yet), you may prefer to visit the [interactive tutorial](tutorial) or the [examples](examples) before consulting this reference.
+
+Don't be shy about asking for help in the [Discord chatroom](chat).

site/src/template.html

@@ -15,6 +15,7 @@
 	<meta name='twitter:site' content='@sveltejs'>
 	<meta name='twitter:creator' content='@sveltejs'>
 	<meta name='twitter:image' content='https://svelte.dev/images/twitter-card.png'>
+	<meta name='og:image' content='https://svelte.dev/images/twitter-card.png'>
 
 	<!-- Sapper generates a <style> tag containing critical CSS
 	     for the current page. CSS for the rest of the app is