merge master -> root-devdeps

Rich-Harris · Rich-Harris · commit 7723deb42e2c · 2022-05-23T09:34:59.000-04:00
diff --git a/.changeset/curly-doors-type.md b/.changeset/curly-doors-type.md
@@ -0,0 +1,5 @@
+---
+"create-svelte": patch
+---
+
+correct default package.json format
diff --git a/.changeset/few-scissors-agree.md b/.changeset/few-scissors-agree.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/adapter-vercel': patch
+---
+
+Revert to cjs mode when building for lambda
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -188,6 +188,7 @@
     "eleven-dots-reply",
     "empty-donuts-smell",
     "empty-falcons-run",
+    "empty-fishes-design",
     "empty-grapes-own",
     "empty-islands-lie",
     "empty-lamps-matter",
@@ -210,6 +211,7 @@
     "few-points-taste",
     "few-rockets-sort",
     "few-rockets-think",
+    "few-scissors-agree",
     "few-singers-pump",
     "few-suits-drive",
     "few-suits-flash",
diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
 		"typescript": "~4.6.2",
 		"uvu": "^0.5.2"
 	},
-	"packageManager": "pnpm@7.1.2",
+	"packageManager": "pnpm@7.1.3",
 	"engines": {
 		"pnpm": "^7.0.0"
 	},
diff --git a/packages/adapter-auto/CHANGELOG.md b/packages/adapter-auto/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @sveltejs/adapter-auto
 
+## 1.0.0-next.44
+
+### Patch Changes
+
+- Updated dependencies [[`a452bd83`](https://github.com/sveltejs/kit/commit/a452bd83ac5feb27040a1cb364395c9ae5c04107)]:
+  - @sveltejs/adapter-vercel@1.0.0-next.53
+
 ## 1.0.0-next.43
 
 ### Patch Changes
diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/adapter-auto",
-	"version": "1.0.0-next.43",
+	"version": "1.0.0-next.44",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/adapter-vercel/CHANGELOG.md b/packages/adapter-vercel/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @sveltejs/adapter-vercel
 
+## 1.0.0-next.53
+
+### Patch Changes
+
+- Revert to cjs mode when building for lambda ([#4967](https://github.com/sveltejs/kit/pull/4967))
+
 ## 1.0.0-next.52
 
 ### Patch Changes
diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js
@@ -145,10 +145,10 @@ async function v1(builder, external) {
 		bundle: true,
 		platform: 'node',
 		external,
-		format: 'esm'
+		format: 'cjs'
 	});
 
-	writeFileSync(`${dirs.lambda}/package.json`, JSON.stringify({ type: 'module' }));
+	writeFileSync(`${dirs.lambda}/package.json`, JSON.stringify({ type: 'commonjs' }));
 
 	builder.log.minor('Copying assets...');
 
@@ -271,7 +271,7 @@ async function v3(builder, external, edge, split) {
 			target: `node${node_version.full}`,
 			bundle: true,
 			platform: 'node',
-			format: 'esm',
+			format: 'cjs',
 			external
 		});
 
@@ -284,7 +284,7 @@ async function v3(builder, external, edge, split) {
 			})
 		);
 
-		write(`${dirs.functions}/${name}.func/package.json`, JSON.stringify({ type: 'module' }));
+		write(`${dirs.functions}/${name}.func/package.json`, JSON.stringify({ type: 'commonjs' }));
 
 		routes.push({ src: pattern, dest: `/${name}` });
 	}
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.52",
+	"version": "1.0.0-next.53",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/create-svelte/CHANGELOG.md b/packages/create-svelte/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-svelte
 
+## 2.0.0-next.138
+
+### Patch Changes
+
+- Use separate ignore files for prettier and eslint ([#5009](https://github.com/sveltejs/kit/pull/5009))
+
 ## 2.0.0-next.137
 
 ### Patch Changes
diff --git a/packages/create-svelte/index.js b/packages/create-svelte/index.js
@@ -74,7 +74,7 @@ function write_common_files(cwd, options, name) {
 	pkg.devDependencies = sort_keys(pkg.devDependencies);
 	pkg.name = to_valid_package_name(name);
 
-	fs.writeFileSync(pkg_file, JSON.stringify(pkg, null, '  '));
+	fs.writeFileSync(pkg_file, JSON.stringify(pkg, null, '\t'));
 }
 
 /**
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.137",
+	"version": "2.0.0-next.138",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sveltejs/kit",
diff --git a/packages/create-svelte/shared/+eslint/.eslintignore b/packages/create-svelte/shared/+eslint/.eslintignore
@@ -8,7 +8,6 @@ node_modules
 !.env.example
 
 # Ignore files for PNPM, NPM and YARN
-package.json
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
diff --git a/packages/create-svelte/shared/+prettier/.prettierignore b/packages/create-svelte/shared/+prettier/.prettierignore
@@ -8,7 +8,6 @@ node_modules
 !.env.example
 
 # Ignore files for PNPM, NPM and YARN
-package.json
 pnpm-lock.yaml
 package-lock.json
 yarn.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"create-svelte": patch
 +---
++
 +correct default package.json format
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sveltejs/adapter-auto",`
`3`		`- "version": "1.0.0-next.43",`
	`3`	`+ "version": "1.0.0-next.44",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/sveltejs/kit",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sveltejs/adapter-vercel",`
`3`		`- "version": "1.0.0-next.52",`
	`3`	`+ "version": "1.0.0-next.53",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "https://github.com/sveltejs/kit",`