Merge branch 'master' into alternate-routes

Philipp Zerelles · Philipp Zerelles · commit 5214872c1f5f · 2021-04-27T16:52:23.000+02:00
diff --git a/.changeset/cold-pants-unite.md b/.changeset/cold-pants-unite.md
@@ -0,0 +1,6 @@
+---
+'create-svelte': patch
+'@sveltejs/kit': patch
+---
+
+fix: adapt to svelte ids without ?import in vite 2.2.3
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -53,6 +53,7 @@
     "cold-buttons-sell",
     "cold-llamas-brake",
     "cold-panthers-learn",
+    "cold-pants-unite",
     "cool-spoons-dress",
     "curvy-sloths-brake",
     "cyan-roses-act",
@@ -244,6 +245,7 @@
     "two-students-melt",
     "unlucky-parrots-vanish",
     "unlucky-wasps-rest",
+    "violet-goats-wave",
     "violet-jars-give",
     "warm-ads-invite",
     "warm-cameras-fix",
diff --git a/examples/hn.svelte.dev/src/routes/about.svelte b/examples/hn.svelte.dev/src/routes/about.svelte
@@ -9,8 +9,8 @@
 
 <h1>About this site</h1>
 
-<p>This is a simple Hacker News clone, built with <a href="https://sapper.svelte.dev">Sapper</a>, an application framework for <a href="https://svelte.dev">Svelte</a>.</p>
+<p>This is a simple Hacker News clone, built with <a href="https://kit.svelte.dev">SvelteKit</a>, an application framework for <a href="https://svelte.dev">Svelte</a>.</p>
 
 <p>Svelte is a new kind of framework, one that compiles your component templates into fast, compact JavaScript — either client-side or server-side. You can read more about the design and philosophy in the <a href="https://svelte.dev/blog/svelte-3-rethinking-reactivity">introductory blog post</a>.</p>
 
-<p>We're using <a href="https://github.com/davideast/hnpwa-api">hnpwa-api</a> as a backend. The app is hosted on <a href="https://cloud.google.com/run/">Cloud Run</a>, using <a href="https://www.cloudflare.com/">Cloudflare</a> for the CDN. <a href="https://github.com/sveltejs/hn.svelte.dev">The source code is here</a>.</p>
+<p>We're using <a href="https://github.com/davideast/hnpwa-api">hnpwa-api</a> as a backend. The app is hosted on <a href="https://cloud.google.com/run/">Cloud Run</a>, using <a href="https://www.cloudflare.com/">Cloudflare</a> for the CDN. <a href="https://github.com/sveltejs/hn.svelte.dev">The source code is here</a>.</p>
diff --git a/packages/adapter-begin/CHANGELOG.md b/packages/adapter-begin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-begin
 
+## 1.0.0-next.6
+
+### Patch Changes
+
+- 2e72a94: Add type declarations
+
 ## 1.0.0-next.5
 
 ### Patch Changes
