@ryanatkn/gro 0.185.0 → 0.186.0

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,WAsDrB,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;AAoEvD,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,QA0GlB,CAAC;AAEF,cAAc;AACd,eAAO,MAAM,OAAO,EAAE,WA+CrB,CAAC"}

package/dist/loader.js

@@ -1,14 +1,13 @@
 import { compile, compileModule, preprocess } from 'svelte/compiler';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { dirname, join } from 'node:path';
-import { escape_regexp } from '@fuzdev/fuz_util/regexp.js';
 import { readFileSync } from 'node:fs';
 import ts_blank_space from 'ts-blank-space';
 import { render_env_shim_module } from "./sveltekit_shim_env.js";
 import { render_sveltekit_shim_app_environment, render_sveltekit_shim_app_paths, SVELTEKIT_SHIM_APP_ENVIRONMENT_MATCHER, SVELTEKIT_SHIM_APP_PATHS_MATCHER, sveltekit_shim_app_specifiers, } from "./sveltekit_shim_app.js";
 import { default_svelte_config } from "./svelte_config.js";
-import { IS_THIS_GRO, paths } from "./paths.js";
-import { NODE_MODULES_DIRNAME, TS_MATCHER, SVELTE_MATCHER, SVELTE_RUNES_MATCHER, } from "./constants.js";
+import { paths } from "./paths.js";
+import { TS_MATCHER, SVELTE_MATCHER, SVELTE_RUNES_MATCHER } from "./constants.js";
 import { resolve_specifier } from "./resolve_specifier.js";
 import { map_sveltekit_aliases } from "./sveltekit_helpers.js";
 // TODO get out of the loader business, starting with https://nodejs.org/api/typescript.html#type-stripping
@@ -43,7 +42,6 @@ const dir = paths.root;
 const { alias, base_url, assets_url, env_dir, private_prefix, public_prefix, svelte_compile_options, svelte_compile_module_options, svelte_preprocessors, } = default_svelte_config;
 const aliases = Object.entries(alias);
 const RAW_MATCHER = /(%3Fraw|\.css|\.svg)$/; // TODO others? configurable?
-const NODE_MODULES_MATCHER = new RegExp(escape_regexp('/' + NODE_MODULES_DIRNAME + '/'), 'u');
 /** @nodocs */
 export const load = async (url, context, nextLoad) => {
     // console.log(`url`, url);
@@ -174,22 +172,17 @@ export const resolve = async (specifier, context, nextResolve) => {
     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`
-    if (IS_THIS_GRO && s.startsWith('@ryanatkn/gro')) {
-        s = join(dir, 'dist', s.substring(13));
-    }
-    const parent_url = context.parentURL;
-    if (!parent_url || NODE_MODULES_MATCHER.test(parent_url)) {
-        return nextResolve(s, context);
-    }
+    // Apply SvelteKit aliases (handles self-referencing packages like @fuzdev/fuz_util -> src/lib)
     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.
+    // Bare specifiers (not starting with . or /) use Node's default resolution
     if (s[0] !== '.' && s[0] !== '/') {
         return nextResolve(s, context);
     }
+    // Resolve paths using Vite conventions
+    const parent_url = context.parentURL;
+    if (!parent_url) {
+        return nextResolve(s, context);
+    }
     const resolved = await resolve_specifier(s, dirname(fileURLToPath(parent_url)));
     return {
         url: pathToFileURL(resolved.path_id_with_querystring).href,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.185.0",
+  "version": "0.186.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -60,7 +60,7 @@
     "zod": "^4.1.13"
   },
   "peerDependencies": {
-    "@fuzdev/fuz_util": ">=0.42.0",
+    "@fuzdev/fuz_util": ">=0.45.3",
     "@sveltejs/kit": "^2",
     "esbuild": "^0.27.0",
     "svelte": "^5",
@@ -82,8 +82,8 @@
     "@changesets/changelog-git": "^0.2.1",
     "@changesets/types": "^6.1.0",
     "@fuzdev/fuz_code": "^0.38.0",
-    "@fuzdev/fuz_css": "^0.42.1",
-    "@fuzdev/fuz_ui": "^0.177.0",
+    "@fuzdev/fuz_css": "^0.44.1",
+    "@fuzdev/fuz_ui": "^0.178.1",
     "@fuzdev/fuz_util": "^0.45.3",
     "@ryanatkn/eslint-config": "^0.9.0",
     "@sveltejs/adapter-static": "^3.0.10",
@@ -91,6 +91,7 @@
     "@sveltejs/package": "^2.5.7",
     "@sveltejs/vite-plugin-svelte": "^6.2.1",
     "@types/node": "^24.10.1",
+    "@webref/css": "^8.2.0",
     "esbuild": "^0.27.1",
     "eslint": "^9.39.1",
     "eslint-plugin-svelte": "^3.13.1",

package/src/lib/loader.ts

@@ -2,7 +2,6 @@ import {compile, compileModule, preprocess} from 'svelte/compiler';
 import {fileURLToPath, pathToFileURL} from 'node:url';
 import {dirname, join} from 'node:path';
 import type {LoadHook, ResolveHook} from 'node:module';
-import {escape_regexp} from '@fuzdev/fuz_util/regexp.js';
 import {readFileSync} from 'node:fs';
 import ts_blank_space from 'ts-blank-space';
 
@@ -15,13 +14,8 @@ import {
 	sveltekit_shim_app_specifiers,
 } from './sveltekit_shim_app.ts';
 import {default_svelte_config} from './svelte_config.ts';
-import {IS_THIS_GRO, paths} from './paths.ts';
-import {
-	NODE_MODULES_DIRNAME,
-	TS_MATCHER,
-	SVELTE_MATCHER,
-	SVELTE_RUNES_MATCHER,
-} from './constants.ts';
+import {paths} from './paths.ts';
+import {TS_MATCHER, SVELTE_MATCHER, SVELTE_RUNES_MATCHER} from './constants.ts';
 import {resolve_specifier} from './resolve_specifier.ts';
 import {map_sveltekit_aliases} from './sveltekit_helpers.ts';
 
@@ -74,7 +68,6 @@ const {
 const aliases = Object.entries(alias);
 
 const RAW_MATCHER = /(%3Fraw|\.css|\.svg)$/; // TODO others? configurable?
-const NODE_MODULES_MATCHER = new RegExp(escape_regexp('/' + NODE_MODULES_DIRNAME + '/'), 'u');
 
 /** @nodocs */
 export const load: LoadHook = async (url, context, nextLoad) => {
@@ -212,24 +205,17 @@ export const resolve: ResolveHook = async (specifier, context, nextResolve) => {
 		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`
-	if (IS_THIS_GRO && s.startsWith('@ryanatkn/gro')) {
-		s = join(dir, 'dist', s.substring(13));
-	}
+	// Apply SvelteKit aliases (handles self-referencing packages like @fuzdev/fuz_util -> src/lib)
+	s = map_sveltekit_aliases(s, aliases);
 
-	const parent_url = context.parentURL;
-	if (!parent_url || NODE_MODULES_MATCHER.test(parent_url)) {
+	// Bare specifiers (not starting with . or /) use Node's default resolution
+	if (s[0] !== '.' && s[0] !== '/') {
 		return nextResolve(s, 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.
-	if (s[0] !== '.' && s[0] !== '/') {
+	// Resolve paths using Vite conventions
+	const parent_url = context.parentURL;
+	if (!parent_url) {
 		return nextResolve(s, context);
 	}