From 6167e753766cf90897025e89c60b073c6236ead1 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Mon, 1 Sep 2025 22:50:40 +0200
Subject: [PATCH 01/11] fix passing community option to addon

---
 packages/cli/commands/add/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/cli/commands/add/index.ts b/packages/cli/commands/add/index.ts
index 2439f7d1..3680d892 100644
--- a/packages/cli/commands/add/index.ts
+++ b/packages/cli/commands/add/index.ts
@@ -84,7 +84,8 @@ export const add = new Command('add')
 	.option('--no-git-check', 'even if some files are dirty, no prompt will be shown')
 	.option('--no-install', 'skip installing dependencies')
 	.addOption(installOption)
-	//.option('--community [add-on...]', 'community addons to install')
+	// TODO JYC: remove the flag
+	.option('--community [add-on...]', 'community addons to install')
 	.configureHelp({
 		...common.helpConfig,
 		formatHelp(cmd, helper) {
@@ -550,7 +551,7 @@ export async function runAddCommand(
 		workspace,
 		addonSetupResults,
 		addons: addonMap,
-		options: official
+		options: { ...official, ...community }
 	});
 
 	p.log.success('Successfully setup add-ons');

From 1433f8896d0ef28594007da23b5ba6c640ae9865 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Wed, 3 Sep 2025 20:46:18 +0200
Subject: [PATCH 02/11] git mv folder

---
 .../create/templates/addon}/.gitignore                            | 0
 .../create/templates/addon}/README.md                             | 0
 .../create/templates/addon}/jsconfig.json                         | 0
 .../create/templates/addon}/package.json                          | 0
 .../create/templates/addon}/src/index.js                          | 0
 .../create/templates/addon}/tests/custom-addon.test.ts            | 0
 .../create/templates/addon}/tests/fixtures/+page.svelte           | 0
 .../create/templates/addon}/tests/fixtures/App.svelte             | 0
 .../create/templates/addon}/tests/setup/global.ts                 | 0
 .../create/templates/addon}/tests/setup/suite.ts                  | 0
 .../create/templates/addon}/vitest.config.js                      | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename {community-addon-template => packages/create/templates/addon}/.gitignore (100%)
 rename {community-addon-template => packages/create/templates/addon}/README.md (100%)
 rename {community-addon-template => packages/create/templates/addon}/jsconfig.json (100%)
 rename {community-addon-template => packages/create/templates/addon}/package.json (100%)
 rename {community-addon-template => packages/create/templates/addon}/src/index.js (100%)
 rename {community-addon-template => packages/create/templates/addon}/tests/custom-addon.test.ts (100%)
 rename {community-addon-template => packages/create/templates/addon}/tests/fixtures/+page.svelte (100%)
 rename {community-addon-template => packages/create/templates/addon}/tests/fixtures/App.svelte (100%)
 rename {community-addon-template => packages/create/templates/addon}/tests/setup/global.ts (100%)
 rename {community-addon-template => packages/create/templates/addon}/tests/setup/suite.ts (100%)
 rename {community-addon-template => packages/create/templates/addon}/vitest.config.js (100%)

diff --git a/community-addon-template/.gitignore b/packages/create/templates/addon/.gitignore
similarity index 100%
rename from community-addon-template/.gitignore
rename to packages/create/templates/addon/.gitignore
diff --git a/community-addon-template/README.md b/packages/create/templates/addon/README.md
similarity index 100%
rename from community-addon-template/README.md
rename to packages/create/templates/addon/README.md
diff --git a/community-addon-template/jsconfig.json b/packages/create/templates/addon/jsconfig.json
similarity index 100%
rename from community-addon-template/jsconfig.json
rename to packages/create/templates/addon/jsconfig.json
diff --git a/community-addon-template/package.json b/packages/create/templates/addon/package.json
similarity index 100%
rename from community-addon-template/package.json
rename to packages/create/templates/addon/package.json
diff --git a/community-addon-template/src/index.js b/packages/create/templates/addon/src/index.js
similarity index 100%
rename from community-addon-template/src/index.js
rename to packages/create/templates/addon/src/index.js
diff --git a/community-addon-template/tests/custom-addon.test.ts b/packages/create/templates/addon/tests/custom-addon.test.ts
similarity index 100%
rename from community-addon-template/tests/custom-addon.test.ts
rename to packages/create/templates/addon/tests/custom-addon.test.ts
diff --git a/community-addon-template/tests/fixtures/+page.svelte b/packages/create/templates/addon/tests/fixtures/+page.svelte
similarity index 100%
rename from community-addon-template/tests/fixtures/+page.svelte
rename to packages/create/templates/addon/tests/fixtures/+page.svelte
diff --git a/community-addon-template/tests/fixtures/App.svelte b/packages/create/templates/addon/tests/fixtures/App.svelte
similarity index 100%
rename from community-addon-template/tests/fixtures/App.svelte
rename to packages/create/templates/addon/tests/fixtures/App.svelte
diff --git a/community-addon-template/tests/setup/global.ts b/packages/create/templates/addon/tests/setup/global.ts
similarity index 100%
rename from community-addon-template/tests/setup/global.ts
rename to packages/create/templates/addon/tests/setup/global.ts
diff --git a/community-addon-template/tests/setup/suite.ts b/packages/create/templates/addon/tests/setup/suite.ts
similarity index 100%
rename from community-addon-template/tests/setup/suite.ts
rename to packages/create/templates/addon/tests/setup/suite.ts
diff --git a/community-addon-template/vitest.config.js b/packages/create/templates/addon/vitest.config.js
similarity index 100%
rename from community-addon-template/vitest.config.js
rename to packages/create/templates/addon/vitest.config.js

From 15eadb1c4817f964d3c01f130af49115a011df28 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Wed, 3 Sep 2025 21:54:21 +0200
Subject: [PATCH 03/11] starting playing around

---
 .changeset/config.json                        |  2 +-
 .../docs/20-commands/10-sv-create.md          |  1 +
 eslint.config.js                              |  1 -
 packages/cli/commands/create.ts               |  6 +-
 packages/create/index.ts                      |  2 +-
 packages/create/scripts/build-templates.js    |  9 +++
 packages/create/shared/+addon/README.md       | 61 +++++++++++++++++++
 packages/create/templates/addon/.gitignore    | 27 +++++++-
 packages/create/templates/addon/.ignore       |  3 +
 packages/create/templates/addon/.meta.json    |  4 ++
 packages/create/templates/addon/README.md     | 17 +++---
 .../{package.json => package.template.json}   | 17 ++----
 pnpm-lock.yaml                                | 16 -----
 pnpm-workspace.yaml                           |  2 +-
 vitest.config.ts                              |  2 +-
 15 files changed, 126 insertions(+), 44 deletions(-)
 create mode 100644 packages/create/shared/+addon/README.md
 create mode 100644 packages/create/templates/addon/.ignore
 create mode 100644 packages/create/templates/addon/.meta.json
 rename packages/create/templates/addon/{package.json => package.template.json} (51%)

