Remove empty package dirs (#2831)

* dont create empty dirs when packaging

* changeset

* explain what walk does

.changeset/odd-foxes-sing.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Don't create empty dirs when packaging

packages/kit/src/packaging/index.js

@@ -50,7 +50,14 @@ export async function make_package(config, cwd = process.cwd()) {
 		if (!config.kit.package.files(normalized)) {
 			const dts_file = (svelte_ext ? file : file.slice(0, -ext.length)) + '.d.ts';
 			const dts_path = path.join(abs_package_dir, dts_file);
-			if (fs.existsSync(dts_path)) fs.unlinkSync(dts_path);
+			if (fs.existsSync(dts_path)) {
+				fs.unlinkSync(dts_path);
+
+				const dir = path.dirname(dts_path);
+				if (fs.readdirSync(dir).length === 0) {
+					fs.rmdirSync(dir);
+				}
+			}
 			continue;
 		}
 

packages/kit/src/packaging/test/index.js

@@ -1,4 +1,4 @@
-import { readFileSync } from 'fs';
+import { statSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { fileURLToPath } from 'url';
 
@@ -24,8 +24,8 @@ async function test_make_package(path) {
 	try {
 		const config = await load_config({ cwd });
 		await make_package(config, cwd);
-		const expected_files = walk(ewd);
-		const actual_files = walk(pwd);
+		const expected_files = walk(ewd, true);
+		const actual_files = walk(pwd, true);
 		assert.equal(
 			actual_files.length,
 			expected_files.length,
@@ -35,14 +35,16 @@ async function test_make_package(path) {
 		);
 
 		for (const file of actual_files) {
-			assert.equal(expected_files.includes(file), true, `Did not expect ${file} in ${path}`);
-			const expected_content = format(file, readFileSync(join(ewd, file), 'utf-8'));
-			const actual_content = format(file, readFileSync(join(pwd, file), 'utf-8'));
-			assert.fixture(
-				actual_content,
-				expected_content,
-				`Expected equal file contents for ${file} in ${path}`
-			);
+			if (!statSync(join(pwd, file)).isDirectory()) {
+				assert.equal(expected_files.includes(file), true, `Did not expect ${file} in ${path}`);
+				const expected_content = format(file, readFileSync(join(ewd, file), 'utf-8'));
+				const actual_content = format(file, readFileSync(join(pwd, file), 'utf-8'));
+				assert.fixture(
+					actual_content,
+					expected_content,
+					`Expected equal file contents for ${file} in ${path}`
+				);
+			}
 		}
 	} finally {
 		rimraf(pwd);

packages/kit/src/utils/filesystem.js

@@ -41,8 +41,12 @@ export function copy(from, to, filter = () => true) {
 	return files;
 }
 
-/** @param {string} cwd */
-export function walk(cwd) {
+/**
+ * Get a list of all files in a directory
+ * @param {string} cwd - the directory to walk
+ * @param {boolean} [dirs] - whether to include directories in the result
+ */
+export function walk(cwd, dirs = false) {
 	/** @type {string[]} */
 	const all_files = [];
 
@@ -54,6 +58,7 @@ export function walk(cwd) {
 			const joined = path.join(dir, file);
 			const stats = fs.statSync(path.join(cwd, joined));
 			if (stats.isDirectory()) {
+				if (dirs) all_files.push(joined);
 				walk_dir(joined);
 			} else {
 				all_files.push(joined);