shopify-accelerate-app 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shopify-accelerate-app",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Shopify App development with full Typescript Support",
   "author": "Felix Tellmann",
   "license": "MIT",

package/require.ts

@@ -1,3 +1,3 @@
-import { createRequire } from "module";
-
-// export const require = createRequire(import.meta.url);
+import { createRequire } from "module";
+
+// export const require = createRequire(import.meta.url);

package/src/esbuild/esbuild.ts

@@ -195,16 +195,15 @@ const runBlockJsEsbuild = async (entryFile, block: ShopifyAppBlock & { path: str
 
   if (process.env.SHOPIFY_ACCELERATE_TAILWIND_PREFIX) {
     clearTimeout(current.timeout);
-    current.timeout = setTimeout(() => {
+    const cssPath = path.join(config.extension_path, `assets/tailwind.css`);
+    const runFinalPass = () => {
+      if (!fs.existsSync(cssPath)) {
+        current.timeout = setTimeout(runFinalPass, 300);
+        return;
+      }
       Object.values(config.sources.blockSchemas ?? {})?.forEach(({ folder }) => {
         if (!content.includes("/* CSS CROSS CHECKED */")) {
-          const finalContent = transformContent(
-            content,
-            true,
-            fs.readFileSync(path.join(config.extension_path, `assets/tailwind.css`), {
-              encoding: "utf-8",
-            })
-          );
+          const finalContent = transformContent(content, true, fs.readFileSync(cssPath, { encoding: "utf-8" }));
           console.log(Object.fromEntries(notCSSClasses.entries()));
           fs.writeFileSync(finalPath, `${finalContent}\n\n/* CSS CROSS CHECKED */`);
           if (process.env.SHOPIFY_ACCELERATE_THEME_OUTPUT_PATH) {
@@ -212,7 +211,8 @@ const runBlockJsEsbuild = async (entryFile, block: ShopifyAppBlock & { path: str
           }
         }
       });
-    }, 1800);
+    };
+    current.timeout = setTimeout(runFinalPass, 1800);
   }
 
   try {

package/src/scaffold-theme/generate-liquid-files.ts

@@ -393,13 +393,14 @@ export const generateLiquidFiles = (final?: boolean, cssOutput?: string) => {
 
   clearTimeout(current.timeout);
   if (!final) {
-    current.timeout = setTimeout(() => {
-      generateLiquidFiles(
-        true,
-        fs.readFileSync(path.join(config.extension_path, `assets/tailwind.css`), {
-          encoding: "utf-8",
-        })
-      );
-    }, 1800);
+    const cssPath = path.join(config.extension_path, `assets/tailwind.css`);
+    const runFinalPass = () => {
+      if (!fs.existsSync(cssPath)) {
+        current.timeout = setTimeout(runFinalPass, 300);
+        return;
+      }
+      generateLiquidFiles(true, fs.readFileSync(cssPath, { encoding: "utf-8" }));
+    };
+    current.timeout = setTimeout(runFinalPass, 1800);
   }
 };

package/src/watch-app-extension/watch-app-extension.ts

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import fs from "fs";
 import watch from "node-watch";
 import path from "path";
-import { config, root_dir } from "../../shopify-accelerate-app";
+import { config } from "../../shopify-accelerate-app";
 import { generateBlocksTypes } from "../scaffold-theme/generate-blocks-types";
 import { generateLiquidFiles } from "../scaffold-theme/generate-liquid-files";
 import { generateSchemaLocales } from "../scaffold-theme/generate-schema-locales";
@@ -32,65 +32,79 @@ export const watchAppExtension = () => {
 
   let running = false;
   watch(watchable_folders, { recursive: true }, (event, name) => {
-    if (running) return;
-    const startTime = Date.now();
-    running = true;
-    if (event === "remove") {
-      getSources();
-      getTargets();
-    }
-    if (isTypeScriptSchema(name)) {
-      getTargets();
-      getSchemaSources();
-      parseLocales();
-      generateSchemaVariables();
-      generateSchemaLocales();
-      generateBlocksTypes();
-      generateLiquidFiles();
-      console.log(
-        `[${chalk.gray(new Date().toLocaleTimeString())}]: [${chalk.magentaBright(
-          `${Date.now() - startTime}ms`
-        )}] ${chalk.cyan(`File modified: ${name.replace(process.cwd(), "")}`)}`
-      );
+    // Ignore atomic-write temp files (Claude Code, VSCode, etc. write `<file>.tmp.<pid>.<ts>` then rename).
+    if (/\.tmp\.\d+\.\d+$/i.test(name)) {
+      return;
     }
-    if (isAsset(name)) {
-      const fileName = name.split(/[\\/]/gi).at(-1);
-      const targetPath = path.join(process.cwd(), extension_path, "assets", fileName);
 
-      if (event !== "remove") {
-        const rawContent = fs.readFileSync(name, { encoding: "utf-8" });
+    const startTime = Date.now();
 
-        if (ignore_assets?.includes(targetPath.split(/[/\\]/)?.at(-1))) {
-          console.log(
-            `[${chalk.gray(new Date().toLocaleTimeString())}]: ${chalk.greenBright(
-              `Ignored: ${targetPath.replace(process.cwd(), "")}`
-            )}`
-          );
-          writeOnlyNew(targetPath, rawContent);
-        } else {
-          writeCompareFile(targetPath, rawContent);
-        }
+    try {
+      if (running) return;
+      running = true;
+      if (event === "remove") {
+        getSources();
+        getTargets();
       }
+      if (isTypeScriptSchema(name)) {
+        getTargets();
+        getSchemaSources();
+        parseLocales();
+        generateSchemaVariables();
+        generateSchemaLocales();
+        generateBlocksTypes();
+        generateLiquidFiles();
+        console.log(
+          `[${chalk.gray(new Date().toLocaleTimeString())}]: [${chalk.magentaBright(`${Date.now() - startTime}ms`)}] ${chalk.cyan(
+            `File modified: ${name.replace(process.cwd(), "")}`
+          )}`
+        );
+      }
+      if (isAsset(name)) {
+        const fileName = name.split(/[\\/]/gi).at(-1);
+        const targetPath = path.join(process.cwd(), extension_path, "assets", fileName);
+
+        if (event !== "remove") {
+          const rawContent = fs.readFileSync(name, { encoding: "utf-8" });
+
+          if (ignore_assets?.includes(targetPath.split(/[/\\]/)?.at(-1))) {
+            console.log(
+              `[${chalk.gray(new Date().toLocaleTimeString())}]: ${chalk.greenBright(`Ignored: ${targetPath.replace(process.cwd(), "")}`)}`
+            );
+            writeOnlyNew(targetPath, rawContent);
+          } else {
+            writeCompareFile(targetPath, rawContent);
+          }
+        }
 
-      if (event === "remove" && delete_external_assets) {
-        const targetFile = fs.existsSync(targetPath);
+        if (event === "remove" && delete_external_assets) {
+          const targetFile = fs.existsSync(targetPath);
 
-        if (targetFile) {
-          deleteFile(targetPath);
+          if (targetFile) {
+            deleteFile(targetPath);
+          }
         }
       }
-    }
-    if (isLiquid(name) || isSectionTs(name) || isBlockTs(name)) {
-      getTargets();
-      getSources();
-      generateSchemaVariables();
-      generateLiquidFiles();
+      if (isLiquid(name) || isSectionTs(name) || isBlockTs(name)) {
+        getTargets();
+        getSources();
+        generateSchemaVariables();
+        generateLiquidFiles();
+        console.log(
+          `[${chalk.gray(new Date().toLocaleTimeString())}]: [${chalk.magentaBright(`${Date.now() - startTime}ms`)}] ${chalk.cyan(
+            `File modified: ${name.replace(process.cwd(), "")}`
+          )}`
+        );
+      }
+    } catch (err) {
       console.log(
-        `[${chalk.gray(new Date().toLocaleTimeString())}]: [${chalk.magentaBright(
-          `${Date.now() - startTime}ms`
-        )}] ${chalk.cyan(`File modified: ${name.replace(process.cwd(), "")}`)}`
+        `[${chalk.gray(new Date().toLocaleTimeString())}]: [${chalk.magentaBright(`${Date.now() - startTime}ms`)}] ${chalk.cyan(
+          `File modified: ${name.replace(process.cwd(), "")}`
+        )}`,
+        err
       );
+    } finally {
+      running = false;
     }
-    running = false;
   });
 };