@ryanatkn/gro 0.151.2 → 0.153.0

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.151.2',
+	version: '0.153.0',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -49,32 +49,32 @@ export const package_json = {
 		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', svelte: '^5'},
 	devDependencies: {
 		'@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: {'@ryanatkn/moss': '^0.26.0'},
@@ -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',
@@ -239,9 +236,9 @@ export const package_json = {
 			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',
@@ -266,7 +263,7 @@ export const package_json = {
 
 export const src_json = {
 	name: '@ryanatkn/gro',
-	version: '0.151.2',
+	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: [
@@ -943,10 +940,9 @@ export const src_json = {
 				{name: 'resolveRoute', kind: 'function'},
 			],
 		},
-		'./sveltekit_shim_app_stores.js': {
-			path: 'sveltekit_shim_app_stores.ts',
+		'./sveltekit_shim_app_state.js': {
+			path: 'sveltekit_shim_app_state.ts',
 			declarations: [
-				{name: 'getStores', kind: 'function'},
 				{name: 'navigating', kind: 'variable'},
 				{name: 'page', kind: 'variable'},
 				{name: 'updated', kind: 'variable'},

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$/;
@@ -12,12 +12,12 @@ export const sveltekit_shim_app_specifiers = new Map([
 	['$app/forms', '@ryanatkn/gro/sveltekit_shim_app_forms.js'],
 	['$app/navigation', '@ryanatkn/gro/sveltekit_shim_app_navigation.js'],
 	['$app/paths', '@ryanatkn/gro/sveltekit_shim_app_paths.js'],
-	['$app/stores', '@ryanatkn/gro/sveltekit_shim_app_stores.js'],
+	['$app/state', '@ryanatkn/gro/sveltekit_shim_app_state.js'],
 ]);
 
 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/sveltekit_shim_app_state.ts

@@ -0,0 +1,35 @@
+// shim for $app/state
+// @see https://github.com/sveltejs/kit/issues/1485
+
+import type {
+	navigating as base_navigating,
+	page as base_page,
+	updated as base_updated,
+} from '$app/state';
+
+export const navigating: typeof base_navigating = {
+	from: null,
+	to: null,
+	type: null,
+	willUnload: null,
+	delta: null,
+	complete: null,
+};
+
+export const page: typeof base_page = {
+	data: {},
+	form: null,
+	error: null,
+	params: {},
+	route: {id: null},
+	state: {},
+	status: -1,
+	url: new URL('https://github.com/ryanatkn/gro'),
+};
+
+export const updated: typeof base_updated = {
+	current: false,
+	check: () => {
+		throw new Error('Can only call updated.check() in the browser');
+	},
+};

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

@@ -1,11 +1,13 @@
 import {spawn} from '@ryanatkn/belt/process.js';
 import {z} from 'zod';
+import {rmSync} from 'node:fs';
 
 import {Task_Error, type Task} from './task.js';
 import {extract_deps, load_package_json, type Package_Json_Dep} 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({
@@ -20,6 +22,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();
@@ -29,7 +43,18 @@ export const task: Task<Args> = {
 	summary: 'upgrade deps',
 	Args,
 	run: async ({args, log, config}): Promise<void> => {
-		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.');
@@ -40,6 +65,16 @@ export const task: Task<Args> = {
 			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);
@@ -69,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"}

package/dist/sveltekit_shim_app_stores.d.ts

@@ -1,6 +0,0 @@
-import type { getStores as base_getStores, navigating as base_navigating, page as base_page, updated as base_updated } from '$app/stores';
-export declare const getStores: typeof base_getStores;
-export declare const navigating: typeof base_navigating;
-export declare const page: typeof base_page;
-export declare const updated: typeof base_updated;
-//# sourceMappingURL=sveltekit_shim_app_stores.d.ts.map

package/dist/sveltekit_shim_app_stores.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sveltekit_shim_app_stores.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/sveltekit_shim_app_stores.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACX,SAAS,IAAI,cAAc,EAC3B,UAAU,IAAI,eAAe,EAC7B,IAAI,IAAI,SAAS,EACjB,OAAO,IAAI,YAAY,EACvB,MAAM,aAAa,CAAC;AAGrB,eAAO,MAAM,SAAS,EAAE,OAAO,cAA6D,CAAC;AAC7F,eAAO,MAAM,UAAU,EAAE,OAAO,eAAgC,CAAC;AACjE,eAAO,MAAM,IAAI,EAAE,OAAO,SASxB,CAAC;AACH,eAAO,MAAM,OAAO,EAAE,OAAO,YAAoC,CAAC"}

package/dist/sveltekit_shim_app_stores.js

@@ -1,17 +0,0 @@
-// shim for $app/stores
-// @see https://github.com/sveltejs/kit/issues/1485
-import { readable } from 'svelte/store';
-export const getStores = () => ({ navigating, page, updated });
-export const navigating = readable(null);
-export const page = readable({
-    url: new URL('https://gro.ryanatkn.com/TODO'),
-    params: {},
-    route: { id: 'RouteId' },
-    status: 200,
-    error: null,
-    data: {},
-    state: {},
-    form: {},
-});
-export const updated = readable(true);
-updated.check = () => Promise.resolve(true);

package/src/lib/sveltekit_shim_app_stores.ts

@@ -1,28 +0,0 @@
-// shim for $app/stores
-// @see https://github.com/sveltejs/kit/issues/1485
-
-// TODO support `$app/state`
-/* eslint-disable @typescript-eslint/no-deprecated */
-
-import type {
-	getStores as base_getStores,
-	navigating as base_navigating,
-	page as base_page,
-	updated as base_updated,
-} from '$app/stores';
-import {readable} from 'svelte/store';
-
-export const getStores: typeof base_getStores = () => ({navigating, page, updated}) as const;
-export const navigating: typeof base_navigating = readable(null);
-export const page: typeof base_page = readable({
-	url: new URL('https://gro.ryanatkn.com/TODO'),
-	params: {},
-	route: {id: 'RouteId'},
-	status: 200,
-	error: null,
-	data: {},
-	state: {},
-	form: {},
-});
-export const updated: typeof base_updated = readable(true) as any;
-updated.check = () => Promise.resolve(true);