adjust message, more robust export extraction, tests

Simon Holthausen · Simon Holthausen · commit afc798527166 · 2021-09-16T14:33:33.000+02:00
diff --git a/packages/kit/src/packaging/index.js b/packages/kit/src/packaging/index.js
@@ -112,19 +112,24 @@ export async function make_package(config, cwd = process.cwd()) {
 		// rely on the "svelte" property. Vite/Rollup/Webpack plugin can all deal with it.
 		// See https://github.com/sveltejs/kit/issues/1959 for more info and related threads.
 		if (pkg.exports['.']) {
-			const svelte_export = typeof pkg.exports['.'] === 'string' ? pkg.exports['.'] : undefined;
+			const svelte_export =
+				typeof pkg.exports['.'] === 'string'
+					? pkg.exports['.']
+					: pkg.exports['.'].import || pkg.exports['.'].default;
 			if (svelte_export) {
 				pkg.svelte = svelte_export;
 			} else {
 				console.warn(
-					'The "." entry in "exports" is not a string. ' +
+					'Cannot generate a "svelte" entry point because ' +
+						'the "." entry in "exports" is not a string. ' +
 						'If you set it by hand, please also set one of the options as a "svelte" entry point'
 				);
 			}
 		} else {
 			console.warn(
-				'The "." entry in "exports" is not a string. ' +
-					'If you set it by hand, please also set one of the options as a "svelte" entry point'
+				'Cannot generate a "svelte" entry point because ' +
+					'the "." entry in "exports" is missing. ' +
+					'Please specify one or set a "svelte" entry point yourself'
 			);
 		}
 	}
diff --git a/packages/kit/src/packaging/test/fixtures/exports-merge/expected/package.json b/packages/kit/src/packaging/test/fixtures/exports-merge/expected/package.json
@@ -16,5 +16,6 @@
 		"./Test": "./Test.svelte",
 		"./package.json": "./package.json"
 	},
-	"type": "module"
+	"type": "module",
+	"svelte": "./index.js"
 }
diff --git a/packages/kit/src/packaging/test/fixtures/exports-replace/expected/package.json b/packages/kit/src/packaging/test/fixtures/exports-replace/expected/package.json
@@ -8,5 +8,6 @@
 			"import": "./index.js"
 		},
 		"./package.json": "./package.json"
-	}
+	},
+	"svelte": "./Test.svelte"
 }
diff --git a/packages/kit/src/packaging/test/fixtures/exports-replace/package.json b/packages/kit/src/packaging/test/fixtures/exports-replace/package.json
@@ -7,5 +7,6 @@
 		".": {
 			"import": "./index.js"
 		}
-	}
+	},
+	"svelte": "./Test.svelte"
 }

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,6 @@`
`16`	`16`	`"./Test": "./Test.svelte",`
`17`	`17`	`"./package.json": "./package.json"`
`18`	`18`	`},`
`19`		`- "type": "module"`
	`19`	`+ "type": "module",`
	`20`	`+ "svelte": "./index.js"`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`"import": "./index.js"`
`9`	`9`	`},`
`10`	`10`	`"./package.json": "./package.json"`
`11`		`- }`
	`11`	`+ },`
	`12`	`+ "svelte": "./Test.svelte"`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@`
`7`	`7`	`".": {`
`8`	`8`	`"import": "./index.js"`
`9`	`9`	`}`
`10`		`- }`
	`10`	`+ },`
	`11`	`+ "svelte": "./Test.svelte"`
`11`	`12`	`}`