@ryanatkn/gro 0.152.0 → 0.153.0

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/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,

package/src/lib/package.ts

@@ -5,7 +5,7 @@ import type {Src_Json} from './src_json.js';
 
 export const package_json = {
 	name: '@ryanatkn/gro',
-	version: '0.152.0',
+	version: '0.153.0',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -61,7 +61,7 @@ export const package_json = {
 		'@changesets/changelog-git': '^0.2.1',
 		'@changesets/types': '^6.1.0',
 		'@ryanatkn/eslint-config': '^0.8.0',
-		'@ryanatkn/fuz': '^0.139.1',
+		'@ryanatkn/fuz': '^0.139.2',
 		'@ryanatkn/moss': '^0.26.0',
 		'@sveltejs/adapter-static': '^3.0.8',
 		'@sveltejs/kit': '^2.20.8',
@@ -211,14 +211,11 @@ export const package_json = {
 		'./run.task.js': {types: './dist/run.task.d.ts', default: './dist/run.task.js'},
 		'./search_fs.js': {types: './dist/search_fs.d.ts', default: './dist/search_fs.js'},
 		'./src_json.js': {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',
@@ -266,7 +263,7 @@ export const package_json = {
 
 export const src_json = {
 	name: '@ryanatkn/gro',
-	version: '0.152.0',
+	version: '0.153.0',
 	modules: {
 		'.': {
 			path: 'index.ts',
@@ -381,7 +378,7 @@ export const src_json = {
 				{name: 'GRO_DEV_DIR', kind: 'variable'},
 				{name: 'GRO_CONFIG_PATH', kind: 'variable'},
 				{name: 'README_FILENAME', kind: 'variable'},
-				{name: 'SVELTEKIT_CONFIG_FILENAME', kind: 'variable'},
+				{name: 'SVELTE_CONFIG_FILENAME', kind: 'variable'},
 				{name: 'VITE_CONFIG_FILENAME', kind: 'variable'},
 				{name: 'NODE_MODULES_DIRNAME', kind: 'variable'},
 				{name: 'LOCKFILE_FILENAME', kind: 'variable'},
@@ -717,7 +714,6 @@ export const src_json = {
 				{name: 'update_package_json', kind: 'function'},
 				{name: 'to_package_exports', kind: 'function'},
 				{name: 'parse_repo_url', kind: 'function'},
-				{name: 'is_dep', kind: 'function'},
 				{name: 'has_dep', kind: 'function'},
 				{name: 'Package_Json_Dep', kind: 'type'},
 				{name: 'extract_deps', kind: 'function'},
@@ -853,6 +849,7 @@ export const src_json = {
 			declarations: [
 				{name: 'Search_Fs_Options', kind: 'type'},
 				{name: 'search_fs', kind: 'function'},
+				{name: 'find_first_existing_file', kind: 'function'},
 			],
 		},
 		'./src_json.js': {
@@ -868,6 +865,16 @@ export const src_json = {
 				{name: 'to_src_modules', kind: 'function'},
 			],
 		},
+		'./svelte_config.js': {
+			path: 'svelte_config.ts',
+			declarations: [
+				{name: 'load_svelte_config', kind: 'function'},
+				{name: 'Parsed_Svelte_Config', kind: 'type'},
+				{name: 'parse_svelte_config', kind: 'function'},
+				{name: 'to_default_compile_module_options', kind: 'function'},
+				{name: 'default_svelte_config', kind: 'variable'},
+			],
+		},
 		'./svelte_helpers.js': {
 			path: 'svelte_helpers.ts',
 			declarations: [
@@ -875,16 +882,6 @@ export const src_json = {
 				{name: 'SVELTE_RUNES_MATCHER', kind: 'variable'},
 			],
 		},
-		'./sveltekit_config.js': {
-			path: 'sveltekit_config.ts',
-			declarations: [
-				{name: 'load_sveltekit_config', kind: 'function'},
-				{name: 'Parsed_Sveltekit_Config', kind: 'type'},
-				{name: 'init_sveltekit_config', kind: 'function'},
-				{name: 'to_default_compile_module_options', kind: 'function'},
-				{name: 'default_sveltekit_config', kind: 'variable'},
-			],
-		},
 		'./sveltekit_helpers.js': {
 			path: 'sveltekit_helpers.ts',
 			declarations: [

package/src/lib/package_json.ts

@@ -347,11 +347,6 @@ const parse_or_throw_formatted_error = <T extends z.ZodTypeAny>(
 	return parsed.data;
 };
 
-export const is_dep = (
-	dep_name: string,
-	package_json: Package_Json = load_package_json(),
-): boolean => package_json.name === dep_name;
-
 export const has_dep = (
 	dep_name: string,
 	package_json: Package_Json = load_package_json(),

package/src/lib/paths.ts

@@ -10,7 +10,7 @@ import {
 	SOURCE_DIR,
 	SVELTEKIT_DIST_DIRNAME,
 } from './constants.js';
-import {default_sveltekit_config} from './sveltekit_config.js';
+import {default_svelte_config} from './svelte_config.js';
 import type {Path_Id} from './path.js';
 
 /*
@@ -20,10 +20,10 @@ It's the same name that Rollup uses.
 
 */
 
-export const LIB_DIRNAME = basename(default_sveltekit_config.lib_path);
+export const LIB_DIRNAME = basename(default_svelte_config.lib_path);
 export const LIB_PATH = SOURCE_DIR + LIB_DIRNAME;
 export const LIB_DIR = LIB_PATH + '/';
-export const ROUTES_DIRNAME = basename(default_sveltekit_config.routes_path);
+export const ROUTES_DIRNAME = basename(default_svelte_config.routes_path);
 
 export interface Paths {
 	root: string;

package/src/lib/run_gen.ts

@@ -14,7 +14,7 @@ import {
 import {print_path, to_root_path} from './paths.js';
 import type {format_file as base_format_file} from './format_file.js';
 import type {Gro_Config} from './gro_config.js';
-import {default_sveltekit_config} from './sveltekit_config.js';
+import {default_svelte_config} from './svelte_config.js';
 
 export const GEN_NO_PROD_MESSAGE = 'gen runs only during development';
 
@@ -37,7 +37,7 @@ export const run_gen = async (
 			// Perform code generation by calling `gen` on the module.
 			const gen_ctx: Gen_Context = {
 				config,
-				sveltekit_config: default_sveltekit_config,
+				svelte_config: default_svelte_config,
 				origin_id: id,
 				origin_path: to_root_path(id),
 				log,

package/src/lib/run_task.ts

@@ -8,7 +8,7 @@ import type {invoke_task as base_invoke_task} from './invoke_task.js';
 import {log_task_help} from './task_logging.js';
 import type {Gro_Config} from './gro_config.js';
 import {Task_Error, type Task_Module_Meta} from './task.js';
-import {default_sveltekit_config} from './sveltekit_config.js';
+import {default_svelte_config} from './svelte_config.js';
 import type {Filer} from './filer.js';
 
 export type Run_Task_Result =
@@ -55,7 +55,7 @@ export const run_task = async (
 		output = await task.run({
 			args,
 			config,
-			sveltekit_config: default_sveltekit_config,
+			svelte_config: default_svelte_config,
 			filer,
 			log,
 			timings,

package/src/lib/search_fs.ts

@@ -90,3 +90,12 @@ const crawl = (
 	}
 	return paths;
 };
+
+export const find_first_existing_file = (paths: Array<string>): string | null => {
+	for (const path of paths) {
+		if (existsSync(path)) {
+			return path;
+		}
+	}
+	return null;
+};

package/src/lib/{sveltekit_config.ts → svelte_config.ts}

@@ -1,8 +1,9 @@
-import type {Config as SveltekitConfig} from '@sveltejs/kit';
+import type {Config as SvelteConfig} from '@sveltejs/kit';
 import type {CompileOptions, ModuleCompileOptions, PreprocessorGroup} from 'svelte/compiler';
 import {join} from 'node:path';
+import {EMPTY_OBJECT} from '@ryanatkn/belt/object.js';
 
-import {SVELTEKIT_CONFIG_FILENAME} from './constants.js';
+import {SVELTE_CONFIG_FILENAME} from './constants.js';
 
 /*
 
@@ -14,11 +15,12 @@ This module is intended to have minimal dependencies to avoid over-imports in th
  * Loads a SvelteKit config at `dir`.
  * @returns `null` if no config is found
  */
-export const load_sveltekit_config = async (
-	dir: string = process.cwd(),
-): Promise<SveltekitConfig | null> => {
+export const load_svelte_config = async ({
+	dir = process.cwd(),
+	config_filename = SVELTE_CONFIG_FILENAME,
+}: {dir?: string; config_filename?: string} = EMPTY_OBJECT): Promise<SvelteConfig | null> => {
 	try {
-		return (await import(join(dir, SVELTEKIT_CONFIG_FILENAME))).default;
+		return (await import(join(dir, config_filename))).default;
 	} catch (_err) {
 		return null;
 	}
@@ -28,13 +30,13 @@ export const load_sveltekit_config = async (
  * A subset of SvelteKit's config in a form that Gro uses
  * because SvelteKit doesn't expose its config resolver.
  * Flattens things out to keep them simple and easy to pass around,
- * and doesn't deal with most properties.
+ * and doesn't deal with most properties, but includes the full `svelte_config`.
  * The `base` and `assets` in particular are renamed for clarity with Gro's internal systems,
  * so these properties become first-class vocabulary inside Gro.
  */
-export interface Parsed_Sveltekit_Config {
+export interface Parsed_Svelte_Config {
 	// TODO probably fill these out with defaults
-	sveltekit_config: SveltekitConfig | null;
+	svelte_config: SvelteConfig | null;
 	alias: Record<string, string>;
 	base_url: '' | `/${string}` | undefined;
 	assets_url: '' | `http://${string}` | `https://${string}` | undefined;
@@ -64,15 +66,22 @@ export interface Parsed_Sveltekit_Config {
 // TODO currently incomplete and hack - maybe rethink
 /**
  * Returns Gro-relevant properties of a SvelteKit config
- * as a convenience wrapper around `load_sveltekit_config`.
+ * as a convenience wrapper around `load_svelte_config`.
  * Needed because SvelteKit doesn't expose its config resolver.
  */
-export const init_sveltekit_config = async (
-	dir_or_config: string | SveltekitConfig = process.cwd(),
-): Promise<Parsed_Sveltekit_Config> => {
-	const sveltekit_config =
-		typeof dir_or_config === 'string' ? await load_sveltekit_config(dir_or_config) : dir_or_config;
-	const kit = sveltekit_config?.kit;
+export const parse_svelte_config = async ({
+	dir_or_config = process.cwd(), // TODO maybe not the best API, maybe a type union? `({svelte_config} | {dir}) & {config_filename}`
+	config_filename = SVELTE_CONFIG_FILENAME,
+}: {
+	dir_or_config?: string | SvelteConfig;
+	config_filename?: string;
+} = EMPTY_OBJECT): Promise<Parsed_Svelte_Config> => {
+	const svelte_config =
+		typeof dir_or_config === 'string'
+			? await load_svelte_config({dir: dir_or_config, config_filename})
+			: dir_or_config;
+
+	const kit = svelte_config?.kit;
 
 	const alias = {$lib: 'src/lib', ...kit?.alias};
 
@@ -88,17 +97,17 @@ export const init_sveltekit_config = async (
 	const private_prefix = kit?.env?.privatePrefix;
 	const public_prefix = kit?.env?.publicPrefix;
 
-	const svelte_compile_options: CompileOptions = sveltekit_config?.compilerOptions ?? {};
+	const svelte_compile_options: CompileOptions = svelte_config?.compilerOptions ?? {};
 	// Change the default to `generate: 'server'`,
 	// because SvelteKit handles the client in the normal cases.
 	if (svelte_compile_options.generate === undefined) {
 		svelte_compile_options.generate = 'server';
 	}
 	const svelte_compile_module_options = to_default_compile_module_options(svelte_compile_options); // TODO will kit have these separately?
-	const svelte_preprocessors = sveltekit_config?.preprocess;
+	const svelte_preprocessors = svelte_config?.preprocess;
 
 	return {
-		sveltekit_config,
+		svelte_config,
 		alias,
 		base_url,
 		assets_url,
@@ -119,9 +128,10 @@ export const to_default_compile_module_options = ({
 	generate,
 	filename,
 	rootDir,
-}: CompileOptions): ModuleCompileOptions => ({dev, generate, filename, rootDir});
+	warningFilter,
+}: CompileOptions): ModuleCompileOptions => ({dev, generate, filename, rootDir, warningFilter});
 
 /**
  * The parsed SvelteKit config for the cwd, cached globally at the module level.
  */
-export const default_sveltekit_config = await init_sveltekit_config(); // always load it to keep things simple ahead
+export const default_svelte_config = await parse_svelte_config(); // always load it to keep things simple ahead

package/src/lib/sveltekit_helpers.ts

@@ -4,8 +4,8 @@ import type {Logger} from '@ryanatkn/belt/log.js';
 import {join} from 'node:path';
 
 import {Package_Json, has_dep} from './package_json.js';
-import {default_sveltekit_config, type Parsed_Sveltekit_Config} from './sveltekit_config.js';
-import {SVELTEKIT_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME, PM_CLI_DEFAULT} from './constants.js';
+import {default_svelte_config, type Parsed_Svelte_Config} from './svelte_config.js';
+import {SVELTE_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME, PM_CLI_DEFAULT} from './constants.js';
 import {find_cli, spawn_cli, to_cli_name, type Cli} from './cli.js';
 import {Task_Error} from './task.js';
 import {serialize_args, to_forwarded_args} from './args.js';
@@ -22,9 +22,11 @@ export const VITE_CLI = 'vite';
 export const SVELTEKIT_ENV_MATCHER = /^\$env\/(static|dynamic)\/(public|private)$/;
 export const SVELTEKIT_GLOBAL_SPECIFIER = /^\$(env|app)\//;
 
-export const has_sveltekit_app = (): Result<object, {message: string}> => {
-	if (!existsSync(SVELTEKIT_CONFIG_FILENAME)) {
-		return {ok: false, message: `no SvelteKit config found at ${SVELTEKIT_CONFIG_FILENAME}`};
+export const has_sveltekit_app = (
+	svelte_config_path: string = SVELTE_CONFIG_FILENAME,
+): Result<object, {message: string}> => {
+	if (!existsSync(svelte_config_path)) {
+		return {ok: false, message: `no SvelteKit config found at ${SVELTE_CONFIG_FILENAME}`};
 	}
 	// TODO check for routes?
 	return {ok: true};
@@ -32,7 +34,7 @@ export const has_sveltekit_app = (): Result<object, {message: string}> => {
 
 export const has_sveltekit_library = (
 	package_json: Package_Json,
-	sveltekit_config: Parsed_Sveltekit_Config = default_sveltekit_config,
+	svelte_config: Parsed_Svelte_Config = default_svelte_config,
 	dep_name = SVELTE_PACKAGE_DEP_NAME,
 ): Result<object, {message: string}> => {
 	const has_sveltekit_app_result = has_sveltekit_app();
@@ -40,8 +42,8 @@ export const has_sveltekit_library = (
 		return has_sveltekit_app_result;
 	}
 
-	if (!existsSync(sveltekit_config.lib_path)) {
-		return {ok: false, message: `no SvelteKit lib directory found at ${sveltekit_config.lib_path}`};
+	if (!existsSync(svelte_config.lib_path)) {
+		return {ok: false, message: `no SvelteKit lib directory found at ${svelte_config.lib_path}`};
 	}
 
 	if (!has_dep(dep_name, package_json)) {

package/src/lib/sveltekit_shim_app.ts

@@ -1,4 +1,4 @@
-import type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
+import type {Parsed_Svelte_Config} from './svelte_config.js';
 
 export const SVELTEKIT_SHIM_APP_PATHS_MATCHER = /\/util\/sveltekit_shim_app_paths\.js$/;
 export const SVELTEKIT_SHIM_APP_ENVIRONMENT_MATCHER = /\/util\/sveltekit_shim_app_environment\.js$/;
@@ -16,8 +16,8 @@ export const sveltekit_shim_app_specifiers = new Map([
 ]);
 
 export const render_sveltekit_shim_app_paths = (
-	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'] = '',
 ): string => `// shim for $app/paths
 // @see https://github.com/sveltejs/kit/issues/1485
 

package/src/lib/task.ts

@@ -9,7 +9,7 @@ import {isAbsolute, join, relative} from 'node:path';
 import type {Args} from './args.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 {
 	resolve_input_files,
 	resolve_input_paths,
@@ -35,10 +35,10 @@ export interface Task<
 export interface Task_Context<T_Args = object> {
 	args: T_Args;
 	config: Gro_Config;
-	sveltekit_config: Parsed_Sveltekit_Config;
+	svelte_config: Parsed_Svelte_Config;
 	filer: Filer;
 	// TODO should this go here or on `config` for convenience?
-	// sveltekit_config: Parsed_Sveltekit_Config;
+	// svelte_config: Parsed_Svelte_Config;
 	log: Logger;
 	timings: Timings;
 	invoke_task: (task_name: string, args?: Args, config?: Gro_Config) => Promise<void>;

package/src/lib/upgrade.task.ts

@@ -66,10 +66,12 @@ export const task: Task<Args> = {
 		}
 
 		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});
 		}
 
@@ -102,6 +104,13 @@ export const task: Task<Args> = {
 		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/dist/sveltekit_config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sveltekit_config.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/sveltekit_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,eAAe,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAC,cAAc,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAW7F;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GACjC,MAAK,MAAsB,KACzB,OAAO,CAAC,eAAe,GAAG,IAAI,CAMhC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,WAAW,uBAAuB;IAEvC,gBAAgB,EAAE,eAAe,GAAG,IAAI,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,QAAQ,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,UAAU,EAAE,EAAE,GAAG,UAAU,MAAM,EAAE,GAAG,WAAW,MAAM,EAAE,GAAG,SAAS,CAAC;IAGtE;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,sBAAsB,EAAE,cAAc,CAAC;IACvC,6BAA6B,EAAE,oBAAoB,CAAC;IACpD,oBAAoB,EAAE,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC;CAC/E;AAGD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,GACjC,gBAAe,MAAM,GAAG,eAA+B,KACrD,OAAO,CAAC,uBAAuB,CA2CjC,CAAC;AAEF,eAAO,MAAM,iCAAiC,GAAI,uCAK/C,cAAc,KAAG,oBAA4D,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,wBAAwB,yBAAgC,CAAC"}