Merge branch 'main' of github.com:sveltejs/cli into pnpmBuildDependency

Author: jycouet

.changeset/some-rings-appear.md

@@ -1,5 +1,11 @@
 # @sveltejs/sv-utils
 
+## 0.1.0
+### Minor Changes
+
+
+- feat: community add-ons are now **experimental** ([#1020](https://github.com/sveltejs/cli/pull/1020))
+
 ## 0.0.5
 ### Patch Changes
 

packages/sv-utils/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
 	"name": "@sveltejs/sv-utils",
-	"version": "0.0.5",
+	"version": "0.1.0",
 	"type": "module",
 	"description": "Utility functions for sv",
 	"license": "MIT",

packages/sv-utils/package.json

@@ -1,5 +1,17 @@
 # sv
 
+## 0.14.0
+### Minor Changes
+
+
+- feat: community add-ons are now **experimental** ([#1020](https://github.com/sveltejs/cli/pull/1020))
+
+
+### Patch Changes
+
+- Updated dependencies [[`c0e5831`](https://github.com/sveltejs/cli/commit/c0e583126279afe7aff8cebb03c5b3928d73b521)]:
+  - @sveltejs/sv-utils@0.1.0
+
 ## 0.13.2
 ### Patch Changes
 

packages/sv/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
 	"name": "sv",
-	"version": "0.13.2",
+	"version": "0.14.0",
 	"type": "module",
 	"description": "A command line interface (CLI) for creating and maintaining Svelte applications",
 	"license": "MIT",

packages/sv/package.json

@@ -258,14 +258,25 @@ async function createProject(cwd: ProjectPath, options: Options) {
 	const projectPath = path.resolve(directory);
 	const basename = path.basename(projectPath);
 	const parentDirName = path.basename(path.dirname(projectPath));
-	const projectName = parentDirName.startsWith('@') ? `${parentDirName}/${basename}` : basename;
+	let projectName = parentDirName.startsWith('@') ? `${parentDirName}/${basename}` : basename;
 
 	if (template === 'addon' && !projectName.startsWith('@')) {
 		// At this stage, we don't support un-scoped add-ons
 		// FYI: a demo exists for `npx sv add my-cool-addon`
-		common.errorAndExit(
-			`Community add-ons must be published under an npm org (e.g. ${color.command('@my-org/sv')}). Unscoped package names are not supported at this stage.`
-		);
+		const org = await p.text({
+			message: `Community add-ons must be published under an npm org. Enter the name of your npm org:`,
+			placeholder: '  @my-org',
+			validate: (value) => {
+				if (!value) return 'Organization name is required';
+				if (!value.startsWith('@')) return 'Must start with @';
+				if (value.includes('/')) return 'Just the org, not the full package name';
+			}
+		});
+		if (p.isCancel(org)) {
+			p.cancel('Operation cancelled.');
+			process.exit(0);
+		}
+		projectName = `${org}/${basename}`;
 	}
 
 	if (template === 'addon' && options.add.length > 0) {

packages/sv/src/cli/create.ts

@@ -10,7 +10,7 @@ const browser = false;
 const { test, prepareServer, testCases } = setupTest(
 	{ addon },
 	{
-		kinds: [{ type: 'default', options: { addon: { who: 'you' } } }],
+		kinds: [{ type: 'default', options: { [addon.id]: { who: 'you' } } }],
 		filter: (testCase) => testCase.variant.includes('kit'),
 		browser
 	}
@@ -21,15 +21,18 @@ test.concurrent.for(testCases)(
 	async (testCase, { page, ...ctx }) => {
 		const cwd = ctx.cwd(testCase);
 
-		const msg =
-			"This is a text file made by the Community Addon Template demo for the add-on: '@my-org/sv'!";
+		const msg = "Community Addon Template demo for the add-on: '@my-org/sv'!";
 
 		const contentPath = path.resolve(cwd, `src/lib/@my-org/sv/content.txt`);
 		const contentContent = fs.readFileSync(contentPath, 'utf8');
-
 		// Check if we have the imports
 		expect(contentContent).toContain(msg);
 
+		const helloPath = path.resolve(cwd, `src/lib/@my-org/sv/HelloComponent.svelte`);
+		const helloContent = fs.readFileSync(helloPath, 'utf8');
+		// Check if we have the imports
+		expect(helloContent).toContain('you');
+
 		// For browser testing
 		if (browser) {
 			const { close } = await prepareServer({ cwd, page });

packages/sv/src/cli/tests/snapshots/@my-org/sv/tests/addon.test.js

@@ -10,7 +10,7 @@ const browser = false;
 const { test, prepareServer, testCases } = setupTest(
 	{ addon },
 	{
-		kinds: [{ type: 'default', options: { addon: { who: 'you' } } }],
+		kinds: [{ type: 'default', options: { [addon.id]: { who: 'you' } } }],
 		filter: (testCase) => testCase.variant.includes('kit'),
 		browser
 	}
@@ -21,15 +21,18 @@ test.concurrent.for(testCases)(
 	async (testCase, { page, ...ctx }) => {
 		const cwd = ctx.cwd(testCase);
 
-		const msg =
-			"This is a text file made by the Community Addon Template demo for the add-on: '~SV-NAME-TODO~'!";
+		const msg = "Community Addon Template demo for the add-on: '~SV-NAME-TODO~'!";
 
 		const contentPath = path.resolve(cwd, `src/lib/~SV-NAME-TODO~/content.txt`);
 		const contentContent = fs.readFileSync(contentPath, 'utf8');
-
 		// Check if we have the imports
 		expect(contentContent).toContain(msg);
 
+		const helloPath = path.resolve(cwd, `src/lib/~SV-NAME-TODO~/HelloComponent.svelte`);
+		const helloContent = fs.readFileSync(helloPath, 'utf8');
+		// Check if we have the imports
+		expect(helloContent).toContain('you');
+
 		// For browser testing
 		if (browser) {
 			const { close } = await prepareServer({ cwd, page });

packages/sv/src/create/templates/addon/tests/addon.test.js

@@ -239,12 +239,17 @@ export async function prepareServer({
 	return { url, close };
 }
 
+export type PlaywrightContext = Pick<typeof import('@playwright/test'), 'chromium'>;
+
 export type VitestContext = Pick<
 	typeof import('vitest'),
 	'inject' | 'test' | 'beforeAll' | 'beforeEach'
 >;
 
-export function createSetupTest(vitest: VitestContext): <Addons extends AddonMap>(
+export function createSetupTest(
+	vitest: VitestContext,
+	playwright?: PlaywrightContext
+): <Addons extends AddonMap>(
 	addons: Addons,
 	options?: SetupTestOptions<Addons>
 ) => {
@@ -272,12 +277,16 @@ export function createSetupTest(vitest: VitestContext): <Addons extends AddonMap
 		if (withBrowser) {
 			beforeAll(async () => {
 				let chromium: Awaited<typeof import('@playwright/test')>['chromium'];
-				try {
-					({ chromium } = await import('@playwright/test'));
-				} catch {
-					throw new Error(
-						'Browser testing requires @playwright/test. Install it with: pnpm add -D @playwright/test'
-					);
+				if (playwright) {
+					chromium = playwright.chromium;
+				} else {
+					try {
+						({ chromium } = await import('@playwright/test'));
+					} catch {
+						throw new Error(
+							'Browser testing requires @playwright/test. Install it with: pnpm add -D @playwright/test'
+						);
+					}
 				}
 				browser = await chromium.launch();
 				return async () => {