svelte-ag 1.0.18 → 1.0.20

package/dist/lib/api/form.svelte.d.ts

@@ -20,10 +20,12 @@ export type ApiRequestForm<API extends ApiEndpoints> = <Path extends API['path']
     method: Method;
     /**
      * Optional lifecycle hooks for consumers.
+     * - `beforeRequest`: called before sending the api call
      * - `onSuccess`: called after a successful response body is parsed.
      * - `onFail`: called after an error response body is parsed and mapped to form errors/messages.
      */
     actions?: {
+        beforeRequest?: (form: SuperValidated<ValidInput<API, Path, Method>>) => void | Promise<void>;
         onSuccess?: (form: SuperValidated<ValidInput<API, Path, Method>>, response: ApiSuccessBody<API, Path, Method>) => void | Promise<void>;
         onFail?: (form: SuperValidated<ValidInput<API, Path, Method>>, response: ApiErrorBody<API, Path, Method>) => void | Promise<void>;
     };

package/dist/lib/api/form.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/api/form.svelte.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkC,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtH,OAAO,KAAK,EACV,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,SAAS,EACV,MAAM,OAAO,CAAC;AAMf,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,WAAW,CACtG,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAClB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,cAAc,CAAC,GAAG,SAAS,YAAY,IAAI,CACrD,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,EACrD,CAAC,EAAE;IACH,qFAAqF;IACrF,IAAI,EAAE,IAAI,CAAC;IAEX,oFAAoF;IACpF,MAAM,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,CACV,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EACnD,QAAQ,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KACxC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,CAAC,EAAE,CACP,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EACnD,QAAQ,EAAE,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KACtC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAC;IAEF;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpD;;;;;;;;;;;;;;;;;OAiBG;IACH,IAAI,CAAC,EAAE;QACL;;;;;WAKG;QACH,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAE9E;;;WAGG;QACH,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;KACtD,CAAC;IAEF;;;OAGG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5E,KAAK,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,SAAS,YAAY,EACzD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7E,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAC/B,cAAc,CAAC,GAAG,CAAC,CAqGrB"}
+{"version":3,"file":"form.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/api/form.svelte.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkC,KAAK,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtH,OAAO,KAAK,EACV,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,SAAS,EACV,MAAM,OAAO,CAAC;AAMf,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,WAAW,CACtG,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAClB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,cAAc,CAAC,GAAG,SAAS,YAAY,IAAI,CACrD,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,EACrD,CAAC,EAAE;IACH,qFAAqF;IACrF,IAAI,EAAE,IAAI,CAAC;IAEX,oFAAoF;IACpF,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9F,SAAS,CAAC,EAAE,CACV,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EACnD,QAAQ,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KACxC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,CAAC,EAAE,CACP,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EACnD,QAAQ,EAAE,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KACtC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAC;IAEF;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpD;;;;;;;;;;;;;;;;;OAiBG;IACH,IAAI,CAAC,EAAE;QACL;;;;;WAKG;QACH,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAE9E;;;WAGG;QACH,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;KACtD,CAAC;IAEF;;;OAGG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5E,KAAK,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,SAAS,YAAY,EACzD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7E,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAC/B,cAAc,CAAC,GAAG,CAAC,CA8GrB"}

package/dist/lib/api/form.svelte.js

@@ -3,7 +3,7 @@ import { valibot } from 'sveltekit-superforms/adapters';
 import { watch } from 'runed';
 import { dequal } from 'dequal';
 import { get } from 'svelte/store';
