Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/swift-dingos-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'sv': patch
---

fix(cli): `dependencyVersion` is now properly populated during `sv create`
42 changes: 24 additions & 18 deletions packages/cli/commands/add/workspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type CreateWorkspaceOptions = {
packageManager?: PackageManager;
override?: {
kit?: Workspace['kit'];
dependencies: Record<string, string>;
};
};
export async function createWorkspace({
Expand All @@ -38,26 +39,31 @@ export async function createWorkspace({
: commonFilePaths.svelteConfig;

let dependencies: Record<string, string> = {};
let directory = resolvedCwd;
const workspaceRoot = findWorkspaceRoot(directory);
const { root } = path.parse(directory);
while (
// we have a directory
directory &&
// we are still in the workspace (including the workspace root)
directory.length >= workspaceRoot.length
) {
if (fs.existsSync(path.join(directory, commonFilePaths.packageJson))) {
const { data: packageJson } = getPackageJson(directory);
dependencies = {
...packageJson.devDependencies,
...packageJson.dependencies,
...dependencies
};
if (override?.dependencies) {
dependencies = override.dependencies;
} else {
let directory = resolvedCwd;
const workspaceRoot = findWorkspaceRoot(directory);
const { root } = path.parse(directory);
while (
// we have a directory
directory &&
// we are still in the workspace (including the workspace root)
directory.length >= workspaceRoot.length
) {
if (fs.existsSync(path.join(directory, commonFilePaths.packageJson))) {
const { data: packageJson } = getPackageJson(directory);
dependencies = {
...packageJson.devDependencies,
...packageJson.dependencies,
...dependencies
};
}
if (root === directory) break; // we are at the root root, let's stop
directory = path.dirname(directory);
}
if (root === directory) break; // we are at the root root, let's stop
directory = path.dirname(directory);
}

// removes the version ranges (e.g. `^` is removed from: `^9.0.0`)
for (const [key, value] of Object.entries(dependencies)) {
dependencies[key] = value.replaceAll(/[^\d|.]/g, '');
Expand Down
18 changes: 15 additions & 3 deletions packages/cli/commands/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ import {
sanitizeAddons,
type SelectedAddon
} from './add/index.ts';
import { commonFilePaths } from './add/utils.ts';
import { commonFilePaths, getPackageJson } from './add/utils.ts';
import { createWorkspace } from './add/workspace.ts';
import { dist } from '../../create/utils.ts';

const langs = ['ts', 'jsdoc'] as const;
const langMap: Record<string, LanguageType | undefined> = {
Expand Down Expand Up @@ -363,7 +364,10 @@ export async function createVirtualWorkspace({
packageManager,
type
}: CreateVirtualWorkspaceOptions): Promise<Workspace> {
const override: { kit?: Workspace['kit'] } = {};
const override: {
kit?: Workspace['kit'];
dependencies: Record<string, string>;
} = { dependencies: {} };

// These are our default project structure so we know that it's a kit project
if (template === 'minimal' || template === 'demo' || template === 'library') {
Expand All @@ -373,12 +377,20 @@ export async function createVirtualWorkspace({
};
}

// Let's read the package.json of the template we will use and add the dependencies to the override
const templatePackageJsonPath = dist(`templates/${template}`);
const { data: packageJson } = getPackageJson(templatePackageJsonPath);
override.dependencies = {
...packageJson.devDependencies,
...packageJson.dependencies,
...override.dependencies
};

const tentativeWorkspace = await createWorkspace({ cwd, packageManager, override });

const virtualWorkspace: Workspace = {
...tentativeWorkspace,
typescript: type === 'typescript',
dependencyVersion: () => undefined,
files: {
...tentativeWorkspace.files,
viteConfig: type === 'typescript' ? commonFilePaths.viteConfigTS : commonFilePaths.viteConfig,
Expand Down
Loading