@ryanatkn/gro 0.152.0 → 0.153.1

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"}