diff --git a/.changeset/config.json b/.changeset/config.json
index 9c12e3e3..8114d868 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -7,5 +7,5 @@
 	"access": "public",
 	"baseBranch": "main",
 	"updateInternalDependencies": "patch",
-	"ignore": [ "@sveltejs/*", "community-addon-template" ]
+	"ignore": [ "@sveltejs/*" ]
 }
diff --git a/documentation/docs/20-commands/10-sv-create.md b/documentation/docs/20-commands/10-sv-create.md
index fc4a4b93..9b0718f1 100644
--- a/documentation/docs/20-commands/10-sv-create.md
+++ b/documentation/docs/20-commands/10-sv-create.md
@@ -19,6 +19,7 @@ Which project template to use:
 - `minimal` — barebones scaffolding for your new app
 - `demo` — showcase app with a word guessing game that works without JavaScript
 - `library` — template for a Svelte library, set up with `svelte-package`
+- `add-on` — template for a community add-on, ready to be tested & published
 
 ### `--types <option>`
 
diff --git a/eslint.config.js b/eslint.config.js
index 8beb1895..ad573676 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -32,7 +32,6 @@ export default [
 			'**/dist/*',
 			'packages/**/tests/**/{output,input}.ts',
 			'rolldown.config.js',
-			'community-addon-template/tests/*'
 		]
 	}
 ];
diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts
index e1ea5a16..1a422b0d 100644
--- a/packages/cli/commands/create.ts
+++ b/packages/cli/commands/create.ts
@@ -141,8 +141,9 @@ async function createProject(cwd: ProjectPath, options: Options) {
 					options: templates.map((t) => ({ label: t.title, value: t.name, hint: t.description }))
 				});
 			},
