Skip to content

fix: Generated types no longer permanently delete themselves #5063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 24, 2022
Merged

fix: Generated types no longer permanently delete themselves #5063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e63681c
fix: sync no longer permanently deletes directory
elliott-with-the-longest-name-on-github May 24, 2022
27eb371
Changelog
elliott-with-the-longest-name-on-github May 24, 2022
5fc709b
DRY, you idiot
elliott-with-the-longest-name-on-github May 24, 2022
8a351a4
fix: Lint
elliott-with-the-longest-name-on-github May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/lemon-planets-sit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[fix] svelte-kit sync no longer permanently deletes the types directory
14 changes: 11 additions & 3 deletions packages/kit/src/core/sync/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,20 @@ const previous_contents = new Map();
*/
export function write_if_changed(file, code) {
if (code !== previous_contents.get(file)) {
previous_contents.set(file, code);
mkdirp(path.dirname(file));
fs.writeFileSync(file, code);
write(file, code);
}
}

/**
* @param {string} file
* @param {string} code
*/
export function write(file, code) {
previous_contents.set(file, code);
mkdirp(path.dirname(file));
fs.writeFileSync(file, code);
}

/** @param {string} str */
export function trim(str) {
const indentation = /** @type {RegExpExecArray} */ (/\n?(\s*)/.exec(str))[1];
Expand Down
7 changes: 2 additions & 5 deletions packages/kit/src/core/sync/write_types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { rimraf } from '../../utils/filesystem.js';
import { parse_route_id } from '../../utils/routing.js';
import { write_if_changed } from './utils.js';
import { write } from './utils.js';

/** @param {string} imports */
const header = (imports) => `
Expand Down Expand Up @@ -76,9 +76,6 @@ export function write_types(config, manifest_data) {
const parts = (key || 'index').split('/');
parts.push('__types', /** @type {string} */ (parts.pop()));

write_if_changed(
`${config.kit.outDir}/types/${parts.join('/')}.d.ts`,
content.join('\n').trim()
);
write(`${config.kit.outDir}/types/${parts.join('/')}.d.ts`, content.join('\n').trim());
});
}