@typedcss/next-plugin 22.0.4 → 22.0.5

package/dist/css.d.ts

@@ -1,2 +1,7 @@
 import type { LoaderContext } from './shared';
-export default function typedcssCssLoader(this: LoaderContext): string;
+interface CssLoaderContext extends LoaderContext {
+    async: () => (error: Error | null, content?: string) => void;
+    emitError?: (error: Error) => void;
+}
+export default function typedcssCssLoader(this: CssLoaderContext): void;
+export {};

package/dist/css.js

@@ -4,9 +4,21 @@ exports.default = typedcssCssLoader;
 const shared_1 = require("./shared");
 const dev_bridge_1 = require("./dev-bridge");
 function typedcssCssLoader() {
+    const callback = this.async();
     const options = (0, shared_1.optionsOf)(this);
-    const { css, found } = (0, shared_1.compileStylesheet)(options);
-    for (const file of found)
-        this.addDependency(file);
-    return (0, dev_bridge_1.withPreviousGenerations)(options.root, css);
+    try {
+        // Watch every source before reading any, so an edit made while the
+        // stylesheet compiles still invalidates it.
+        for (const file of (0, shared_1.sourceFilesOf)(options))
+            this.addDependency(file);
+        const { css } = (0, shared_1.compileStylesheet)(options, true);
+        callback(null, (0, dev_bridge_1.withPreviousGenerations)(options.root, css));
+    }
+    catch (error) {
+        if (process.env.NODE_ENV !== 'development' || !this.emitError) {
+            return callback(error);
+        }
+        this.emitError(error);
+        callback(null, (0, dev_bridge_1.readGenerations)((0, dev_bridge_1.devGenerationsPath)(options.root)).join('\n'));
+    }
 }

package/dist/shared.d.ts

@@ -25,7 +25,8 @@ export interface LoaderContext {
 export declare function optionsOf(context: LoaderContext): ResolvedOptions;
 export declare function sourcePackagesOf(root: string): SourcePackage[];
 export declare function inSourcePackage(root: string, file: string): boolean;
-export declare function compileStylesheet(options: ResolvedOptions): {
+export declare function sourceFilesOf({ cwd, root, include, exclude, }: ResolvedOptions): Set<string>;
+export declare function compileStylesheet(options: ResolvedOptions, fresh?: boolean): {
     css: string;
     found: Set<string>;
 };

package/dist/shared.js

@@ -37,6 +37,7 @@ exports.VIRTUAL_FILE_PATH = exports.DEFAULT_STYLE_PROP = exports.PACKAGE = void
 exports.optionsOf = optionsOf;
 exports.sourcePackagesOf = sourcePackagesOf;
 exports.inSourcePackage = inSourcePackage;
+exports.sourceFilesOf = sourceFilesOf;
 exports.compileStylesheet = compileStylesheet;
 exports.transform = transform;
 const fs = __importStar(require("fs"));
@@ -110,27 +111,31 @@ function modified(file) {
         throw error;
     }
 }
-function collect({ cwd, root, include, exclude, styleProp }) {
-    const files = [];
-    const found = new Set();
+function sourceFilesOf({ cwd, root, include, exclude, }) {
     const scanned = new Set(oxide_1.oxide
         .globFiles(include, cwd, exclude)
         .map((relative) => path.join(cwd, relative)));
     for (const file of sourcePackageFiles(root, exclude))
         scanned.add(file);
-    for (const file of scanned) {
+    return scanned;
+}
+function collect(options, fresh) {
+    const files = [];
+    const found = new Set();
+    for (const file of sourceFilesOf(options)) {
         const mtime = modified(file);
         if (mtime === undefined)
             continue;
         found.add(file);
         const previous = seen.get(file);
-        if (previous && previous.mtime === mtime) {
+        if (!fresh && previous && previous.mtime === mtime) {
             if (previous.relevant)
                 files.push({ path: file });
             continue;
         }
         const source = fs.readFileSync(file, 'utf8');
-        const relevant = REEXPORT.test(source) || oxide_1.oxide.needsCompile(source, styleProp, file);
+        const relevant = REEXPORT.test(source) ||
+            oxide_1.oxide.needsCompile(source, options.styleProp, file);
         seen.set(file, { mtime, relevant });
         if (relevant)
             files.push({ path: file, source });
@@ -141,8 +146,9 @@ function collect({ cwd, root, include, exclude, styleProp }) {
     }
     return { files, found };
 }
-function compileStylesheet(options) {
-    const { files, found } = collect(options);
+// A fresh compile reads every file again instead of trusting a cached mtime.
+function compileStylesheet(options, fresh = false) {
+    const { files, found } = collect(options, fresh);
     try {
         return {
             css: oxide_1.oxide.compileCss({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typedcss/next-plugin",
-  "version": "22.0.4",
+  "version": "22.0.5",
   "description": "TypedCSS Next.js plugin",
   "author": "Refirst 11",
   "license": "MIT",
@@ -39,8 +39,8 @@
   },
   "dependencies": {
     "zss-engine": "3.1.2",
-    "@typedcss/eslint-plugin": "22.0.4",
-    "@typedcss/oxide": "22.0.4"
+    "@typedcss/eslint-plugin": "22.0.5",
+    "@typedcss/oxide": "22.0.5"
   },
   "publishConfig": {
     "access": "public",