-			language: () => {
+			language: (o) => {
 				if (options.types) return Promise.resolve(options.types);
+				if (o.results.template === 'addon') return Promise.resolve('none'); // TODO JYC
 				return p.select<LanguageType>({
 					message: 'Add type checking with TypeScript?',
 					initialValue: 'typescript',
@@ -180,7 +181,8 @@ async function createProject(cwd: ProjectPath, options: Options) {
 		if (packageManager) await installDependencies(packageManager, projectPath);
 	};
 
-	if (options.addOns) {
+	// TODO JYC: no add-ons for addon template
+	if (options.addOns && options.template !== 'addon') {
 		// `runAddCommand` includes installing dependencies
 		const { nextSteps, packageManager: pm } = await runAddCommand(
 			{
diff --git a/packages/create/index.ts b/packages/create/index.ts
index 7e92162f..878b9a97 100644
--- a/packages/create/index.ts
+++ b/packages/create/index.ts
@@ -5,7 +5,7 @@ import { mkdirp, copy, dist } from './utils.ts';
 export type TemplateType = (typeof templateTypes)[number];
 export type LanguageType = (typeof languageTypes)[number];
 
-const templateTypes = ['minimal', 'demo', 'library'] as const;
+const templateTypes = ['minimal', 'demo', 'library', 'addon'] as const;
 const languageTypes = ['typescript', 'checkjs', 'none'] as const;
 
 export type Options = {
diff --git a/packages/create/scripts/build-templates.js b/packages/create/scripts/build-templates.js
index dccdc8ec..eefdf30a 100644
--- a/packages/create/scripts/build-templates.js
+++ b/packages/create/scripts/build-templates.js
@@ -95,6 +95,15 @@ async function generate_templates(dist, shared) {
 				let contents = fs.readFileSync(path.join(cwd, name), 'utf8');
 				// TODO package-specific versions
 				contents = contents.replace(/workspace:\*/g, 'next');
+
+				// TODO JYC (maybe could be a dev mode and prod mode ?)
+				const pkg = JSON.parse(contents);
+				if (pkg.dependencies && pkg.dependencies['@sveltejs/cli-core'])
+					pkg.dependencies['@sveltejs/cli-core'] = 'file:../packages/core';
+				if (pkg.devDependencies && pkg.devDependencies['sv'])
+					pkg.devDependencies['sv'] = 'file:../packages/cli';
+				contents = JSON.stringify(pkg, null, '\t');
+
 				fs.writeFileSync(path.join(dir, 'package.json'), contents);
 				continue;
 			}
diff --git a/packages/create/shared/+addon/README.md b/packages/create/shared/+addon/README.md
new file mode 100644
index 00000000..89ac1a5b
--- /dev/null
+++ b/packages/create/shared/+addon/README.md
@@ -0,0 +1,61 @@
+# sv community addon
+
+> [!IMPORTANT]
+> Community add-ons are currently not supported. Please see [#184](https://github.com/sveltejs/cli/issues/184) for details.
+
+> [!IMPORTANT]
+> This template's dependencies may not be up-to-date; be sure to update them to the latest!
+
+> If you get stuck, check out the [implementations of official add-ons](https://github.com/sveltejs/cli/tree/main/packages/addons).
+
+sv community addon [`sv`](https://github.com/sveltejs/cli).
+
+## Create a new add-on
+
+Use [`sv`](https://github.com/sveltejs/cli) itself!
+
+```shell
+npx sv@latest create addon
+```
+
+## Using the add-on
+
+To run the add-on, we'll first need a project to apply it to.
+
+Create the project with the following script:
+
+```shell
+npm run create
+```
+
+This will create a SvelteKit project in the `temp` directory.
+
+To execute the add-on, run:
+
+```shell
+npm run add
+```
+
+## Sharing your add-on
+
+When you're ready to publish your add-on to npm, run:
+
+```shell
+npm publish
+```
+
+Your published add-on can now be used by anyone!
+
+To execute the newly published package with `sv`, run:
+
+```shell
+npx sv add npm:addon-package-name
+```
+
+TODO JYC: we still want this ?
+
+After that, feel free to open a pull request to [`sv`](https://github.com/sveltejs/cli) and add your add-on to the [community list](/community-addons/).
+
+## Things to be aware of
+
+Community add-ons are **not permitted** to have any external dependencies outside of `@sveltejs/cli-core`. If the use of a dependency is absolutely necessary, then they can be bundled using a bundler of your choosing (e.g. Rollup, Rolldown, tsup, etc.).
diff --git a/packages/create/templates/addon/.gitignore b/packages/create/templates/addon/.gitignore
index a9e1699a..3a0c733d 100644
--- a/packages/create/templates/addon/.gitignore
+++ b/packages/create/templates/addon/.gitignore
@@ -1,4 +1,27 @@
 node_modules
 temp
-.outputs
-.test-output
+
+# Output
+.output
+.vercel
+.netlify
+.wrangler
+/.svelte-kit
+/build
+/dist
+temp
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Env
+.env
+.env.*
+!.env.example
+!.env.test
+
+# Vite
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
+
diff --git a/packages/create/templates/addon/.ignore b/packages/create/templates/addon/.ignore
new file mode 100644
index 00000000..449d6440
--- /dev/null
+++ b/packages/create/templates/addon/.ignore
@@ -0,0 +1,3 @@
+package.json
+.meta.json
+.turbo
\ No newline at end of file
diff --git a/packages/create/templates/addon/.meta.json b/packages/create/templates/addon/.meta.json
new file mode 100644
index 00000000..ca10b19a
--- /dev/null
+++ b/packages/create/templates/addon/.meta.json
@@ -0,0 +1,4 @@
+{
+	"title": "sv community add-on",
+	"description": "scaffolding an empty community add-on, ready to be tested and published"
+}
diff --git a/packages/create/templates/addon/README.md b/packages/create/templates/addon/README.md
index 0d48cd78..480e3ff6 100644
--- a/packages/create/templates/addon/README.md
+++ b/packages/create/templates/addon/README.md
@@ -1,20 +1,21 @@
-# community-addon-template
+# sv community addon
 
 > [!IMPORTANT]
 > Community add-ons are currently not supported. Please see [#184](https://github.com/sveltejs/cli/issues/184) for details.
 
 > [!IMPORTANT]
 > This template's dependencies may not be up-to-date; be sure to update them to the latest!
-> If you get stuck, check out the [implementations of official add-ons](https://github.com/sveltejs/cli/tree/main/packages/add-ons).
 
-The add-on template for community add-ons for [`sv`](https://github.com/sveltejs/cli).
+> If you get stuck, check out the [implementations of official add-ons](https://github.com/sveltejs/cli/tree/main/packages/addons).
 
-## Cloning the template
+sv community addon [`sv`](https://github.com/sveltejs/cli).
 
-Use [`degit`](https://github.com/Rich-Harris/degit) to clone the template:
+## Create a new add-on
+
+Use [`sv`](https://github.com/sveltejs/cli) itself!
 
 ```shell
-npx degit sveltejs/cli/community-addon-template addon-name
+npx sv@latest create addon
 ```
 
 ## Using the add-on
@@ -48,9 +49,11 @@ Your published add-on can now be used by anyone!
 To execute the newly published package with `sv`, run:
 
 ```shell
-npx sv add --community npm:addon-package-name
+npx sv add npm:addon-package-name
 ```
 
+TODO JYC: we still want this ?
+
 After that, feel free to open a pull request to [`sv`](https://github.com/sveltejs/cli) and add your add-on to the [community list](/community-addons/).
 
 ## Things to be aware of
diff --git a/packages/create/templates/addon/package.json b/packages/create/templates/addon/package.template.json
similarity index 51%
rename from packages/create/templates/addon/package.json
rename to packages/create/templates/addon/package.template.json
index e69890a6..322c3a50 100644
--- a/packages/create/templates/addon/package.json
+++ b/packages/create/templates/addon/package.template.json
@@ -1,18 +1,14 @@
 {
-	"name": "community-addon-template",
-	"private": true,
+	"name": "~TODO~",
 	"version": "0.0.0",
 	"type": "module",
 	"license": "MIT",
 	"scripts": {
-		"create-temp": "sv create temp --types ts --template minimal --no-add-ons --no-install",
-		"start": "sv add -C temp --community file:../",
+		"create": "sv create temp --types ts --template minimal --no-add-ons --no-install",
+		"add": "sv add -C temp --community file:../ --no-git-check --no-install",
 		"test": "vitest run"
 	},
-	"files": [
-		"src",
-		"!src/**/*.test.*"
-	],
+	"files": ["src", "!src/**/*.test.*"],
 	"exports": "./src/index.js",
 	"dependencies": {
 		"@sveltejs/cli-core": "workspace:*"
@@ -22,8 +18,5 @@
 		"sv": "workspace:*",
 		"vitest": "4.0.0-beta.6"
 	},
-	"keywords": [
-		"svelte-add-on",
-		"sv"
-	]
+	"keywords": ["svelte-add-on", "sv", "sv-add-on"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 49db2550..1296035a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -69,22 +69,6 @@ importers:
         specifier: 4.0.0-beta.6
         version: 4.0.0-beta.6(@types/node@22.15.32)(@vitest/ui@4.0.0-beta.6)
 
-  community-addon-template:
-    dependencies:
-      '@sveltejs/cli-core':
-        specifier: workspace:*
-        version: link:../packages/core
-    devDependencies:
-      '@playwright/test':
-        specifier: ^1.53.1
-        version: 1.53.1
-      sv:
-        specifier: workspace:*
-        version: link:../packages/cli
-      vitest:
-        specifier: 4.0.0-beta.6
-        version: 4.0.0-beta.6(@types/node@22.15.32)(@vitest/ui@4.0.0-beta.6)
-
   packages/addons:
     dependencies:
       '@sveltejs/cli-core':
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 86c4b35e..7f6c07d5 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,4 +1,4 @@
 packages:
   - 'packages/*'
-  - 'community-addon-template'
   - '!.test-tmp/**'
+  - 'temp'
diff --git a/vitest.config.ts b/vitest.config.ts
index d69d95e4..41cf36e3 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,6 +2,6 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
 	test: {
-		projects: ['packages/*', 'community-addon-template']
+		projects: ['packages/*']
 	}
 });

From fbdd897c5e57468be8e257ff2063bcd30fb9fe07 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Wed, 3 Sep 2025 21:56:25 +0200
Subject: [PATCH 04/11] re rename

---
 packages/cli/commands/create.ts                             | 6 +++---
 packages/create/index.ts                                    | 2 +-
 packages/create/templates/{addon => add-on}/.gitignore      | 0
 packages/create/templates/{addon => add-on}/.ignore         | 0
 packages/create/templates/{addon => add-on}/.meta.json      | 0
 packages/create/templates/{addon => add-on}/README.md       | 0
 packages/create/templates/{addon => add-on}/jsconfig.json   | 0
 .../templates/{addon => add-on}/package.template.json       | 0
 packages/create/templates/{addon => add-on}/src/index.js    | 0
 .../templates/{addon => add-on}/tests/custom-addon.test.ts  | 0
 .../templates/{addon => add-on}/tests/fixtures/+page.svelte | 0
 .../templates/{addon => add-on}/tests/fixtures/App.svelte   | 0
 .../templates/{addon => add-on}/tests/setup/global.ts       | 0
 .../create/templates/{addon => add-on}/tests/setup/suite.ts | 0
 .../create/templates/{addon => add-on}/vitest.config.js     | 0
 15 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/create/templates/{addon => add-on}/.gitignore (100%)
 rename packages/create/templates/{addon => add-on}/.ignore (100%)
 rename packages/create/templates/{addon => add-on}/.meta.json (100%)
 rename packages/create/templates/{addon => add-on}/README.md (100%)
 rename packages/create/templates/{addon => add-on}/jsconfig.json (100%)
 rename packages/create/templates/{addon => add-on}/package.template.json (100%)
 rename packages/create/templates/{addon => add-on}/src/index.js (100%)
 rename packages/create/templates/{addon => add-on}/tests/custom-addon.test.ts (100%)
 rename packages/create/templates/{addon => add-on}/tests/fixtures/+page.svelte (100%)
 rename packages/create/templates/{addon => add-on}/tests/fixtures/App.svelte (100%)
 rename packages/create/templates/{addon => add-on}/tests/setup/global.ts (100%)
 rename packages/create/templates/{addon => add-on}/tests/setup/suite.ts (100%)
 rename packages/create/templates/{addon => add-on}/vitest.config.js (100%)

diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts
index 1a422b0d..88da6a56 100644
--- a/packages/cli/commands/create.ts
+++ b/packages/cli/commands/create.ts
@@ -143,7 +143,7 @@ async function createProject(cwd: ProjectPath, options: Options) {
 			},
 			language: (o) => {
 				if (options.types) return Promise.resolve(options.types);
-				if (o.results.template === 'addon') return Promise.resolve('none'); // TODO JYC
+				if (o.results.template === 'add-on') return Promise.resolve('none'); // TODO JYC
 				return p.select<LanguageType>({
 					message: 'Add type checking with TypeScript?',
 					initialValue: 'typescript',
@@ -167,7 +167,7 @@ async function createProject(cwd: ProjectPath, options: Options) {
 	createKit(projectPath, {
 		name: path.basename(projectPath),
 		template,
-		types: language
+		types: language as LanguageType // TODO JYC not sure why?!
 	});
 
 	p.log.success('Project created');
@@ -182,7 +182,7 @@ async function createProject(cwd: ProjectPath, options: Options) {
 	};
 
 	// TODO JYC: no add-ons for addon template
-	if (options.addOns && options.template !== 'addon') {
+	if (options.addOns && options.template !== 'add-on') {
 		// `runAddCommand` includes installing dependencies
 		const { nextSteps, packageManager: pm } = await runAddCommand(
 			{
diff --git a/packages/create/index.ts b/packages/create/index.ts
index 878b9a97..00785eab 100644
--- a/packages/create/index.ts
+++ b/packages/create/index.ts
@@ -5,7 +5,7 @@ import { mkdirp, copy, dist } from './utils.ts';
 export type TemplateType = (typeof templateTypes)[number];
 export type LanguageType = (typeof languageTypes)[number];
 
-const templateTypes = ['minimal', 'demo', 'library', 'addon'] as const;
+const templateTypes = ['minimal', 'demo', 'library', 'add-on'] as const;
 const languageTypes = ['typescript', 'checkjs', 'none'] as const;
 
 export type Options = {
diff --git a/packages/create/templates/addon/.gitignore b/packages/create/templates/add-on/.gitignore
similarity index 100%
rename from packages/create/templates/addon/.gitignore
rename to packages/create/templates/add-on/.gitignore
diff --git a/packages/create/templates/addon/.ignore b/packages/create/templates/add-on/.ignore
similarity index 100%
rename from packages/create/templates/addon/.ignore
rename to packages/create/templates/add-on/.ignore
diff --git a/packages/create/templates/addon/.meta.json b/packages/create/templates/add-on/.meta.json
similarity index 100%
rename from packages/create/templates/addon/.meta.json
rename to packages/create/templates/add-on/.meta.json
diff --git a/packages/create/templates/addon/README.md b/packages/create/templates/add-on/README.md
similarity index 100%
rename from packages/create/templates/addon/README.md
rename to packages/create/templates/add-on/README.md
diff --git a/packages/create/templates/addon/jsconfig.json b/packages/create/templates/add-on/jsconfig.json
similarity index 100%
rename from packages/create/templates/addon/jsconfig.json
rename to packages/create/templates/add-on/jsconfig.json
diff --git a/packages/create/templates/addon/package.template.json b/packages/create/templates/add-on/package.template.json
similarity index 100%
rename from packages/create/templates/addon/package.template.json
rename to packages/create/templates/add-on/package.template.json
diff --git a/packages/create/templates/addon/src/index.js b/packages/create/templates/add-on/src/index.js
similarity index 100%
rename from packages/create/templates/addon/src/index.js
rename to packages/create/templates/add-on/src/index.js
diff --git a/packages/create/templates/addon/tests/custom-addon.test.ts b/packages/create/templates/add-on/tests/custom-addon.test.ts
similarity index 100%
rename from packages/create/templates/addon/tests/custom-addon.test.ts
rename to packages/create/templates/add-on/tests/custom-addon.test.ts
diff --git a/packages/create/templates/addon/tests/fixtures/+page.svelte b/packages/create/templates/add-on/tests/fixtures/+page.svelte
similarity index 100%
rename from packages/create/templates/addon/tests/fixtures/+page.svelte
rename to packages/create/templates/add-on/tests/fixtures/+page.svelte
diff --git a/packages/create/templates/addon/tests/fixtures/App.svelte b/packages/create/templates/add-on/tests/fixtures/App.svelte
similarity index 100%
rename from packages/create/templates/addon/tests/fixtures/App.svelte
rename to packages/create/templates/add-on/tests/fixtures/App.svelte
diff --git a/packages/create/templates/addon/tests/setup/global.ts b/packages/create/templates/add-on/tests/setup/global.ts
similarity index 100%
rename from packages/create/templates/addon/tests/setup/global.ts
rename to packages/create/templates/add-on/tests/setup/global.ts
diff --git a/packages/create/templates/addon/tests/setup/suite.ts b/packages/create/templates/add-on/tests/setup/suite.ts
similarity index 100%
rename from packages/create/templates/addon/tests/setup/suite.ts
rename to packages/create/templates/add-on/tests/setup/suite.ts
diff --git a/packages/create/templates/addon/vitest.config.js b/packages/create/templates/add-on/vitest.config.js
similarity index 100%
rename from packages/create/templates/addon/vitest.config.js
rename to packages/create/templates/add-on/vitest.config.js

From bcc2f2f0a1875bd7e4d4a26467067c0b4762a45d Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Wed, 3 Sep 2025 22:27:53 +0200
Subject: [PATCH 05/11] re rename

---
 .gitignore                                    |  2 +-
 packages/create/index.ts                      |  2 +-
 packages/create/shared/+addon/README.md       | 20 ++----
 packages/create/templates/add-on/.gitignore   |  3 +-
 packages/create/templates/add-on/README.md    | 61 -------------------
 .../templates/add-on/package.template.json    |  4 +-
 packages/create/templates/add-on/src/index.js | 21 ++++---
 7 files changed, 22 insertions(+), 91 deletions(-)
 delete mode 100644 packages/create/templates/add-on/README.md

diff --git a/.gitignore b/.gitignore
index c55b8881..bb6c2737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ temp/
 package-lock.json
 yarn.lock
 vite.config.js.timestamp-*
-.test-output
+.test-output
\ No newline at end of file
diff --git a/packages/create/index.ts b/packages/create/index.ts
index 00785eab..878b9a97 100644
--- a/packages/create/index.ts
+++ b/packages/create/index.ts
@@ -5,7 +5,7 @@ import { mkdirp, copy, dist } from './utils.ts';
 export type TemplateType = (typeof templateTypes)[number];
 export type LanguageType = (typeof languageTypes)[number];
 
-const templateTypes = ['minimal', 'demo', 'library', 'add-on'] as const;
+const templateTypes = ['minimal', 'demo', 'library', 'addon'] as const;
 const languageTypes = ['typescript', 'checkjs', 'none'] as const;
 
 export type Options = {
diff --git a/packages/create/shared/+addon/README.md b/packages/create/shared/+addon/README.md
index 89ac1a5b..55fcd4fd 100644
--- a/packages/create/shared/+addon/README.md
+++ b/packages/create/shared/+addon/README.md
@@ -1,4 +1,4 @@
-# sv community addon
+# sv community addon: ~TODO~
 
 > [!IMPORTANT]
 > Community add-ons are currently not supported. Please see [#184](https://github.com/sveltejs/cli/issues/184) for details.
@@ -8,15 +8,7 @@
 
 > If you get stuck, check out the [implementations of official add-ons](https://github.com/sveltejs/cli/tree/main/packages/addons).
 
-sv community addon [`sv`](https://github.com/sveltejs/cli).
-
-## Create a new add-on
-
-Use [`sv`](https://github.com/sveltejs/cli) itself!
-
-```shell
-npx sv@latest create addon
-```
+created with [`sv`](https://svelte.dev/docs/cli/sv-create#Options-template-name).
 
 ## Using the add-on
 
@@ -28,7 +20,7 @@ Create the project with the following script:
 npm run create
 ```
 
-This will create a SvelteKit project in the `temp` directory.
+This will create a SvelteKit project in the `testing` directory.
 
 To execute the add-on, run:
 
@@ -49,13 +41,9 @@ Your published add-on can now be used by anyone!
 To execute the newly published package with `sv`, run:
 
 ```shell
-npx sv add npm:addon-package-name
+npx sv add npm:---SV-COMMUNITY-ADDON-NAME---
 ```
 
-TODO JYC: we still want this ?
-
-After that, feel free to open a pull request to [`sv`](https://github.com/sveltejs/cli) and add your add-on to the [community list](/community-addons/).
-
 ## Things to be aware of
 
 Community add-ons are **not permitted** to have any external dependencies outside of `@sveltejs/cli-core`. If the use of a dependency is absolutely necessary, then they can be bundled using a bundler of your choosing (e.g. Rollup, Rolldown, tsup, etc.).
diff --git a/packages/create/templates/add-on/.gitignore b/packages/create/templates/add-on/.gitignore
index 3a0c733d..214c7bf6 100644
--- a/packages/create/templates/add-on/.gitignore
+++ b/packages/create/templates/add-on/.gitignore
@@ -1,5 +1,5 @@
 node_modules
-temp
+testing/
 
 # Output
 .output
@@ -9,7 +9,6 @@ temp
 /.svelte-kit
 /build
 /dist
-temp
 
 # OS
 .DS_Store
diff --git a/packages/create/templates/add-on/README.md b/packages/create/templates/add-on/README.md
deleted file mode 100644
index 480e3ff6..00000000
--- a/packages/create/templates/add-on/README.md
+++ /dev/null
@@ -1,61 +0,0 @@
-# sv community addon
-
-> [!IMPORTANT]
-> Community add-ons are currently not supported. Please see [#184](https://github.com/sveltejs/cli/issues/184) for details.
-
-> [!IMPORTANT]
-> This template's dependencies may not be up-to-date; be sure to update them to the latest!
-
-> If you get stuck, check out the [implementations of official add-ons](https://github.com/sveltejs/cli/tree/main/packages/addons).
-
-sv community addon [`sv`](https://github.com/sveltejs/cli).
-
-## Create a new add-on
-
-Use [`sv`](https://github.com/sveltejs/cli) itself!
-
-```shell
-npx sv@latest create addon
-```
-
-## Using the add-on
-
-To run the add-on, we'll first need a project to apply it to.
-
-Create the project with the following script:
-
-```shell
-npm run create-temp
-```
-
-This will create a SvelteKit project in the `temp` directory.
-
-To execute the add-on, run:
-
-```shell
-npm start
-```
-
-## Sharing your add-on
-
-When you're ready to publish your add-on to npm, run:
-
-```shell
-npm publish
-```
-
-Your published add-on can now be used by anyone!
-
-To execute the newly published package with `sv`, run:
-
-```shell
-npx sv add npm:addon-package-name
-```
-
-TODO JYC: we still want this ?
-
-After that, feel free to open a pull request to [`sv`](https://github.com/sveltejs/cli) and add your add-on to the [community list](/community-addons/).
-
-## Things to be aware of
-
-Community add-ons are **not permitted** to have any external dependencies outside of `@sveltejs/cli-core`. If the use of a dependency is absolutely necessary, then they can be bundled using a bundler of your choosing (e.g. Rollup, Rolldown, tsup, etc.).
diff --git a/packages/create/templates/add-on/package.template.json b/packages/create/templates/add-on/package.template.json
index 322c3a50..8f4b8a98 100644
--- a/packages/create/templates/add-on/package.template.json
+++ b/packages/create/templates/add-on/package.template.json
@@ -4,8 +4,8 @@
 	"type": "module",
 	"license": "MIT",
 	"scripts": {
-		"create": "sv create temp --types ts --template minimal --no-add-ons --no-install",
-		"add": "sv add -C temp --community file:../ --no-git-check --no-install",
+		"create": "sv create testing --types ts --template minimal --no-add-ons",
+		"add": "sv add -C testing --community file:../ --no-git-check",
 		"test": "vitest run"
 	},
 	"files": ["src", "!src/**/*.test.*"],
diff --git a/packages/create/templates/add-on/src/index.js b/packages/create/templates/add-on/src/index.js
index 1190d7e3..35b0679c 100644
--- a/packages/create/templates/add-on/src/index.js
+++ b/packages/create/templates/add-on/src/index.js
@@ -6,7 +6,7 @@ export const options = defineAddonOptions({
 	demo: {
 		question: 'Do you want to use a demo?',
 		type: 'boolean',
-		default: false
+		default: true
 	}
 });
 
@@ -17,18 +17,23 @@ export default defineAddon({
 		if (!kit) unsupported('Requires SvelteKit');
 	},
 	run: ({ sv, options, typescript }) => {
-		sv.file('addon-template-demo.txt', (content) => {
-			if (options.demo) {
-				return 'This is a text file made by the Community Addon Template demo!';
-			}
-			return content;
+		sv.file('src/lib/add-on/addon-template-demo.txt', (content) => {
+			if (!options.demo) return content;
+			return 'This is a text file made by the Community Addon Template demo!';
 		});
 
-		sv.file('src/DemoComponent.svelte', (content) => {
+		sv.file('src/lib/add-on/DemoComponent.svelte', (content) => {
 			if (!options.demo) return content;
 			const { script, generateCode } = parseSvelte(content, { typescript });
-			imports.addDefault(script.ast, { from: '../addon-template-demo.txt?raw', as: 'demo' });
+			imports.addDefault(script.ast, { from: './addon-template-demo.txt?raw', as: 'demo' });
 			return generateCode({ script: script.generateCode(), template: '{demo}' });
 		});
+
+		sv.file('src/routes/+page.svelte', (content) => {
+			if (!options.demo) return content;
+			const { script, generateCode, template } = parseSvelte(content, { typescript });
+			imports.addDefault(script.ast, { from: '$lib/add-on/DemoComponent.svelte', as: 'DemoComponent' });
+			return generateCode({ script: script.generateCode(), template: template.generateCode() + '\n\n<DemoComponent />' });
+		});
 	}
 });

From 70fddf1c51095e48c4a3b322bd44e89f7df25b58 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Wed, 3 Sep 2025 22:27:58 +0200
Subject: [PATCH 06/11] re rename

---
 packages/create/templates/{add-on => addon}/.gitignore            | 0
 packages/create/templates/{add-on => addon}/.ignore               | 0
 packages/create/templates/{add-on => addon}/.meta.json            | 0
 packages/create/templates/{add-on => addon}/jsconfig.json         | 0
 packages/create/templates/{add-on => addon}/package.template.json | 0
 packages/create/templates/{add-on => addon}/src/index.js          | 0
 .../create/templates/{add-on => addon}/tests/custom-addon.test.ts | 0
 .../templates/{add-on => addon}/tests/fixtures/+page.svelte       | 0
 .../create/templates/{add-on => addon}/tests/fixtures/App.svelte  | 0
 packages/create/templates/{add-on => addon}/tests/setup/global.ts | 0
 packages/create/templates/{add-on => addon}/tests/setup/suite.ts  | 0
 packages/create/templates/{add-on => addon}/vitest.config.js      | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/create/templates/{add-on => addon}/.gitignore (100%)
 rename packages/create/templates/{add-on => addon}/.ignore (100%)
 rename packages/create/templates/{add-on => addon}/.meta.json (100%)
 rename packages/create/templates/{add-on => addon}/jsconfig.json (100%)
 rename packages/create/templates/{add-on => addon}/package.template.json (100%)
 rename packages/create/templates/{add-on => addon}/src/index.js (100%)
 rename packages/create/templates/{add-on => addon}/tests/custom-addon.test.ts (100%)
 rename packages/create/templates/{add-on => addon}/tests/fixtures/+page.svelte (100%)
 rename packages/create/templates/{add-on => addon}/tests/fixtures/App.svelte (100%)
 rename packages/create/templates/{add-on => addon}/tests/setup/global.ts (100%)
 rename packages/create/templates/{add-on => addon}/tests/setup/suite.ts (100%)
 rename packages/create/templates/{add-on => addon}/vitest.config.js (100%)

diff --git a/packages/create/templates/add-on/.gitignore b/packages/create/templates/addon/.gitignore
similarity index 100%
rename from packages/create/templates/add-on/.gitignore
rename to packages/create/templates/addon/.gitignore
diff --git a/packages/create/templates/add-on/.ignore b/packages/create/templates/addon/.ignore
similarity index 100%
rename from packages/create/templates/add-on/.ignore
rename to packages/create/templates/addon/.ignore
diff --git a/packages/create/templates/add-on/.meta.json b/packages/create/templates/addon/.meta.json
similarity index 100%
rename from packages/create/templates/add-on/.meta.json
rename to packages/create/templates/addon/.meta.json
diff --git a/packages/create/templates/add-on/jsconfig.json b/packages/create/templates/addon/jsconfig.json
similarity index 100%
rename from packages/create/templates/add-on/jsconfig.json
rename to packages/create/templates/addon/jsconfig.json
diff --git a/packages/create/templates/add-on/package.template.json b/packages/create/templates/addon/package.template.json
similarity index 100%
rename from packages/create/templates/add-on/package.template.json
rename to packages/create/templates/addon/package.template.json
diff --git a/packages/create/templates/add-on/src/index.js b/packages/create/templates/addon/src/index.js
similarity index 100%
rename from packages/create/templates/add-on/src/index.js
rename to packages/create/templates/addon/src/index.js
diff --git a/packages/create/templates/add-on/tests/custom-addon.test.ts b/packages/create/templates/addon/tests/custom-addon.test.ts
similarity index 100%
rename from packages/create/templates/add-on/tests/custom-addon.test.ts
rename to packages/create/templates/addon/tests/custom-addon.test.ts
diff --git a/packages/create/templates/add-on/tests/fixtures/+page.svelte b/packages/create/templates/addon/tests/fixtures/+page.svelte
similarity index 100%
rename from packages/create/templates/add-on/tests/fixtures/+page.svelte
rename to packages/create/templates/addon/tests/fixtures/+page.svelte
diff --git a/packages/create/templates/add-on/tests/fixtures/App.svelte b/packages/create/templates/addon/tests/fixtures/App.svelte
similarity index 100%
rename from packages/create/templates/add-on/tests/fixtures/App.svelte
rename to packages/create/templates/addon/tests/fixtures/App.svelte
diff --git a/packages/create/templates/add-on/tests/setup/global.ts b/packages/create/templates/addon/tests/setup/global.ts
similarity index 100%
rename from packages/create/templates/add-on/tests/setup/global.ts
rename to packages/create/templates/addon/tests/setup/global.ts
diff --git a/packages/create/templates/add-on/tests/setup/suite.ts b/packages/create/templates/addon/tests/setup/suite.ts
similarity index 100%
rename from packages/create/templates/add-on/tests/setup/suite.ts
rename to packages/create/templates/addon/tests/setup/suite.ts
diff --git a/packages/create/templates/add-on/vitest.config.js b/packages/create/templates/addon/vitest.config.js
similarity index 100%
rename from packages/create/templates/add-on/vitest.config.js
rename to packages/create/templates/addon/vitest.config.js

From 01b074d8d37d7076d41f6425796b81510b7aa315 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Wed, 3 Sep 2025 22:55:03 +0200
Subject: [PATCH 07/11] yeah

---
 .gitignore                                              | 3 ++-
 packages/cli/commands/create.ts                         | 2 +-
 packages/create/index.ts                                | 4 ++--
 packages/create/shared/+addon/README.md                 | 4 ++--
 packages/create/templates/addon/package.template.json   | 6 +++---
 packages/create/templates/addon/src/index.js            | 2 +-
 packages/create/templates/demo/package.template.json    | 2 +-
 packages/create/templates/library/package.template.json | 2 +-
 packages/create/templates/minimal/package.template.json | 2 +-
 9 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb6c2737..cb380cd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ temp/
 package-lock.json
 yarn.lock
 vite.config.js.timestamp-*
-.test-output
\ No newline at end of file
+.test-output
+new-add-on/
\ No newline at end of file
diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts
index 88da6a56..16039ecb 100644
--- a/packages/cli/commands/create.ts
+++ b/packages/cli/commands/create.ts
@@ -143,7 +143,7 @@ async function createProject(cwd: ProjectPath, options: Options) {
 			},
 			language: (o) => {
 				if (options.types) return Promise.resolve(options.types);
-				if (o.results.template === 'add-on') return Promise.resolve('none'); // TODO JYC
+				if (o.results.template === 'addon') return Promise.resolve('none'); // TODO JYC
 				return p.select<LanguageType>({
 					message: 'Add type checking with TypeScript?',
 					initialValue: 'typescript',
diff --git a/packages/create/index.ts b/packages/create/index.ts
index 878b9a97..e03b8422 100644
--- a/packages/create/index.ts
+++ b/packages/create/index.ts
@@ -61,7 +61,7 @@ function write_template_files(template: string, types: LanguageType, name: strin
 		const dest = path.join(cwd, file.name);
 		mkdirp(path.dirname(dest));
 
-		fs.writeFileSync(dest, file.contents.replace(/~TODO~/g, name));
+		fs.writeFileSync(dest, file.contents.replace(/~SV-NAME-TODO~/g, name));
 	});
 }
 
@@ -84,7 +84,7 @@ function write_common_files(cwd: string, options: Options, name: string) {
 		} else {
 			const dest = path.join(cwd, file.name);
 			mkdirp(path.dirname(dest));
-			fs.writeFileSync(dest, file.contents);
+			fs.writeFileSync(dest, file.contents.replace(/~SV-NAME-TODO~/g, name));
 		}
 	});
 
diff --git a/packages/create/shared/+addon/README.md b/packages/create/shared/+addon/README.md
index 55fcd4fd..f4569547 100644
--- a/packages/create/shared/+addon/README.md
+++ b/packages/create/shared/+addon/README.md
@@ -1,4 +1,4 @@
-# sv community addon: ~TODO~
+# sv community addon: ~SV-NAME-TODO~
 
 > [!IMPORTANT]
 > Community add-ons are currently not supported. Please see [#184](https://github.com/sveltejs/cli/issues/184) for details.
@@ -41,7 +41,7 @@ Your published add-on can now be used by anyone!
 To execute the newly published package with `sv`, run:
 
 ```shell
-npx sv add npm:---SV-COMMUNITY-ADDON-NAME---
+npx sv add npm:~SV-NAME-TODO~
 ```
 
 ## Things to be aware of
diff --git a/packages/create/templates/addon/package.template.json b/packages/create/templates/addon/package.template.json
index 8f4b8a98..71b07b4e 100644
--- a/packages/create/templates/addon/package.template.json
+++ b/packages/create/templates/addon/package.template.json
@@ -1,11 +1,11 @@
 {
-	"name": "~TODO~",
+	"name": "~SV-NAME-TODO~",
 	"version": "0.0.0",
 	"type": "module",
 	"license": "MIT",
 	"scripts": {
-		"create": "sv create testing --types ts --template minimal --no-add-ons",
-		"add": "sv add -C testing --community file:../ --no-git-check",
+		"create": "sv create demo --types ts --template minimal --no-add-ons",
+		"add": "sv add -C demo --community file:../ --no-git-check",
 		"test": "vitest run"
 	},
 	"files": ["src", "!src/**/*.test.*"],
diff --git a/packages/create/templates/addon/src/index.js b/packages/create/templates/addon/src/index.js
index 35b0679c..4bfc8b14 100644
--- a/packages/create/templates/addon/src/index.js
+++ b/packages/create/templates/addon/src/index.js
@@ -19,7 +19,7 @@ export default defineAddon({
 	run: ({ sv, options, typescript }) => {
 		sv.file('src/lib/add-on/addon-template-demo.txt', (content) => {
 			if (!options.demo) return content;
-			return 'This is a text file made by the Community Addon Template demo!';
+			return 'This is a text file made by the Community Addon Template demo! with your add-on: ~SV-NAME-TODO~!';
 		});
 
 		sv.file('src/lib/add-on/DemoComponent.svelte', (content) => {
diff --git a/packages/create/templates/demo/package.template.json b/packages/create/templates/demo/package.template.json
index f15a5333..7aeb941c 100644
--- a/packages/create/templates/demo/package.template.json
+++ b/packages/create/templates/demo/package.template.json
@@ -1,5 +1,5 @@
 {
-	"name": "~TODO~",
+	"name": "~SV-NAME-TODO~",
 	"private": true,
 	"version": "0.0.1",
 	"type": "module",
diff --git a/packages/create/templates/library/package.template.json b/packages/create/templates/library/package.template.json
index 8784dadc..e23149db 100644
--- a/packages/create/templates/library/package.template.json
+++ b/packages/create/templates/library/package.template.json
@@ -1,5 +1,5 @@
 {
-	"name": "~TODO~",
+	"name": "~SV-NAME-TODO~",
 	"version": "0.0.1",
 	"scripts": {
 		"dev": "vite dev",
diff --git a/packages/create/templates/minimal/package.template.json b/packages/create/templates/minimal/package.template.json
index 19ade13a..74edefb5 100644
--- a/packages/create/templates/minimal/package.template.json
+++ b/packages/create/templates/minimal/package.template.json
@@ -1,5 +1,5 @@
 {
-	"name": "~TODO~",
+	"name": "~SV-NAME-TODO~",
 	"private": true,
 	"version": "0.0.1",
 	"type": "module",

From 1ca951355c3346076313084e2c6a3080a8fcf1d4 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Wed, 3 Sep 2025 23:09:03 +0200
Subject: [PATCH 08/11] Draft A (done)

---
 documentation/docs/20-commands/10-sv-create.md |  2 +-
 packages/cli/commands/create.ts                |  2 +-
 packages/create/shared/+addon/README.md        |  2 +-
 packages/create/templates/addon/src/index.js   | 10 ++++++++--
 pnpm-workspace.yaml                            |  2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/documentation/docs/20-commands/10-sv-create.md b/documentation/docs/20-commands/10-sv-create.md
index 9b0718f1..12c9ece1 100644
--- a/documentation/docs/20-commands/10-sv-create.md
+++ b/documentation/docs/20-commands/10-sv-create.md
@@ -19,7 +19,7 @@ Which project template to use:
 - `minimal` — barebones scaffolding for your new app
 - `demo` — showcase app with a word guessing game that works without JavaScript
 - `library` — template for a Svelte library, set up with `svelte-package`
-- `add-on` — template for a community add-on, ready to be tested & published
+- `addon` — template for a community add-on, ready to be tested & published
 
 ### `--types <option>`
 
diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts
index 16039ecb..eb9c0ecf 100644
--- a/packages/cli/commands/create.ts
+++ b/packages/cli/commands/create.ts
@@ -182,7 +182,7 @@ async function createProject(cwd: ProjectPath, options: Options) {
 	};
 
 	// TODO JYC: no add-ons for addon template
-	if (options.addOns && options.template !== 'add-on') {
+	if (options.addOns && options.template !== 'addon') {
 		// `runAddCommand` includes installing dependencies
 		const { nextSteps, packageManager: pm } = await runAddCommand(
 			{
diff --git a/packages/create/shared/+addon/README.md b/packages/create/shared/+addon/README.md
index f4569547..cbf00f38 100644
--- a/packages/create/shared/+addon/README.md
+++ b/packages/create/shared/+addon/README.md
@@ -20,7 +20,7 @@ Create the project with the following script:
 npm run create
 ```
 
-This will create a SvelteKit project in the `testing` directory.
+This will create a SvelteKit project in the `demo` directory.
 
 To execute the add-on, run:
 
diff --git a/packages/create/templates/addon/src/index.js b/packages/create/templates/addon/src/index.js
index 4bfc8b14..011dc833 100644
--- a/packages/create/templates/addon/src/index.js
+++ b/packages/create/templates/addon/src/index.js
@@ -32,8 +32,14 @@ export default defineAddon({
 		sv.file('src/routes/+page.svelte', (content) => {
 			if (!options.demo) return content;
 			const { script, generateCode, template } = parseSvelte(content, { typescript });
-			imports.addDefault(script.ast, { from: '$lib/add-on/DemoComponent.svelte', as: 'DemoComponent' });
-			return generateCode({ script: script.generateCode(), template: template.generateCode() + '\n\n<DemoComponent />' });
+			imports.addDefault(script.ast, {
+				from: '$lib/add-on/DemoComponent.svelte',
+				as: 'DemoComponent'
+			});
+			return generateCode({
+				script: script.generateCode(),
+				template: template.generateCode() + '\n\n<DemoComponent />'
+			});
 		});
 	}
 });
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 7f6c07d5..2f7d538c 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,4 +1,4 @@
 packages:
   - 'packages/*'
   - '!.test-tmp/**'
-  - 'temp'
+  - '!new-add-on/**'

From 0a8aea00cbd6930d9b804b451b4a6c7ac923350e Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Fri, 5 Sep 2025 23:06:41 +0200
Subject: [PATCH 09/11] new option style

---
 packages/create/templates/addon/src/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/create/templates/addon/src/index.js b/packages/create/templates/addon/src/index.js
index 011dc833..f3cb5b80 100644
--- a/packages/create/templates/addon/src/index.js
+++ b/packages/create/templates/addon/src/index.js
@@ -2,13 +2,13 @@ import { defineAddon, defineAddonOptions } from '@sveltejs/cli-core';
 import { imports } from '@sveltejs/cli-core/js';
 import { parseSvelte } from '@sveltejs/cli-core/parsers';
 
-export const options = defineAddonOptions({
-	demo: {
+export const options = defineAddonOptions()
+	.add('demo', {
 		question: 'Do you want to use a demo?',
 		type: 'boolean',
-		default: true
-	}
-});
+		default: false
+	})
+	.build();
 
 export default defineAddon({
 	id: 'community-addon',

From bf449d08d2175c7bac9cab2a18631235f8d03d57 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Fri, 5 Sep 2025 23:06:56 +0200
Subject: [PATCH 10/11] fix "new-add-on"

---
 .gitignore          | 3 +--
 pnpm-workspace.yaml | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb380cd6..bb6c2737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@ temp/
 package-lock.json
 yarn.lock
 vite.config.js.timestamp-*
-.test-output
-new-add-on/
\ No newline at end of file
+.test-output
\ No newline at end of file
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 2f7d538c..90820b37 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,4 +1,3 @@
 packages:
   - 'packages/*'
   - '!.test-tmp/**'
-  - '!new-add-on/**'

From 0630be5c9a1c39316942d07cd0464fe8ba9edac3 Mon Sep 17 00:00:00 2001
From: jycouet <jycouet@gmail.com>
Date: Fri, 5 Sep 2025 23:44:30 +0200
Subject: [PATCH 11/11] fix path ?

---
 packages/create/scripts/build-templates.js | 4 ++--
 packages/create/templates/addon/.gitignore | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/create/scripts/build-templates.js b/packages/create/scripts/build-templates.js
index eefdf30a..159a595e 100644
--- a/packages/create/scripts/build-templates.js
+++ b/packages/create/scripts/build-templates.js
@@ -99,9 +99,9 @@ async function generate_templates(dist, shared) {
 				// TODO JYC (maybe could be a dev mode and prod mode ?)
 				const pkg = JSON.parse(contents);
 				if (pkg.dependencies && pkg.dependencies['@sveltejs/cli-core'])
-					pkg.dependencies['@sveltejs/cli-core'] = 'file:../packages/core';
+					pkg.dependencies['@sveltejs/cli-core'] = 'file:../../packages/core';
 				if (pkg.devDependencies && pkg.devDependencies['sv'])
-					pkg.devDependencies['sv'] = 'file:../packages/cli';
+					pkg.devDependencies['sv'] = 'file:../../packages/cli';
 				contents = JSON.stringify(pkg, null, '\t');
 
 				fs.writeFileSync(path.join(dir, 'package.json'), contents);
diff --git a/packages/create/templates/addon/.gitignore b/packages/create/templates/addon/.gitignore
index 214c7bf6..ace55725 100644
--- a/packages/create/templates/addon/.gitignore
+++ b/packages/create/templates/addon/.gitignore
@@ -1,5 +1,5 @@
 node_modules
-testing/
+demo/
 
 # Output
 .output