@ryanatkn/gro 0.174.0 → 0.174.2

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AA2EvD,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,QA0GlB,CAAC;AAEF,cAAc;AACd,eAAO,MAAM,OAAO,EAAE,WAqDrB,CAAC"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AA2EvD,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,QA0GlB,CAAC;AAEF,cAAc;AACd,eAAO,MAAM,OAAO,EAAE,WAsDrB,CAAC"}

package/dist/loader.js

@@ -169,6 +169,11 @@ export const resolve = async (specifier, context, nextResolve) => {
             shortCircuit: true,
         };
     }
+    // Support SvelteKit `$app` imports, including from node_modules
+    const shimmed = sveltekit_shim_app_specifiers.get(s);
+    if (shimmed !== undefined) {
+        return nextResolve(shimmed, context);
+    }
     // Special case for Gro's dependencies that import into Gro.
     // Without this, we'd need to add a dev dep to Gro for Gro, which causes problems.
     // TODO maybe make this generic, checking `package_json.name` against `s` and map it, possibly need to export `resolve_exported_value`
@@ -179,10 +184,6 @@ export const resolve = async (specifier, context, nextResolve) => {
     if (!parent_url || NODE_MODULES_MATCHER.test(parent_url)) {
         return nextResolve(s, context);
     }
-    const shimmed = sveltekit_shim_app_specifiers.get(s);
-    if (shimmed !== undefined) {
-        return nextResolve(shimmed, context);
-    }
     s = map_sveltekit_aliases(s, aliases);
     // The specifier has now been mapped to its final form, so we can inspect it.
     // Imports into `node_modules` use the default algorithm, and the rest use use Vite conventions.

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

@@ -1 +1 @@
-{"version":3,"file":"publish.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/publish.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAYtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAQhD,cAAc;AACd,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;kBAuCf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA0J3B,CAAC"}
+{"version":3,"file":"publish.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/publish.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAYtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAQhD,cAAc;AACd,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;kBAuCf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CAkK3B,CAAC"}

package/dist/publish.task.js

@@ -54,7 +54,7 @@ export const Args = z.strictObject({
 export const task = {
     summary: 'bump version, publish to the configured registry, and git push',
     Args,
-    run: async ({ args, log, invoke_task }) => {
+    run: async ({ args, log, invoke_task, config }) => {
         const { branch, origin, changelog, preserve_changelog, dry, check, build, pull, sync, install, optional, changeset_cli, } = args;
         if (dry) {
             log.info(st('green', 'dry run!'));
@@ -111,8 +111,8 @@ export const task = {
                     ' or an object with the `url` key');
             }
             // This is the first line that alters the repo.
-            const changeset_ersion_result = await spawn_cli(found_changeset_cli, ['version'], log);
-            if (!changeset_ersion_result?.ok) {
+            const changeset_version_result = await spawn_cli(found_changeset_cli, ['version'], log);
+            if (!changeset_version_result?.ok) {
                 throw Error('changeset version failed: no commits were made: see the error above');
             }
             if (!preserve_changelog) {
@@ -122,6 +122,13 @@ export const task = {
                 }
                 await update_changelog(parsed_repo_url.owner, parsed_repo_url.repo, changelog, token, log);
             }
+            // Update package-lock.json to reflect the new version.
+            if (install) {
+                const install_result = await spawn(config.pm_cli, ['install']);
+                if (!install_result.ok) {
+                    throw new Task_Error(`Failed \`${config.pm_cli} install\` after version bump`);
+                }
+            }
             // Regenerate files that depend on package.json version.
             // The check above ensures gen is updated.
             await invoke_task('gen');

package/dist/sveltekit_shim_app_state.js

@@ -16,7 +16,7 @@ export const page = {
     route: { id: null },
     state: {},
     status: -1,
-    url: new URL('https://github.com/ryanatkn/gro'),
+    url: new URL('https://github.com/ryanatkn/gro'), // TODO maybe use package.json?
 };
 export const updated = {
     current: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.174.0",
+  "version": "0.174.2",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -83,7 +83,7 @@
     "@changesets/changelog-git": "^0.2.1",
     "@changesets/types": "^6.1.0",
     "@ryanatkn/eslint-config": "^0.9.0",
-    "@ryanatkn/fuz": "^0.155.0",
+    "@ryanatkn/fuz": "^0.156.0",
     "@ryanatkn/moss": "^0.37.0",
     "@sveltejs/adapter-static": "^3.0.10",
     "@sveltejs/kit": "^2.47.2",

package/src/lib/loader.ts

@@ -206,6 +206,12 @@ export const resolve: ResolveHook = async (specifier, context, nextResolve) => {
 		};
 	}
 
+	// Support SvelteKit `$app` imports, including from node_modules
+	const shimmed = sveltekit_shim_app_specifiers.get(s);
+	if (shimmed !== undefined) {
+		return nextResolve(shimmed, context);
+	}
+
 	// Special case for Gro's dependencies that import into Gro.
 	// Without this, we'd need to add a dev dep to Gro for Gro, which causes problems.
 	// TODO maybe make this generic, checking `package_json.name` against `s` and map it, possibly need to export `resolve_exported_value`
@@ -218,11 +224,6 @@ export const resolve: ResolveHook = async (specifier, context, nextResolve) => {
 		return nextResolve(s, context);
 	}
 
-	const shimmed = sveltekit_shim_app_specifiers.get(s);
-	if (shimmed !== undefined) {
-		return nextResolve(shimmed, context);
-	}
-
 	s = map_sveltekit_aliases(s, aliases);
 
 	// The specifier has now been mapped to its final form, so we can inspect it.

package/src/lib/publish.task.ts

@@ -66,7 +66,7 @@ export type Args = z.infer<typeof Args>;
 export const task: Task<Args> = {
 	summary: 'bump version, publish to the configured registry, and git push',
 	Args,
-	run: async ({args, log, invoke_task}): Promise<void> => {
+	run: async ({args, log, invoke_task, config}): Promise<void> => {
 		const {
 			branch,
 			origin,
@@ -151,8 +151,8 @@ export const task: Task<Args> = {
 
 			// This is the first line that alters the repo.
 
-			const changeset_ersion_result = await spawn_cli(found_changeset_cli, ['version'], log);
-			if (!changeset_ersion_result?.ok) {
+			const changeset_version_result = await spawn_cli(found_changeset_cli, ['version'], log);
+			if (!changeset_version_result?.ok) {
 				throw Error('changeset version failed: no commits were made: see the error above');
 			}
 
@@ -166,6 +166,14 @@ export const task: Task<Args> = {
 				await update_changelog(parsed_repo_url.owner, parsed_repo_url.repo, changelog, token, log);
 			}
 
+			// Update package-lock.json to reflect the new version.
+			if (install) {
+				const install_result = await spawn(config.pm_cli, ['install']);
+				if (!install_result.ok) {
+					throw new Task_Error(`Failed \`${config.pm_cli} install\` after version bump`);
+				}
+			}
+
 			// Regenerate files that depend on package.json version.
 			// The check above ensures gen is updated.
 			await invoke_task('gen');

package/src/lib/sveltekit_shim_app_state.ts

@@ -24,7 +24,7 @@ export const page: typeof base_page = {
 	route: {id: null},
 	state: {},
 	status: -1,
-	url: new URL('https://github.com/ryanatkn/gro') as any,
+	url: new URL('https://github.com/ryanatkn/gro') as any, // TODO maybe use package.json?
 };
 
 export const updated: typeof base_updated = {