@ryanatkn/gro 0.151.2 → 0.153.0

package/dist/upgrade.task.d.ts

@@ -7,6 +7,10 @@ export declare const Args: z.ZodObject<{
     force: z.ZodDefault<z.ZodBoolean>;
     pull: z.ZodDefault<z.ZodBoolean>;
     'no-pull': z.ZodDefault<z.ZodBoolean>;
+    delete_node_modules: z.ZodDefault<z.ZodBoolean>;
+    node_modules_path: z.ZodDefault<z.ZodString>;
+    delete_lockfile: z.ZodDefault<z.ZodBoolean>;
+    lockfile_path: z.ZodDefault<z.ZodString>;
     dry: z.ZodDefault<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     _: string[];
@@ -16,6 +20,10 @@ export declare const Args: z.ZodObject<{
     force: boolean;
     'no-pull': boolean;
     only: string[];
+    delete_node_modules: boolean;
+    node_modules_path: string;
+    delete_lockfile: boolean;
+    lockfile_path: string;
 }, {
     _?: string[] | undefined;
     origin?: string | undefined;
@@ -24,6 +32,10 @@ export declare const Args: z.ZodObject<{
     force?: boolean | undefined;
     'no-pull'?: boolean | undefined;
     only?: string | string[] | undefined;
+    delete_node_modules?: boolean | undefined;
+    node_modules_path?: string | undefined;
+    delete_lockfile?: boolean | undefined;
+    lockfile_path?: string | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/dist/upgrade.task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/upgrade.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAMhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;EAeP,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA+C3B,CAAC"}
+{"version":3,"file":"upgrade.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/upgrade.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAGtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAOhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BP,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA2E3B,CAAC"}

package/dist/upgrade.task.js

@@ -1,10 +1,12 @@
 import { spawn } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
+import { rmSync } from 'node:fs';
 import { Task_Error } from './task.js';
 import { extract_deps, load_package_json } from './package_json.js';
 import { Git_Origin, git_pull } from './git.js';
 import { spawn_cli } from './cli.js';
 import { serialize_args, to_forwarded_args } from './args.js';
+import { NODE_MODULES_DIRNAME } from './constants.js';
 export const Args = z
     .object({
     _: z.array(z.string(), { description: 'names of deps to exclude from the upgrade' }).default([]),
@@ -18,6 +20,18 @@ export const Args = z
     force: z.boolean({ description: 'if true, print out the planned upgrades' }).default(false),
     pull: z.boolean({ description: 'dual of no-pull' }).default(true),
     'no-pull': z.boolean({ description: 'opt out of git pull' }).default(false),
+    delete_node_modules: z
+        .boolean({ description: 'if true, deletes node_modules before upgrading' })
+        .default(false),
+    node_modules_path: z // TODO maybe configured globally instead
+        .string({ description: 'path to modules directory to delete' })
+        .default(NODE_MODULES_DIRNAME),
+    delete_lockfile: z
+        .boolean({ description: 'if true, deletes the lockfile before upgrading' })
+        .default(false),
+    lockfile_path: z
+        .string({ description: 'path to the lockfile to delete' })
+        .default('package-lock.json'),
     dry: z.boolean({ description: 'if true, print out the planned upgrades' }).default(false),
 })
     .strict();
@@ -25,7 +39,7 @@ export const task = {
     summary: 'upgrade deps',
     Args,
     run: async ({ args, log, config }) => {
-        const { _, only, origin, force, pull, dry } = args;
+        const { _, only, origin, force, pull, delete_node_modules, node_modules_path, delete_lockfile, lockfile_path, dry, } = args;
         if (_.length && only.length) {
             throw new Task_Error('Cannot call `gro upgrade` with both rest args and --only.');
         }
@@ -33,6 +47,14 @@ export const task = {
         if (pull) {
             await git_pull(origin);
         }
+        if (delete_node_modules) {
+            log.info(`deleting node_modules at `, node_modules_path);
+            rmSync(node_modules_path, { recursive: true, force: true });
+        }
+        if (delete_lockfile) {
+            log.info(`deleting lockfile at`, lockfile_path);
+            rmSync(lockfile_path, { force: true });
+        }
         const package_json = load_package_json();
         const all_deps = extract_deps(package_json);
         const deps = only.length
@@ -53,6 +75,12 @@ export const task = {
         }
         install_args.push(...serialize_args(to_forwarded_args(config.pm_cli)));
         await spawn(config.pm_cli, install_args);
+        // If we deleted the lockfile or node modules, `npm install` again
+        // to fix a recurring npm bug getting the lockfile to its final state.
+        if (!dry && (delete_node_modules || delete_lockfile)) {
+            log.info(`installing again to fix npm lockfile bugs`);
+            await spawn(config.pm_cli, ['install']);
+        }
         // Sync in a new process to pick up any changes after installing, avoiding some errors.
         await spawn_cli('gro', ['sync', '--no-install']); // don't install because we do above
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.151.2",
+  "version": "0.153.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -54,12 +54,12 @@
     "dotenv": "^16.5.0",
     "esm-env": "^1.2.2",
     "mri": "^1.2.0",
-    "oxc-parser": "^0.63.0",
+    "oxc-parser": "^0.67.0",
     "prettier": "^3.5.3",
     "prettier-plugin-svelte": "^3.3.3",
     "ts-morph": "^25.0.1",
     "tslib": "^2.8.1",
-    "zod": "^3.24.2"
+    "zod": "^3.24.3"
   },
   "peerDependencies": {
     "esbuild": "^0.25",
@@ -69,20 +69,20 @@
     "@changesets/changelog-git": "^0.2.1",
     "@changesets/types": "^6.1.0",
     "@ryanatkn/eslint-config": "^0.8.0",
-    "@ryanatkn/fuz": "^0.139.0",
+    "@ryanatkn/fuz": "^0.139.2",
     "@ryanatkn/moss": "^0.26.0",
     "@sveltejs/adapter-static": "^3.0.8",
-    "@sveltejs/kit": "^2.20.7",
+    "@sveltejs/kit": "^2.20.8",
     "@sveltejs/package": "^2.3.11",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
-    "@types/node": "^22.14.1",
-    "esbuild": "^0.25.2",
-    "eslint": "^9.24.0",
+    "@types/node": "^22.15.3",
+    "esbuild": "^0.25.3",
+    "eslint": "^9.25.1",
     "eslint-plugin-svelte": "^3.5.1",
-    "svelte": "^5.27.0",
+    "svelte": "^5.28.2",
     "svelte-check": "^4.1.6",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.30.1",
+    "typescript-eslint": "^8.31.1",
     "uvu": "^0.5.6"
   },
   "optionalDependencies": {
@@ -384,14 +384,14 @@
       "types": "./dist/src_json.d.ts",
       "default": "./dist/src_json.js"
     },
+    "./svelte_config.js": {
+      "types": "./dist/svelte_config.d.ts",
+      "default": "./dist/svelte_config.js"
+    },
     "./svelte_helpers.js": {
       "types": "./dist/svelte_helpers.d.ts",
       "default": "./dist/svelte_helpers.js"
     },
-    "./sveltekit_config.js": {
-      "types": "./dist/sveltekit_config.d.ts",
-      "default": "./dist/sveltekit_config.js"
-    },
     "./sveltekit_helpers.js": {
       "types": "./dist/sveltekit_helpers.d.ts",
       "default": "./dist/sveltekit_helpers.js"
@@ -412,9 +412,9 @@
       "types": "./dist/sveltekit_shim_app_paths.d.ts",
       "default": "./dist/sveltekit_shim_app_paths.js"
     },
-    "./sveltekit_shim_app_stores.js": {
-      "types": "./dist/sveltekit_shim_app_stores.d.ts",
-      "default": "./dist/sveltekit_shim_app_stores.js"
+    "./sveltekit_shim_app_state.js": {
+      "types": "./dist/sveltekit_shim_app_state.d.ts",
+      "default": "./dist/sveltekit_shim_app_state.js"
     },
     "./sveltekit_shim_app.js": {
       "types": "./dist/sveltekit_shim_app.d.ts",

package/src/lib/changeset.task.ts

@@ -75,7 +75,7 @@ export const task: Task<Args> = {
 				changeset_cli,
 			},
 			log,
-			sveltekit_config,
+			svelte_config,
 			config,
 		} = ctx;
 
@@ -93,7 +93,7 @@ export const task: Task<Args> = {
 
 		const package_json = load_package_json();
 
-		const has_sveltekit_library_result = has_sveltekit_library(package_json, sveltekit_config);
+		const has_sveltekit_library_result = has_sveltekit_library(package_json, svelte_config);
 		if (!has_sveltekit_library_result.ok) {
 			throw new Task_Error(
 				'Failed to find SvelteKit library: ' + has_sveltekit_library_result.message,

package/src/lib/constants.ts

@@ -17,7 +17,7 @@ export const GRO_DIR = GRO_DIRNAME + '/';
 export const GRO_DEV_DIR = GRO_DEV_DIRNAME + '/';
 export const GRO_CONFIG_PATH = 'gro.config.ts';
 export const README_FILENAME = 'README.md';
-export const SVELTEKIT_CONFIG_FILENAME = 'svelte.config.js';
+export const SVELTE_CONFIG_FILENAME = 'svelte.config.js';
 export const VITE_CONFIG_FILENAME = 'vite.config.ts';
 export const NODE_MODULES_DIRNAME = 'node_modules';
 export const LOCKFILE_FILENAME = 'package-lock.json';

package/src/lib/esbuild_helpers.ts

@@ -2,7 +2,7 @@ import {styleText as st} from 'node:util';
 import type {Logger} from '@ryanatkn/belt/log.js';
 import type * as esbuild from 'esbuild';
 
-import type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
+import type {Parsed_Svelte_Config} from './svelte_config.js';
 
 export const print_build_result = (log: Logger, build_result: esbuild.BuildResult): void => {
 	for (const error of build_result.errors) {
@@ -28,7 +28,7 @@ const import_meta_env = 'import.' + 'meta.env.'; // eslint-disable-line no-usele
  */
 export const to_define_import_meta_env = (
 	dev: boolean,
-	base_url: Parsed_Sveltekit_Config['base_url'],
+	base_url: Parsed_Svelte_Config['base_url'],
 	ssr = true,
 	mode = dev ? 'development' : 'production',
 ): Record<string, string> => ({

package/src/lib/esbuild_plugin_external_worker.ts

@@ -10,7 +10,7 @@ import {esbuild_plugin_sveltekit_shim_env} from './esbuild_plugin_sveltekit_shim
 import {esbuild_plugin_sveltekit_shim_app} from './esbuild_plugin_sveltekit_shim_app.js';
 import {esbuild_plugin_sveltekit_local_imports} from './esbuild_plugin_sveltekit_local_imports.js';
 import {esbuild_plugin_svelte} from './esbuild_plugin_svelte.js';
-import type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
+import type {Parsed_Svelte_Config} from './svelte_config.js';
 import type {Path_Id} from './path.js';
 
 export interface Esbuild_Plugin_External_Worker_Options {
@@ -21,8 +21,8 @@ export interface Esbuild_Plugin_External_Worker_Options {
 	svelte_compile_module_options?: ModuleCompileOptions;
 	svelte_preprocessors?: PreprocessorGroup | Array<PreprocessorGroup>;
 	alias?: Record<string, string>;
-	base_url?: Parsed_Sveltekit_Config['base_url'];
-	assets_url?: Parsed_Sveltekit_Config['assets_url'];
+	base_url?: Parsed_Svelte_Config['base_url'];
+	assets_url?: Parsed_Svelte_Config['assets_url'];
 	public_prefix?: string;
 	private_prefix?: string;
 	env_dir?: string;

package/src/lib/esbuild_plugin_svelte.ts

@@ -13,15 +13,15 @@ import {relative} from 'node:path';
 import {SVELTE_MATCHER, SVELTE_RUNES_MATCHER} from './svelte_helpers.js';
 import {to_define_import_meta_env, default_ts_transform_options} from './esbuild_helpers.js';
 import {
-	default_sveltekit_config,
+	default_svelte_config,
 	to_default_compile_module_options,
-	type Parsed_Sveltekit_Config,
-} from './sveltekit_config.js';
+	type Parsed_Svelte_Config,
+} from './svelte_config.js';
 import {TS_MATCHER} from './constants.js';
 
 export interface Esbuild_Plugin_Svelte_Options {
 	dev: boolean;
-	base_url: Parsed_Sveltekit_Config['base_url'];
+	base_url: Parsed_Svelte_Config['base_url'];
 	dir?: string;
 	svelte_compile_options?: CompileOptions;
 	svelte_compile_module_options?: ModuleCompileOptions;
@@ -35,7 +35,7 @@ export const esbuild_plugin_svelte = (options: Esbuild_Plugin_Svelte_Options): e
 		dev,
 		base_url,
 		dir = process.cwd(),
-		svelte_compile_options = default_sveltekit_config.svelte_compile_options,
+		svelte_compile_options = default_svelte_config.svelte_compile_options,
 		svelte_compile_module_options = to_default_compile_module_options(svelte_compile_options),
 		svelte_preprocessors,
 		ts_transform_options = default_ts_transform_options,

package/src/lib/esbuild_plugin_sveltekit_shim_app.ts

@@ -5,13 +5,13 @@ import {
 	render_sveltekit_shim_app_paths,
 	sveltekit_shim_app_specifiers,
 } from './sveltekit_shim_app.js';
-import type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
+import type {Parsed_Svelte_Config} from './svelte_config.js';
 import {EVERYTHING_MATCHER} from './constants.js';
 
 export interface Esbuild_Plugin_Sveltekit_Shim_App_Options {
 	dev: boolean;
-	base_url: Parsed_Sveltekit_Config['base_url'];
-	assets_url: Parsed_Sveltekit_Config['assets_url'];
+	base_url: Parsed_Svelte_Config['base_url'];
+	assets_url: Parsed_Svelte_Config['assets_url'];
 }
 
 export const esbuild_plugin_sveltekit_shim_app = ({

package/src/lib/filer.ts

@@ -19,14 +19,15 @@ import {
 import {paths} from './paths.js';
 import {parse_imports} from './parse_imports.js';
 import {resolve_specifier} from './resolve_specifier.js';
-import {default_sveltekit_config} from './sveltekit_config.js';
+import {default_svelte_config} from './svelte_config.js';
 import {map_sveltekit_aliases, SVELTEKIT_GLOBAL_SPECIFIER} from './sveltekit_helpers.js';
 import type {Package_Json} from './package_json.js';
 
-const aliases = Object.entries(default_sveltekit_config.alias);
+const aliases = Object.entries(default_svelte_config.alias);
 
 export interface Source_File {
 	id: Path_Id;
+	// TODO figure out the best API that makes this lazy
 	/**
 	 * `null` contents means it doesn't exist.
 	 * We create the file in memory to track its dependents regardless of its existence on disk.
@@ -50,6 +51,7 @@ export interface Filer_Options {
 	watch_dir?: typeof watch_dir;
 	watch_dir_options?: Partial<Omit_Strict<Watch_Dir_Options, 'on_change'>>;
 	package_json_cache?: Record<string, Package_Json>;
+	log?: Logger;
 }
 
 export class Filer {
@@ -60,10 +62,13 @@ export class Filer {
 	#watch_dir: typeof watch_dir;
 	#watch_dir_options: Partial<Watch_Dir_Options>;
 
+	#log?: Logger;
+
 	constructor(options: Filer_Options = EMPTY_OBJECT) {
 		this.#watch_dir = options.watch_dir ?? watch_dir;
 		this.#watch_dir_options = options.watch_dir_options ?? EMPTY_OBJECT;
 		this.root_dir = resolve(options.watch_dir_options?.dir ?? paths.source);
+		this.#log = options.log;
 	}
 
 	#watching: Watch_Node_Fs | undefined;
@@ -121,20 +126,19 @@ export class Filer {
 			const path = map_sveltekit_aliases(specifier, aliases);
 
 			let path_id;
+			// TODO can we replace `resolve_specifier` with `import.meta.resolve` completely now outside of esbuild plugins?
 			if (path[0] === '.' || path[0] === '/') {
 				const resolved = resolve_specifier(path, dir);
 				path_id = resolved.path_id;
 			} else {
 				if (isBuiltin(path)) continue;
+				const file_url = pathToFileURL(file.id);
 				try {
-					const file_url = pathToFileURL(file.id);
 					path_id = fileURLToPath(import.meta.resolve(path, file_url.href));
 				} catch (error) {
-					// If it's imported from an external module, ignore any import errors.
-					if (error.code === 'ERR_MODULE_NOT_FOUND' && file.external) {
-						continue;
-					}
-					throw error;
+					// if resolving fails for any reason, just log and ignore it
+					this.#log?.error('[filer] failed to resolve path', path, file_url.href, error);
+					continue;
 				}
 			}
 			dependencies_removed.delete(path_id);
@@ -273,7 +277,7 @@ export const filter_dependents = (
 		const dependent_source_file = get_by_id(dependent_id);
 		if (!dependent_source_file) {
 			log?.warn(
-				`[filer.filter_dependents]: dependent source file ${dependent_id} not found for ${source_file.id}`,
+				`[filer.filter_dependents] dependent source file ${dependent_id} not found for ${source_file.id}`,
 			);
 			continue;
 		}

package/src/lib/format_directory.ts

@@ -5,7 +5,7 @@ import {paths} from './paths.js';
 import {
 	GITHUB_DIRNAME,
 	README_FILENAME,
-	SVELTEKIT_CONFIG_FILENAME,
+	SVELTE_CONFIG_FILENAME,
 	VITE_CONFIG_FILENAME,
 	TSCONFIG_FILENAME,
 	GRO_CONFIG_PATH,
@@ -19,7 +19,7 @@ const EXTENSIONS_DEFAULT = 'ts,js,json,svelte,html,css,md,yml';
 const ROOT_PATHS_DEFAULT = `${[
 	README_FILENAME,
 	GRO_CONFIG_PATH,
-	SVELTEKIT_CONFIG_FILENAME,
+	SVELTE_CONFIG_FILENAME,
 	VITE_CONFIG_FILENAME,
 	TSCONFIG_FILENAME,
 	GITHUB_DIRNAME,

package/src/lib/gen.ts

@@ -10,7 +10,7 @@ import {existsSync} from 'node:fs';
 import {print_path} from './paths.js';
 import type {Path_Id} from './path.js';
 import type {Gro_Config} from './gro_config.js';
-import type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
+import type {Parsed_Svelte_Config} from './svelte_config.js';
 import {load_modules, type Load_Modules_Failure, type Module_Meta} from './modules.js';
 import {
 	Input_Path,
@@ -40,7 +40,7 @@ export interface Gen_File {
 export type Gen = (ctx: Gen_Context) => Raw_Gen_Result | Promise<Raw_Gen_Result>;
 export interface Gen_Context {
 	config: Gro_Config;
-	sveltekit_config: Parsed_Sveltekit_Config;
+	svelte_config: Parsed_Svelte_Config;
 	/**
 	 * Same as `import.meta.url` but in path form.
 	 */

package/src/lib/gro.config.default.ts

@@ -1,37 +1,50 @@
+import {resolve} from 'node:path';
+
 import type {Create_Gro_Config} from './gro_config.js';
 import {gro_plugin_sveltekit_library} from './gro_plugin_sveltekit_library.js';
 import {has_server, gro_plugin_server} from './gro_plugin_server.js';
 import {gro_plugin_sveltekit_app} from './gro_plugin_sveltekit_app.js';
 import {has_sveltekit_app, has_sveltekit_library} from './sveltekit_helpers.js';
 import {gro_plugin_gen} from './gro_plugin_gen.js';
-import {has_dep, is_dep, load_package_json} from './package_json.js';
+import {has_dep, load_package_json} from './package_json.js';
+import {find_first_existing_file} from './search_fs.js';
+
+// TODO hacky, maybe extract utils?
 
 /**
  * This is the default config that's passed to `gro.config.ts`
  * if it exists in the current project, and if not, this is the final config.
- * It looks at the project and tries to do the right thing:
+ * It looks at the SvelteKit config and filesystem and tries to do the right thing:
  *
- * - if `src/routes`, assumes a SvelteKit frontend
- * - if `src/lib`, assumes a Node library
- * - if `src/lib/server/server.ts`, assumes a Node server
+ * - if `src/routes`, assumes a SvelteKit frontend - respects `KitConfig.kit.files.routes`
+ * - if `src/lib`, assumes a Node library - respects `KitConfig.kit.files.lib`
+ * - if `src/lib/server/server.ts`, assumes a Node server - needs config
  */
-const config: Create_Gro_Config = async (cfg) => {
+const config: Create_Gro_Config = async (cfg, svelte_config) => {
 	const package_json = load_package_json(); // TODO gets wastefully loaded by some plugins, maybe put in plugin/task context? how does that interact with `map_package_json`?
 
 	const [has_moss_dep, has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] =
 		await Promise.all([
-			has_dep('@ryanatkn/moss', package_json) || is_dep('@ryanatkn/moss', package_json),
+			has_dep('@ryanatkn/moss', package_json),
 			has_server(),
-			has_sveltekit_library(package_json),
+			has_sveltekit_library(package_json, svelte_config),
 			has_sveltekit_app(),
 		]);
 
+	const local_moss_plugin_path = find_first_existing_file([
+		'./src/lib/gro_plugin_moss.ts',
+		'./src/routes/gro_plugin_moss.ts',
+	]);
+
+	// put things that generate files before SvelteKit so it can see them
 	cfg.plugins = async () =>
 		[
-			// put things that generate files before SvelteKit so it can see them
-			has_moss_dep
-				? ((await import('@ryanatkn/moss/gro_plugin_moss.js')) as any).gro_plugin_moss()
-				: null, // lazy load to avoid errors if it's not installed
+			// TODO probably belongs in the gen system
+			local_moss_plugin_path
+				? (await import(resolve(local_moss_plugin_path))).gro_plugin_moss()
+				: has_moss_dep
+					? (await import('@ryanatkn/moss/gro_plugin_moss.js')).gro_plugin_moss()
+					: null, // lazy load to avoid errors if it's not installed
 			gro_plugin_gen(),
 			has_server_result.ok ? gro_plugin_server() : null,
 			has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,

package/src/lib/gro_config.ts

@@ -15,6 +15,7 @@ import create_default_config from './gro.config.default.js';
 import type {Create_Config_Plugins} from './plugin.js';
 import type {Map_Package_Json} from './package_json.js';
 import type {Path_Filter, Path_Id} from './path.js';
+import type {Parsed_Svelte_Config} from './svelte_config.js';
 
 /**
  * The config that users can extend via `gro.config.ts`.
@@ -50,6 +51,8 @@ export interface Gro_Config extends Raw_Gro_Config {
 	 * The CLI to use that's compatible with `npm install` and `npm link`. Defaults to `'npm'`.
 	 */
 	pm_cli: string;
+	/** @default SVELTE_CONFIG_FILENAME */
+	svelte_config_filename?: string;
 }
 
 /**
@@ -68,6 +71,7 @@ export interface Raw_Gro_Config {
 
 export type Create_Gro_Config = (
 	base_config: Gro_Config,
+	svelte_config?: Parsed_Svelte_Config,
 ) => Raw_Gro_Config | Promise<Raw_Gro_Config>;
 
 export const create_empty_gro_config = (): Gro_Config => ({

package/src/lib/gro_plugin_server.ts

@@ -1,6 +1,6 @@
 import {spawn_restartable_process, type Restartable_Process} from '@ryanatkn/belt/process.js';
 import * as esbuild from 'esbuild';
-import type {Config as SvelteKitConfig} from '@sveltejs/kit';
+import type {Config as SvelteConfig} from '@sveltejs/kit';
 import {join, resolve} from 'node:path';
 import {identity} from '@ryanatkn/belt/function.js';
 import {strip_before, strip_end} from '@ryanatkn/belt/string.js';
@@ -13,7 +13,7 @@ import {base_path_to_path_id, LIB_DIRNAME, paths} from './paths.js';
 import type {Path_Id} from './path.js';
 import {GRO_DEV_DIRNAME, SERVER_DIST_PATH} from './constants.js';
 import {watch_dir, type Watch_Node_Fs} from './watch_dir.js';
-import {init_sveltekit_config, default_sveltekit_config} from './sveltekit_config.js';
+import {parse_svelte_config, default_svelte_config} from './svelte_config.js';
 import {esbuild_plugin_sveltekit_shim_app} from './esbuild_plugin_sveltekit_shim_app.js';
 import {esbuild_plugin_sveltekit_shim_env} from './esbuild_plugin_sveltekit_shim_env.js';
 import {print_build_result, to_define_import_meta_env} from './esbuild_helpers.js';
@@ -49,7 +49,7 @@ export interface Gro_Plugin_Server_Options {
 	 */
 	outpaths?: Create_Outpaths;
 	/**
-	 * @default SvelteKit's `.env`, `.env.development`, and `.env.production`
+	 * @default ```SvelteKit's `.env`, `.env.development`, and `.env.production````
 	 */
 	env_files?: Array<string>;
 	/**
@@ -57,9 +57,9 @@ export interface Gro_Plugin_Server_Options {
 	 */
 	ambient_env?: Record<string, string>;
 	/**
-	 * @default loaded from `${cwd}/${SVELTEKIT_CONFIG_FILENAME}`
+	 * @default ```loaded from `${cwd}/${SVELTE_CONFIG_FILENAME}````
 	 */
-	sveltekit_config?: SvelteKitConfig;
+	svelte_config?: SvelteConfig;
 	/**
 	 * @default 'esnext'
 	 */
@@ -115,7 +115,7 @@ export const gro_plugin_server = ({
 	}),
 	env_files,
 	ambient_env,
-	sveltekit_config,
+	svelte_config,
 	target = 'esnext',
 	esbuild_build_options = identity,
 	rebuild_throttle_delay = 1000,
@@ -130,10 +130,13 @@ export const gro_plugin_server = ({
 	return {
 		name: 'gro_plugin_server',
 		setup: async ({dev, watch, timings, log, config}) => {
-			const parsed_sveltekit_config =
-				!sveltekit_config && strip_end(dir, '/') === process.cwd()
-					? default_sveltekit_config
-					: await init_sveltekit_config(sveltekit_config ?? dir);
+			const parsed_svelte_config =
+				!svelte_config && strip_end(dir, '/') === process.cwd()
+					? default_svelte_config
+					: await parse_svelte_config({
+							dir_or_config: svelte_config ?? dir,
+							config_filename: config.svelte_config_filename,
+						});
 			const {
 				alias,
 				base_url,
@@ -144,7 +147,7 @@ export const gro_plugin_server = ({
 				svelte_compile_options,
 				svelte_compile_module_options,
 				svelte_preprocessors,
-			} = parsed_sveltekit_config;
+			} = parsed_svelte_config;
 
 			const {outbase, outdir, outname} = outpaths(dev);
 

package/src/lib/gro_plugin_sveltekit_app.ts

@@ -9,7 +9,7 @@ import {Task_Error} from './task.js';
 import {find_cli, spawn_cli, spawn_cli_process} from './cli.js';
 import {type Map_Src_Json, serialize_src_json, create_src_json} from './src_json.js';
 import {EXPORTS_EXCLUDER_DEFAULT} from './gro_config.js';
-import {default_sveltekit_config} from './sveltekit_config.js';
+import {default_svelte_config} from './svelte_config.js';
 import {SOURCE_DIRNAME} from './constants.js';
 import {VITE_CLI} from './sveltekit_helpers.js';
 
@@ -108,7 +108,7 @@ export const gro_plugin_sveltekit_app = ({
 
 				// copy files to `static` before building, in such a way
 				// that's non-destructive to existing files and dirs and easy to clean up
-				const {assets_path} = default_sveltekit_config;
+				const {assets_path} = default_svelte_config;
 				const cleanups: Array<Cleanup> = [
 					serialized_package_json
 						? create_temporarily(

package/src/lib/invoke_task.ts

@@ -44,7 +44,7 @@ export const invoke_task = async (
 	const log = new System_Logger(print_log_label(task_name || 'gro'));
 	log.info('invoking', task_name ? st('cyan', task_name) : 'gro');
 
-	const filer = initial_filer ?? new Filer();
+	const filer = initial_filer ?? new Filer({log});
 
 	const timings = initial_timings ?? new Timings();
 

package/src/lib/loader.ts

@@ -14,7 +14,7 @@ import {
 	SVELTEKIT_SHIM_APP_PATHS_MATCHER,
 	sveltekit_shim_app_specifiers,
 } from './sveltekit_shim_app.js';
-import {default_sveltekit_config} from './sveltekit_config.js';
+import {default_svelte_config} from './svelte_config.js';
 import {SVELTE_MATCHER, SVELTE_RUNES_MATCHER} from './svelte_helpers.js';
 import {IS_THIS_GRO, paths} from './paths.js';
 import {JSON_MATCHER, NODE_MODULES_DIRNAME, TS_MATCHER} from './constants.js';
@@ -66,7 +66,7 @@ const {
 	svelte_compile_options,
 	svelte_compile_module_options,
 	svelte_preprocessors,
-} = default_sveltekit_config;
+} = default_svelte_config;
 
 const ts_transform_options: esbuild.TransformOptions = {
 	...default_ts_transform_options,