diff --git a/.changeset/calm-walls-happen.md b/.changeset/calm-walls-happen.md new file mode 100644 index 000000000000..d8b15df010d4 --- /dev/null +++ b/.changeset/calm-walls-happen.md @@ -0,0 +1,5 @@ +--- +'create-svelte': patch +--- + +Ensure template files match Prettier settings diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json index ee8abb17608b..1a1133dc63b1 100644 --- a/packages/create-svelte/package.json +++ b/packages/create-svelte/package.json @@ -20,11 +20,11 @@ "typescript": "^4.2.4" }, "scripts": { - "build": "node scripts/build-templates", + "build": "npm run format && node scripts/build-templates", "check": "tsc", "lint": "eslint --ignore-path .gitignore --ignore-path ../../.gitignore \"./*.js\" && npm run check-format", - "format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore --ignore-path ../../.gitignore", - "check-format": "prettier --check . --config ../../.prettierrc --ignore-path ../../.gitignore --ignore-path .gitignore", + "format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore --ignore-path ../../.gitignore --plugin prettier-plugin-svelte", + "check-format": "prettier --check . --config ../../.prettierrc --ignore-path ../../.gitignore --ignore-path .gitignore --plugin prettier-plugin-svelte", "prepublishOnly": "npm run build" }, "files": [ diff --git a/packages/create-svelte/scripts/build-templates.js b/packages/create-svelte/scripts/build-templates.js index 2459d62c4625..ae653acfdb14 100644 --- a/packages/create-svelte/scripts/build-templates.js +++ b/packages/create-svelte/scripts/build-templates.js @@ -78,7 +78,8 @@ async function generate_templates(shared) { parser: 'babel', useTabs: true, singleQuote: true, - trailingComma: 'none' + trailingComma: 'none', + printWidth: 100 }); js.push({ @@ -119,13 +120,13 @@ async function generate_templates(shared) { parser: 'babel', useTabs: true, singleQuote: true, - trailingComma: 'none' + trailingComma: 'none', + printWidth: 100 }) .trim() - .split('\n') - .join('\n\t'); + .replace(/^(.)/gm, '\t$1'); - return `\n\t${contents}\n`; + return `\n${contents}\n`; } ); diff --git a/packages/create-svelte/templates/default/src/lib/Counter/index.svelte b/packages/create-svelte/templates/default/src/lib/Counter/index.svelte index 01545aad7b66..0099731844e8 100644 --- a/packages/create-svelte/templates/default/src/lib/Counter/index.svelte +++ b/packages/create-svelte/templates/default/src/lib/Counter/index.svelte @@ -16,7 +16,7 @@
@@ -29,7 +29,7 @@
@@ -37,15 +37,11 @@