-import { safeParseAsync } from 'valibot';
+import { safeParse, safeParseAsync } from 'valibot';
 /**
  * Build an endpoint-specific Superforms factory.
  *
@@ -20,7 +20,11 @@ export function createFormFunction(schemas, request) {
         // if (typeof schema === 'function') {
         //   schema = schema();
         // }
-        const form = superForm(defaults(defaultValue, valibot(schema)), {
+        const defaultFormData = defaults(defaultValue, valibot(schema));
+        const boundFormData = bind && schema.async === false
+            ? safeParse(schema, bind.get(defaultFormData)).output
+            : defaultFormData;
+        const form = superForm(boundFormData, {
             SPA: true,
             resetForm: true,
             applyAction: false, // Prevents the form redirecting to the same page on submit
@@ -42,8 +46,11 @@ export function createFormFunction(schemas, request) {
                 }
             },
             async onUpdate({ form }) {
+                if (actions && actions.beforeRequest)
+                    actions.beforeRequest(form);
                 if (!form.valid)
                     return;
+                // console.log('onUpdate: sending data', form.data);
                 const res = await request(path, method, form.data);
                 if (res.ok === false) {
                     const body = await res.json();

package/dist/lib/components/search/components/search.svelte.d.ts

@@ -1,5 +1,5 @@
 import type { SearchProps } from '../types.js';
-declare const Search: import("svelte").Component<SearchProps, {}, "items" | "value" | "ref" | "searchWith">;
+declare const Search: import("svelte").Component<SearchProps, {}, "value" | "items" | "ref" | "searchWith">;
 type Search = ReturnType<typeof Search>;
 export default Search;
 //# sourceMappingURL=search.svelte.d.ts.map

package/dist/lib/vite/vite-plugin-component-source-collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-component-source-collector.d.ts","sourceRoot":"","sources":["../../../src/lib/vite/vite-plugin-component-source-collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,MAAM,CAAC;AAKnD,UAAU,OAAO;IACf;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAKD,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,IAAI,GAAE,OAA8B,GAAG,MAAM,CAsH7F"}
+{"version":3,"file":"vite-plugin-component-source-collector.d.ts","sourceRoot":"","sources":["../../../src/lib/vite/vite-plugin-component-source-collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,MAAM,CAAC;AAKnD,UAAU,OAAO;IACf;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAKD,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,IAAI,GAAE,OAA8B,GAAG,MAAM,CA4J7F"}

package/dist/lib/vite/vite-plugin-component-source-collector.js

@@ -1,6 +1,6 @@
 import { exists, writeIfDifferent } from 'ts-ag';
 import { readFile } from 'fs/promises';
-import { resolve, relative, dirname } from 'path';
+import { resolve, join, relative, dirname } from 'path';
 /** All unique component directories */
 const componentFiles = new Set();
 export default function componentSourceCollector(opts = { safePackages: [] }) {
@@ -8,6 +8,8 @@ export default function componentSourceCollector(opts = { safePackages: [] }) {
     const outFileName = opts.outputFile ?? 'component-sources.css';
     const classRegex = /class(?:=|:)/;
     const importRegex = /@import\s+['"]([^'"]+)['"]/g;
+    let outputFilePath = undefined;
+    let root = undefined;
     // state
     let config;
     let firstRound = true;
@@ -17,13 +19,17 @@ export default function componentSourceCollector(opts = { safePackages: [] }) {
         return classRegex.test(code);
     }
     function addPath(file) {
-        if (file !== '' && // No nothing
+        if (outputFilePath &&
+            file !== '' && // No nothing
             !/\.svelte-kit/.test(file) && // No svelte-kit files
             // No dep files unless marked as safe
             (!/\.pnpm|.vite/.test(file) || opts.safePackages.some((p) => file.includes(`node_modules/${p}`)))) {
-            const outPath = resolve(config.root, outFileName);
             const cleanedFileName = file.replace(/\?v=.*$/, '');
-            componentFiles.add(relative(dirname(outPath), cleanedFileName));
+            const relativeFilePath = relative(dirname(outputFilePath), cleanedFileName);
+            if (relativeFilePath !== outputFilePath) {
+                // Dont add itself
+                componentFiles.add(relativeFilePath);
+            }
         }
     }
     function scheduleInitialWrite() {
@@ -37,34 +43,62 @@ export default function componentSourceCollector(opts = { safePackages: [] }) {
         }, 1000); // adjust delay as needed
     }
     const writeOutFile = async () => {
-        const outPath = resolve(config.root, outFileName);
         const lines = Array.from(componentFiles)
             .map((d) => `@source '${d}';`)
             .sort();
-        const didWrite = await writeIfDifferent(outPath, lines.join('\n'));
-        if (didWrite)
-            console.log('Wrote', lines.length);
+        if (outputFilePath) {
+            const didWrite = await writeIfDifferent(outputFilePath, lines.join('\n'));
+            if (didWrite)
+                console.log('Wrote', lines.length);
+        }
     };
     // ---- plugin ---- //
     return {
         name: 'vite-plugin-component-source-collector',
-        enforce: 'post',
+        enforce: 'pre', // i want to see comments
+        /**
+         * Setup. Add exisitng files to internal state if dev
+         */
         async configResolved(resolved) {
             config = resolved;
-            const outPath = resolve(config.root, outFileName);
+            root = config.root;
+            outputFilePath = resolve(root, outFileName);
             if (config.command === 'build' && firstRound) {
                 componentFiles.clear();
                 firstRound = false;
             }
             else if (config.command === 'serve') {
-                if (await exists(outPath)) {
-                    const fileLines = (await readFile(outPath, 'utf8')).split('\n');
+                if (await exists(outputFilePath)) {
+                    const fileLines = (await readFile(outputFilePath, 'utf8')).split('\n');
                     fileLines.forEach((l) => addPath(l.replace(/@source\s+'(.*?)';/, '$1')));
                     // console.log('config resolved', componentFiles);
                 }
             }
             console.log('tailwind-sources:configResolved:command', config.command);
         },
+        /**
+         * Reset list on lock file changed
+         */
+        configureServer(server) {
+            const lockFiles = [
+                'pnpm-lock.yaml',
+                'package-lock.json',
+                'yarn.lock',
+                'bun.lockb',
+                'bun.lock',
+                'npm-shrinkwrap.json',
+                // pnpm install-state changes:
+                'node_modules/.modules.yaml'
+            ].map((p) => join(root, p));
+            server.watcher.add(lockFiles);
+            const onChange = async (file) => {
+                if (!lockFiles.includes(file))
+                    return;
+                componentFiles.clear();
+            };
+            server.watcher.on('change', onChange);
+            server.watcher.on('add', onChange);
+        },
         buildStart() {
             // console.log('tailwind-sources:buildStart', componentFiles);
             // componentFiles.clear();
@@ -76,9 +110,14 @@ export default function componentSourceCollector(opts = { safePackages: [] }) {
                 const matches = code.matchAll(importRegex);
                 for (const match of matches) {
                     // console.log('MATching', match);
-                    const resolved = await this.resolve(match[1], id);
-                    if (resolved) {
-                        addPath(resolved.id);
+                    try {
+                        const resolved = await this.resolve(match[1], id);
+                        if (resolved) {
+                            addPath(resolved.id);
+                        }
+                    }
+                    catch {
+                        // Cant resolve: dont add
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-ag",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "Useful svelte components",
   "bugs": "https://github.com/ageorgeh/svelte-ag/issues",
   "repository": {
@@ -48,8 +48,7 @@
     "@dnd-kit-svelte/svelte": "^0.1.6",
     "@dnd-kit/helpers": "^0.2.4",
     "@floating-ui/dom": "^1.7.5",
-    "@rollup/pluginutils": "^5.3.0",
-    "@sveltejs/kit": "^2.52.2",
+    "@sveltejs/kit": "^2.53.0",
     "bits-ui": "^2.16.1",
     "bottleneck": "^2.19.5",
     "clsx": "^2.1.1",
@@ -64,7 +63,7 @@
     "sveltekit-superforms": "2.29.1",
     "tailwind-merge": "^3.5.0",
     "tailwind-variants": "^3.2.2",
-    "ts-ag": "^1.0.10",
+    "ts-ag": "^1.0.11",
     "valibot": "^1.2.0"
   },
   "devDependencies": {
@@ -82,9 +81,8 @@
     "@tailwindcss/vite": "^4.2.0",
     "@types/node": "^24.10.13",
     "@typescript/native-preview": "7.0.0-dev.20260219.1",
-    "eslint": "^10.0.0",
+    "eslint": "^10.0.1",
     "eslint-plugin-better-tailwindcss": "^4.3.0",
-    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-svelte": "^3.15.0",
     "globals": "^17.3.0",
     "husky": "^9.1.7",
@@ -92,15 +90,14 @@
     "prettier": "^3.8.1",
     "prettier-plugin-packagejson": "^3.0.0",
     "prettier-plugin-svelte": "^3.5.0",
-    "rollup": "^4.57.1",
     "semantic-release": "^25.0.3",
-    "svelte-check": "^4.4.1",
+    "svelte-check": "^4.4.3",
     "tailwindcss": "4.2.0",
     "tw-animate-css": "^1.4.0",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.56.0",
     "typescript-svelte-plugin": "^0.3.50",
-    "vite": "^7.3.1",
+    "vite": "^8.0.0-beta.15",
     "vitest": "^4.0.18"
   },
   "peerDependencies": {
@@ -113,6 +110,8 @@
       "esbuild",
       "@tailwindcss/oxide"
     ],
-    "overrides": {}
+    "overrides": {
+      "vite": "8.0.0-beta.15"
+    }
   }
 }

package/src/lib/api/form.svelte.ts

@@ -12,7 +12,7 @@ import type {
 import { watch } from 'runed';
 import { dequal } from 'dequal';
 import { get } from 'svelte/store';
-import { safeParseAsync } from 'valibot';
+import { safeParse, safeParseAsync } from 'valibot';
 
 export type ValidInput<E extends ApiEndpoints, P extends E['path'], M extends E['method']> = NonNullable<
   ApiInput<E, P, M>
@@ -40,10 +40,12 @@ export type ApiRequestForm<API extends ApiEndpoints> = <
 
   /**
    * Optional lifecycle hooks for consumers.
+   * - `beforeRequest`: called before sending the api call
    * - `onSuccess`: called after a successful response body is parsed.
    * - `onFail`: called after an error response body is parsed and mapped to form errors/messages.
    */
   actions?: {
+    beforeRequest?: (form: SuperValidated<ValidInput<API, Path, Method>>) => void | Promise<void>;
     onSuccess?: (
       form: SuperValidated<ValidInput<API, Path, Method>>,
       response: ApiSuccessBody<API, Path, Method>
@@ -121,7 +123,13 @@ export function createFormFunction<API extends ApiEndpoints>(
     //   schema = schema();
     // }
 
-    const form = superForm<ValidInput<API, typeof path, typeof method>>(defaults(defaultValue, valibot(schema)), {
+    const defaultFormData = defaults(defaultValue, valibot(schema));
+    const boundFormData =
+      bind && schema.async === false
+        ? (safeParse(schema, bind.get(defaultFormData)).output as ValidInput<API, typeof path, typeof method>)
+        : defaultFormData;
+
+    const form = superForm<ValidInput<API, typeof path, typeof method>>(boundFormData, {
       SPA: true,
       resetForm: true,
       applyAction: false, // Prevents the form redirecting to the same page on submit
@@ -145,8 +153,11 @@ export function createFormFunction<API extends ApiEndpoints>(
         }
       },
       async onUpdate({ form }) {
+        if (actions && actions.beforeRequest) actions.beforeRequest(form);
+
         if (!form.valid) return;
 
+        // console.log('onUpdate: sending data', form.data);
         const res = await request(path, method, form.data);
 
         if (res.ok === false) {

package/src/lib/vite/vite-plugin-component-source-collector.ts

@@ -1,7 +1,7 @@
 import type { Plugin, ResolvedConfig } from 'vite';
 import { exists, writeIfDifferent } from 'ts-ag';
 import { readFile } from 'fs/promises';
-import { resolve, relative, dirname } from 'path';
+import { resolve, join, relative, dirname } from 'path';
 
 interface Options {
   /**
@@ -29,6 +29,9 @@ export default function componentSourceCollector(opts: Options = { safePackages:
   const classRegex = /class(?:=|:)/;
   const importRegex = /@import\s+['"]([^'"]+)['"]/g;
 
+  let outputFilePath: string | undefined = undefined;
+  let root: string | undefined = undefined;
+
   // state
   let config: ResolvedConfig;
   let firstRound = true;
@@ -41,15 +44,19 @@ export default function componentSourceCollector(opts: Options = { safePackages:
 
   function addPath(file: string) {
     if (
+      outputFilePath &&
       file !== '' && // No nothing
       !/\.svelte-kit/.test(file) && // No svelte-kit files
       // No dep files unless marked as safe
       (!/\.pnpm|.vite/.test(file) || opts.safePackages.some((p) => file.includes(`node_modules/${p}`)))
     ) {
-      const outPath = resolve(config.root, outFileName);
       const cleanedFileName = file.replace(/\?v=.*$/, '');
+      const relativeFilePath = relative(dirname(outputFilePath), cleanedFileName);
 
-      componentFiles.add(relative(dirname(outPath), cleanedFileName));
+      if (relativeFilePath !== outputFilePath) {
+        // Dont add itself
+        componentFiles.add(relativeFilePath);
+      }
     }
   }
 
@@ -64,32 +71,36 @@ export default function componentSourceCollector(opts: Options = { safePackages:
   }
 
   const writeOutFile = async () => {
-    const outPath = resolve(config.root, outFileName);
-
     const lines = Array.from(componentFiles)
       .map((d) => `@source '${d}';`)
       .sort();
 
-    const didWrite = await writeIfDifferent(outPath, lines.join('\n'));
-    if (didWrite) console.log('Wrote', lines.length);
+    if (outputFilePath) {
+      const didWrite = await writeIfDifferent(outputFilePath, lines.join('\n'));
+      if (didWrite) console.log('Wrote', lines.length);
+    }
   };
 
   // ---- plugin ---- //
 
   return {
     name: 'vite-plugin-component-source-collector',
-    enforce: 'post',
+    enforce: 'pre', // i want to see comments
 
+    /**
+     * Setup. Add exisitng files to internal state if dev
+     */
     async configResolved(resolved) {
       config = resolved;
-      const outPath = resolve(config.root, outFileName);
+      root = config.root;
+      outputFilePath = resolve(root, outFileName);
 
       if (config.command === 'build' && firstRound) {
         componentFiles.clear();
         firstRound = false;
       } else if (config.command === 'serve') {
-        if (await exists(outPath)) {
-          const fileLines = (await readFile(outPath, 'utf8')).split('\n');
+        if (await exists(outputFilePath)) {
+          const fileLines = (await readFile(outputFilePath, 'utf8')).split('\n');
           fileLines.forEach((l) => addPath(l.replace(/@source\s+'(.*?)';/, '$1')));
           // console.log('config resolved', componentFiles);
         }
@@ -97,6 +108,29 @@ export default function componentSourceCollector(opts: Options = { safePackages:
       console.log('tailwind-sources:configResolved:command', config.command);
     },
 
+    /**
+     * Reset list on lock file changed
+     */
+    configureServer(server) {
+      const lockFiles = [
+        'pnpm-lock.yaml',
+        'package-lock.json',
+        'yarn.lock',
+        'bun.lockb',
+        'bun.lock',
+        'npm-shrinkwrap.json',
+        // pnpm install-state changes:
+        'node_modules/.modules.yaml'
+      ].map((p) => join(root!, p));
+      server.watcher.add(lockFiles);
+      const onChange = async (file: string) => {
+        if (!lockFiles.includes(file)) return;
+        componentFiles.clear();
+      };
+      server.watcher.on('change', onChange);
+      server.watcher.on('add', onChange);
+    },
+
     buildStart() {
       // console.log('tailwind-sources:buildStart', componentFiles);
       // componentFiles.clear();
@@ -110,9 +144,13 @@ export default function componentSourceCollector(opts: Options = { safePackages:
 
         for (const match of matches) {
           // console.log('MATching', match);
-          const resolved = await this.resolve(match[1], id);
-          if (resolved) {
-            addPath(resolved.id);
+          try {
+            const resolved = await this.resolve(match[1], id);
+            if (resolved) {
+              addPath(resolved.id);
+            }
+          } catch {
+            // Cant resolve: dont add
           }
         }
       }