diff --git a/packages/adapter-begin/package.json b/packages/adapter-begin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-begin",
-	"version": "1.0.0-next.5",
+	"version": "1.0.0-next.6",
 	"main": "index.cjs",
 	"types": "index.d.ts",
 	"scripts": {
diff --git a/packages/adapter-cloudflare-workers/CHANGELOG.md b/packages/adapter-cloudflare-workers/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-cloudflare-workers
 
+## 0.0.2-next.4
+
+### Patch Changes
+
+- 2e72a94: Add type declarations
+
 ## 0.0.2-next.3
 
 ### Patch Changes
diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-cloudflare-workers",
-	"version": "0.0.2-next.3",
+	"version": "0.0.2-next.4",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"files": [
diff --git a/packages/adapter-netlify/CHANGELOG.md b/packages/adapter-netlify/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sveltejs/adapter-netlify
 
+## 1.0.0-next.10
+
+### Patch Changes
+
+- 2e72a94: Add type declarations
+- Updated dependencies [82955ec]
+  - @sveltejs/kit@1.0.0-next.91
+
 ## 1.0.0-next.9
 
 ### Patch Changes
diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-netlify",
-	"version": "1.0.0-next.9",
+	"version": "1.0.0-next.10",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"files": [
diff --git a/packages/adapter-node/CHANGELOG.md b/packages/adapter-node/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-node
 
+## 1.0.0-next.17
+
+### Patch Changes
+
+- 2e72a94: Add type declarations
+
 ## 1.0.0-next.16
 
 ### Patch Changes
diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-node",
-	"version": "1.0.0-next.16",
+	"version": "1.0.0-next.17",
 	"main": "index.cjs",
 	"type": "module",
 	"types": "index.d.ts",
diff --git a/packages/adapter-static/CHANGELOG.md b/packages/adapter-static/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-static
 
+## 1.0.0-next.7
+
+### Patch Changes
+
+- 2e72a94: Add type declarations
+
 ## 1.0.0-next.6
 
 ### Patch Changes
diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-static",
-	"version": "1.0.0-next.6",
+	"version": "1.0.0-next.7",
 	"types": "index.d.ts",
 	"scripts": {
 		"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
diff --git a/packages/adapter-vercel/CHANGELOG.md b/packages/adapter-vercel/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @sveltejs/adapter-vercel
 
+## 1.0.0-next.15
+
+### Patch Changes
+
+- 2e72a94: Add type declarations
+- Updated dependencies [82955ec]
+  - @sveltejs/kit@1.0.0-next.91
+
 ## 1.0.0-next.14
 
 ### Patch Changes
diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-vercel",
-	"version": "1.0.0-next.14",
+	"version": "1.0.0-next.15",
 	"main": "index.js",
 	"types": "index.d.ts",
 	"files": [
diff --git a/packages/create-svelte/CHANGELOG.md b/packages/create-svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-svelte
 
+## 2.0.0-next.61
+
+### Patch Changes
+
+- 82955ec: fix: adapt to svelte ids without ?import in vite 2.2.3
+
 ## 2.0.0-next.60
 
 ### Patch Changes
diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "create-svelte",
-	"version": "2.0.0-next.60",
+	"version": "2.0.0-next.61",
 	"bin": "./bin.js",
 	"dependencies": {
 		"kleur": "^4.1.4",
diff --git a/packages/create-svelte/templates/default/package.json b/packages/create-svelte/templates/default/package.json
@@ -14,7 +14,7 @@
 		"svelte": "^3.37.0",
 		"svelte-preprocess": "^4.7.1",
 		"typescript": "^4.2.4",
-		"vite": "2.2.2"
+		"vite": "^2.2.3"
 	},
 	"type": "module",
 	"dependencies": {
diff --git a/packages/create-svelte/templates/skeleton/package.template.json b/packages/create-svelte/templates/skeleton/package.template.json
@@ -9,7 +9,7 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.29.0",
-		"vite": "^2.1.0"
+		"vite": "^2.2.3"
 	},
 	"type": "module"
 }
diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/kit
 
+## 1.0.0-next.91
+
+### Patch Changes
+
+- 82955ec: fix: adapt to svelte ids without ?import in vite 2.2.3
+
 ## 1.0.0-next.90
 
 ### Patch Changes
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/kit",
-	"version": "1.0.0-next.90",
+	"version": "1.0.0-next.91",
 	"type": "module",
 	"dependencies": {
 		"@sveltejs/vite-plugin-svelte": "^1.0.0-next.7",
@@ -32,11 +32,11 @@
 		"tiny-glob": "^0.2.8",
 		"typescript": "^4.2.3",
 		"uvu": "^0.5.1",
-		"vite": "2.2.2"
+		"vite": "^2.2.3"
 	},
 	"peerDependencies": {
 		"svelte": "^3.32.1",
-		"vite": "^2.1.0"
+		"vite": "^2.2.3"
 	},
 	"bin": {
 		"svelte-kit": "svelte-kit.js"
diff --git a/packages/kit/src/core/dev/index.js b/packages/kit/src/core/dev/index.js
@@ -213,9 +213,13 @@ class Watcher extends EventEmitter {
 									}
 								}
 
+								let entry = `/${id}`;
+								if (!entry.endsWith('.svelte')) {
+									entry += '?import';
+								}
 								return {
 									module,
-									entry: `/${id}?import`,
+									entry,
 									css: [],
 									js: [],
 									styles: Array.from(styles)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sveltejs/adapter-begin",`
`3`		`- "version": "1.0.0-next.5",`
	`3`	`+ "version": "1.0.0-next.6",`
`4`	`4`	`"main": "index.cjs",`
`5`	`5`	`"types": "index.d.ts",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sveltejs/adapter-cloudflare-workers",`
`3`		`- "version": "0.0.2-next.3",`
	`3`	`+ "version": "0.0.2-next.4",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"types": "index.d.ts",`
`6`	`6`	`"files": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sveltejs/adapter-netlify",`
`3`		`- "version": "1.0.0-next.9",`
	`3`	`+ "version": "1.0.0-next.10",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"types": "index.d.ts",`
`6`	`6`	`"files": [`