tamagui-loader 1.57.3 → 1.57.4

package/dist/cjs/css.js

@@ -18,36 +18,16 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var css_exports = {};
 __export(css_exports, {
-  default: () => loader,
-  extractedInfoByFile: () => extractedInfoByFile,
-  stylePathToFilePath: () => stylePathToFilePath
+  default: () => loader
 });
 module.exports = __toCommonJS(css_exports);
-const extractedInfoByFile = /* @__PURE__ */ new Map();
-const stylePathToFilePath = /* @__PURE__ */ new Map();
 function loader() {
   this.async();
   const options = { ...this.getOptions() };
-  const sourcePath = `${this.resourcePath}`;
-  let out = "";
-  if (options.cssPath) {
-    const pathKey = stylePathToFilePath.get(sourcePath) ?? sourcePath;
-    const info = extractedInfoByFile.get(pathKey);
-    stylePathToFilePath.delete(sourcePath);
-    extractedInfoByFile.delete(pathKey);
-    const out2 = info == null ? void 0 : info.styles;
-    return this.callback(null, out2 || "");
-  } else if (options.cssData) {
-    out = Buffer.from(options.cssData, "base64").toString("utf-8");
-  }
+  let out = Buffer.from(options.cssData, "base64").toString("utf-8");
   if (out) {
     return this.callback(null, out || "");
   }
   this.callback({ message: "No CSS found", name: "missing_css" });
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  extractedInfoByFile,
-  stylePathToFilePath
-});
 //# sourceMappingURL=css.js.map

package/dist/cjs/css.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/css.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,sBAAsB,oBAAI,IAA+B;AAC/D,MAAM,sBAAsB,oBAAI,IAAoB;AAE5C,SAAR,SAA6D;AAClE,OAAK,MAAM;AACX,QAAM,UAAU,EAAE,GAAG,KAAK,WAAW,EAAE;AACvC,QAAM,aAAa,GAAG,KAAK,YAAY;AACvC,MAAI,MAAM;AACV,MAAI,QAAQ,SAAS;AAEnB,UAAM,UAAU,oBAAoB,IAAI,UAAU,KAAK;AACvD,UAAM,OAAO,oBAAoB,IAAI,OAAO;AAE5C,wBAAoB,OAAO,UAAU;AACrC,wBAAoB,OAAO,OAAO;AAClC,UAAMA,OAAM,6BAAM;AAClB,WAAO,KAAK,SAAS,MAAMA,QAAO,EAAE;AAAA,EACtC,WAAW,QAAQ,SAAS;AAE1B,UAAM,OAAO,KAAK,QAAQ,SAAS,QAAQ,EAAE,SAAS,OAAO;AAAA,EAC/D;AAEA,MAAI,KAAK;AAEP,WAAO,KAAK,SAAS,MAAM,OAAO,EAAE;AAAA,EACtC;AAEA,OAAK,SAAS,EAAE,SAAS,gBAAgB,MAAM,cAAc,CAAC;AAChE;",
-  "names": ["out"]
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGe,SAAR,SAA6D;AAClE,OAAK,MAAM;AACX,QAAM,UAAU,EAAE,GAAG,KAAK,WAAW,EAAE;AACvC,MAAI,MAAM,OAAO,KAAK,QAAQ,SAAS,QAAQ,EAAE,SAAS,OAAO;AACjE,MAAI,KAAK;AAEP,WAAO,KAAK,SAAS,MAAM,OAAO,EAAE;AAAA,EACtC;AACA,OAAK,SAAS,EAAE,SAAS,gBAAgB,MAAM,cAAc,CAAC;AAChE;",
+  "names": []
 }

package/dist/cjs/loader.js

@@ -32,19 +32,17 @@ __export(loader_exports, {
 });
 module.exports = __toCommonJS(loader_exports);
 var import_static = require("@tamagui/static");
-var import_css = require("./css");
 Error.stackTraceLimit = Infinity;
 const CSS_LOADER_PATH = require.resolve("./css");
 Error.stackTraceLimit = Infinity;
 const extractor = (0, import_static.createExtractor)();
 let index = 0;
 process.env.TAMAGUI_TARGET = "web";
-const loader = async function loader2(sourceIn, info) {
+const loader = async function loader2(sourceIn) {
   this.cacheable(true);
   const callback = this.async();
   const source = sourceIn.toString();
   try {
-    const threaded = this.emitFile === void 0;
     const options = { ...this.getOptions() };
     const sourcePath = `${this.resourcePath}`;
     const { shouldDisable, shouldPrintDebug } = (0, import_static.getPragmaOptions)({
@@ -65,7 +63,7 @@ const loader = async function loader2(sourceIn, info) {
       }
       return callback(null, source);
     }
-    const cssPath = threaded ? `${sourcePath}.tamagui.css` : `${sourcePath}.${index++}.tamagui.css`;
+    const cssPath = `${sourcePath}.${index++}.tamagui.css`;
     const extracted = await (0, import_static.extractToClassNames)({
       extractor,
       source,
@@ -77,19 +75,13 @@ const loader = async function loader2(sourceIn, info) {
       return callback(null, source);
     }
     if (extracted.styles) {
-      const cssQuery = threaded ? `cssData=${Buffer.from(extracted.styles).toString("base64")}` : `cssPath=${cssPath}`;
+      const cssQuery = `cssData=${Buffer.from(extracted.styles).toString("base64")}`;
       const remReq = this.remainingRequest;
       const importPath = `${cssPath}!=!${CSS_LOADER_PATH}?${cssQuery}!${remReq}`;
       extracted.js = `${extracted.js}
 
 require(${JSON.stringify(importPath)})`;
     }
-    import_css.extractedInfoByFile.set(sourcePath, extracted);
-    if (!threaded) {
-      if (extracted.stylesPath) {
-        import_css.stylePathToFilePath.set(extracted.stylesPath, sourcePath);
-      }
-    }
     callback(null, extracted.js, extracted.map);
   } catch (err) {
     const message = err instanceof Error ? `${err.message}

package/dist/cjs/loader.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/loader.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAKO;AAGP,iBAAyD;AAEzD,MAAM,kBAAkB;AAGxB,MAAM,kBAAkB,gBAAgB,OAAO;AAE/C,MAAM,kBAAkB;AACxB,MAAM,gBAAY,+BAAgB;AAElC,IAAI,QAAQ;AAEZ,QAAQ,IAAI,iBAAiB;AAEtB,MAAM,SAAS,eAAeA,QAEnC,UACA,MACA;AACA,OAAK,UAAU,IAAI;AACnB,QAAM,WAAW,KAAK,MAAM;AAC5B,QAAM,SAAS,SAAS,SAAS;AAEjC,MAAI;AACF,UAAM,WAAW,KAAK,aAAa;AACnC,UAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,UAAM,aAAa,GAAG,KAAK,YAAY;AAEvC,UAAM,EAAE,eAAe,iBAAiB,QAAI,gCAAiB;AAAA,MAC3D;AAAA,MACA,MAAM;AAAA,IACR,CAAC;AAED,QAAI,qBAAqB,WAAW;AAClC,cAAQ,KAAK;AAAA;AAAA;AAAA;AAAA,CAAmC;AAChD,cAAQ,KAAK,MAAM;AAAA,IACrB;AAEA,QAAI,eAAe;AACjB,UAAI,kBAAkB;AAEpB,gBAAQ,IAAI,8BAA8B;AAAA,MAC5C;AACA,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAEA,UAAM,UAAU,WACZ,GAAG,UAAU,iBACb,GAAG,UAAU,IAAI,OAAO;AAE5B,UAAM,YAAY,UAAM,mCAAoB;AAAA,MAC1C;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,WAAW;AACd,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAGA,QAAI,UAAU,QAAQ;AACpB,YAAM,WAAW,WACb,WAAW,OAAO,KAAK,UAAU,MAAM,EAAE,SAAS,QAAQ,CAAC,KAC3D,WAAW,OAAO;AACtB,YAAM,SAAS,KAAK;AACpB,YAAM,aAAa,GAAG,OAAO,MAAM,eAAe,IAAI,QAAQ,IAAI,MAAM;AACxE,gBAAU,KAAK,GAAG,UAAU,EAAE;AAAA;AAAA,UAAe,KAAK,UAAU,UAAU,CAAC;AAAA,IACzE;AAEA,mCAAoB,IAAI,YAAY,SAAS;AAE7C,QAAI,CAAC,UAAU;AACb,UAAI,UAAU,YAAY;AACxB,uCAAoB,IAAI,UAAU,YAAY,UAAU;AAAA,MAC1D;AAAA,IACF;AAEA,aAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EAC5C,SAAS,KAAK;AACZ,UAAM,UAAU,eAAe,QAAQ,GAAG,IAAI,OAAO;AAAA,EAAK,IAAI,KAAK,KAAK,OAAO,GAAG;AAElF,YAAQ,MAAM,mCAAmC,KAAK,OAAO;AAAA,CAAI;AAEjE,QAAI,QAAQ,SAAS,qBAAqB,GAAG;AAE3C,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,aAAS,MAAM,MAAM;AAAA,EACvB;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAKO;AAGP,MAAM,kBAAkB;AAGxB,MAAM,kBAAkB,gBAAgB,OAAO;AAE/C,MAAM,kBAAkB;AACxB,MAAM,gBAAY,+BAAgB;AAElC,IAAI,QAAQ;AAEZ,QAAQ,IAAI,iBAAiB;AAEtB,MAAM,SAAS,eAAeA,QAEnC,UACA;AACA,OAAK,UAAU,IAAI;AACnB,QAAM,WAAW,KAAK,MAAM;AAC5B,QAAM,SAAS,SAAS,SAAS;AAEjC,MAAI;AACF,UAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,UAAM,aAAa,GAAG,KAAK,YAAY;AAEvC,UAAM,EAAE,eAAe,iBAAiB,QAAI,gCAAiB;AAAA,MAC3D;AAAA,MACA,MAAM;AAAA,IACR,CAAC;AAED,QAAI,qBAAqB,WAAW;AAClC,cAAQ,KAAK;AAAA;AAAA;AAAA;AAAA,CAAmC;AAChD,cAAQ,KAAK,MAAM;AAAA,IACrB;AAEA,QAAI,eAAe;AACjB,UAAI,kBAAkB;AAEpB,gBAAQ,IAAI,8BAA8B;AAAA,MAC5C;AACA,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAEA,UAAM,UAAU,GAAG,UAAU,IAAI,OAAO;AAExC,UAAM,YAAY,UAAM,mCAAoB;AAAA,MAC1C;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,WAAW;AACd,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAGA,QAAI,UAAU,QAAQ;AACpB,YAAM,WAAW,WAAW,OAAO,KAAK,UAAU,MAAM,EAAE,SAAS,QAAQ,CAAC;AAC5E,YAAM,SAAS,KAAK;AACpB,YAAM,aAAa,GAAG,OAAO,MAAM,eAAe,IAAI,QAAQ,IAAI,MAAM;AACxE,gBAAU,KAAK,GAAG,UAAU,EAAE;AAAA;AAAA,UAAe,KAAK,UAAU,UAAU,CAAC;AAAA,IACzE;AAEA,aAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EAC5C,SAAS,KAAK;AACZ,UAAM,UAAU,eAAe,QAAQ,GAAG,IAAI,OAAO;AAAA,EAAK,IAAI,KAAK,KAAK,OAAO,GAAG;AAElF,YAAQ,MAAM,mCAAmC,KAAK,OAAO;AAAA,CAAI;AAEjE,QAAI,QAAQ,SAAS,qBAAqB,GAAG;AAE3C,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,aAAS,MAAM,MAAM;AAAA,EACvB;AACF;",
   "names": ["loader"]
 }

package/dist/esm/css.js

@@ -1,28 +1,13 @@
-const extractedInfoByFile = /* @__PURE__ */ new Map();
-const stylePathToFilePath = /* @__PURE__ */ new Map();
 function loader() {
   this.async();
   const options = { ...this.getOptions() };
-  const sourcePath = `${this.resourcePath}`;
-  let out = "";
-  if (options.cssPath) {
-    const pathKey = stylePathToFilePath.get(sourcePath) ?? sourcePath;
-    const info = extractedInfoByFile.get(pathKey);
-    stylePathToFilePath.delete(sourcePath);
-    extractedInfoByFile.delete(pathKey);
-    const out2 = info == null ? void 0 : info.styles;
-    return this.callback(null, out2 || "");
-  } else if (options.cssData) {
-    out = Buffer.from(options.cssData, "base64").toString("utf-8");
-  }
+  let out = Buffer.from(options.cssData, "base64").toString("utf-8");
   if (out) {
     return this.callback(null, out || "");
   }
   this.callback({ message: "No CSS found", name: "missing_css" });
 }
 export {
-  loader as default,
-  extractedInfoByFile,
-  stylePathToFilePath
+  loader as default
 };
 //# sourceMappingURL=css.js.map

package/dist/esm/css.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/css.ts"],
-  "mappings": "AAGO,MAAM,sBAAsB,oBAAI,IAA+B;AAC/D,MAAM,sBAAsB,oBAAI,IAAoB;AAE5C,SAAR,SAA6D;AAClE,OAAK,MAAM;AACX,QAAM,UAAU,EAAE,GAAG,KAAK,WAAW,EAAE;AACvC,QAAM,aAAa,GAAG,KAAK,YAAY;AACvC,MAAI,MAAM;AACV,MAAI,QAAQ,SAAS;AAEnB,UAAM,UAAU,oBAAoB,IAAI,UAAU,KAAK;AACvD,UAAM,OAAO,oBAAoB,IAAI,OAAO;AAE5C,wBAAoB,OAAO,UAAU;AACrC,wBAAoB,OAAO,OAAO;AAClC,UAAMA,OAAM,6BAAM;AAClB,WAAO,KAAK,SAAS,MAAMA,QAAO,EAAE;AAAA,EACtC,WAAW,QAAQ,SAAS;AAE1B,UAAM,OAAO,KAAK,QAAQ,SAAS,QAAQ,EAAE,SAAS,OAAO;AAAA,EAC/D;AAEA,MAAI,KAAK;AAEP,WAAO,KAAK,SAAS,MAAM,OAAO,EAAE;AAAA,EACtC;AAEA,OAAK,SAAS,EAAE,SAAS,gBAAgB,MAAM,cAAc,CAAC;AAChE;",
-  "names": ["out"]
+  "mappings": "AAGe,SAAR,SAA6D;AAClE,OAAK,MAAM;AACX,QAAM,UAAU,EAAE,GAAG,KAAK,WAAW,EAAE;AACvC,MAAI,MAAM,OAAO,KAAK,QAAQ,SAAS,QAAQ,EAAE,SAAS,OAAO;AACjE,MAAI,KAAK;AAEP,WAAO,KAAK,SAAS,MAAM,OAAO,EAAE;AAAA,EACtC;AACA,OAAK,SAAS,EAAE,SAAS,gBAAgB,MAAM,cAAc,CAAC;AAChE;",
+  "names": []
 }

package/dist/esm/loader.js

@@ -3,19 +3,17 @@ import {
   extractToClassNames,
   getPragmaOptions
 } from "@tamagui/static";
-import { extractedInfoByFile, stylePathToFilePath } from "./css";
 Error.stackTraceLimit = Infinity;
 const CSS_LOADER_PATH = require.resolve("./css");
 Error.stackTraceLimit = Infinity;
 const extractor = createExtractor();
 let index = 0;
 process.env.TAMAGUI_TARGET = "web";
-const loader = async function loader2(sourceIn, info) {
+const loader = async function loader2(sourceIn) {
   this.cacheable(true);
   const callback = this.async();
   const source = sourceIn.toString();
   try {
-    const threaded = this.emitFile === void 0;
     const options = { ...this.getOptions() };
     const sourcePath = `${this.resourcePath}`;
     const { shouldDisable, shouldPrintDebug } = getPragmaOptions({
@@ -36,7 +34,7 @@ const loader = async function loader2(sourceIn, info) {
       }
       return callback(null, source);
     }
-    const cssPath = threaded ? `${sourcePath}.tamagui.css` : `${sourcePath}.${index++}.tamagui.css`;
+    const cssPath = `${sourcePath}.${index++}.tamagui.css`;
     const extracted = await extractToClassNames({
       extractor,
       source,
@@ -48,19 +46,13 @@ const loader = async function loader2(sourceIn, info) {
       return callback(null, source);
     }
     if (extracted.styles) {
-      const cssQuery = threaded ? `cssData=${Buffer.from(extracted.styles).toString("base64")}` : `cssPath=${cssPath}`;
+      const cssQuery = `cssData=${Buffer.from(extracted.styles).toString("base64")}`;
       const remReq = this.remainingRequest;
       const importPath = `${cssPath}!=!${CSS_LOADER_PATH}?${cssQuery}!${remReq}`;
       extracted.js = `${extracted.js}
 
 require(${JSON.stringify(importPath)})`;
     }
-    extractedInfoByFile.set(sourcePath, extracted);
-    if (!threaded) {
-      if (extracted.stylesPath) {
-        stylePathToFilePath.set(extracted.stylesPath, sourcePath);
-      }
-    }
     callback(null, extracted.js, extracted.map);
   } catch (err) {
     const message = err instanceof Error ? `${err.message}

package/dist/esm/loader.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/loader.ts"],
-  "mappings": "AAAA;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAGP,SAAS,qBAAqB,2BAA2B;AAEzD,MAAM,kBAAkB;AAGxB,MAAM,kBAAkB,gBAAgB,OAAO;AAE/C,MAAM,kBAAkB;AACxB,MAAM,YAAY,gBAAgB;AAElC,IAAI,QAAQ;AAEZ,QAAQ,IAAI,iBAAiB;AAEtB,MAAM,SAAS,eAAeA,QAEnC,UACA,MACA;AACA,OAAK,UAAU,IAAI;AACnB,QAAM,WAAW,KAAK,MAAM;AAC5B,QAAM,SAAS,SAAS,SAAS;AAEjC,MAAI;AACF,UAAM,WAAW,KAAK,aAAa;AACnC,UAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,UAAM,aAAa,GAAG,KAAK,YAAY;AAEvC,UAAM,EAAE,eAAe,iBAAiB,IAAI,iBAAiB;AAAA,MAC3D;AAAA,MACA,MAAM;AAAA,IACR,CAAC;AAED,QAAI,qBAAqB,WAAW;AAClC,cAAQ,KAAK;AAAA;AAAA;AAAA;AAAA,CAAmC;AAChD,cAAQ,KAAK,MAAM;AAAA,IACrB;AAEA,QAAI,eAAe;AACjB,UAAI,kBAAkB;AAEpB,gBAAQ,IAAI,8BAA8B;AAAA,MAC5C;AACA,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAEA,UAAM,UAAU,WACZ,GAAG,UAAU,iBACb,GAAG,UAAU,IAAI,OAAO;AAE5B,UAAM,YAAY,MAAM,oBAAoB;AAAA,MAC1C;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,WAAW;AACd,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAGA,QAAI,UAAU,QAAQ;AACpB,YAAM,WAAW,WACb,WAAW,OAAO,KAAK,UAAU,MAAM,EAAE,SAAS,QAAQ,CAAC,KAC3D,WAAW,OAAO;AACtB,YAAM,SAAS,KAAK;AACpB,YAAM,aAAa,GAAG,OAAO,MAAM,eAAe,IAAI,QAAQ,IAAI,MAAM;AACxE,gBAAU,KAAK,GAAG,UAAU,EAAE;AAAA;AAAA,UAAe,KAAK,UAAU,UAAU,CAAC;AAAA,IACzE;AAEA,wBAAoB,IAAI,YAAY,SAAS;AAE7C,QAAI,CAAC,UAAU;AACb,UAAI,UAAU,YAAY;AACxB,4BAAoB,IAAI,UAAU,YAAY,UAAU;AAAA,MAC1D;AAAA,IACF;AAEA,aAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EAC5C,SAAS,KAAK;AACZ,UAAM,UAAU,eAAe,QAAQ,GAAG,IAAI,OAAO;AAAA,EAAK,IAAI,KAAK,KAAK,OAAO,GAAG;AAElF,YAAQ,MAAM,mCAAmC,KAAK,OAAO;AAAA,CAAI;AAEjE,QAAI,QAAQ,SAAS,qBAAqB,GAAG;AAE3C,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,aAAS,MAAM,MAAM;AAAA,EACvB;AACF;",
+  "mappings": "AAAA;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAGP,MAAM,kBAAkB;AAGxB,MAAM,kBAAkB,gBAAgB,OAAO;AAE/C,MAAM,kBAAkB;AACxB,MAAM,YAAY,gBAAgB;AAElC,IAAI,QAAQ;AAEZ,QAAQ,IAAI,iBAAiB;AAEtB,MAAM,SAAS,eAAeA,QAEnC,UACA;AACA,OAAK,UAAU,IAAI;AACnB,QAAM,WAAW,KAAK,MAAM;AAC5B,QAAM,SAAS,SAAS,SAAS;AAEjC,MAAI;AACF,UAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,UAAM,aAAa,GAAG,KAAK,YAAY;AAEvC,UAAM,EAAE,eAAe,iBAAiB,IAAI,iBAAiB;AAAA,MAC3D;AAAA,MACA,MAAM;AAAA,IACR,CAAC;AAED,QAAI,qBAAqB,WAAW;AAClC,cAAQ,KAAK;AAAA;AAAA;AAAA;AAAA,CAAmC;AAChD,cAAQ,KAAK,MAAM;AAAA,IACrB;AAEA,QAAI,eAAe;AACjB,UAAI,kBAAkB;AAEpB,gBAAQ,IAAI,8BAA8B;AAAA,MAC5C;AACA,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAEA,UAAM,UAAU,GAAG,UAAU,IAAI,OAAO;AAExC,UAAM,YAAY,MAAM,oBAAoB;AAAA,MAC1C;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,WAAW;AACd,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAGA,QAAI,UAAU,QAAQ;AACpB,YAAM,WAAW,WAAW,OAAO,KAAK,UAAU,MAAM,EAAE,SAAS,QAAQ,CAAC;AAC5E,YAAM,SAAS,KAAK;AACpB,YAAM,aAAa,GAAG,OAAO,MAAM,eAAe,IAAI,QAAQ,IAAI,MAAM;AACxE,gBAAU,KAAK,GAAG,UAAU,EAAE;AAAA;AAAA,UAAe,KAAK,UAAU,UAAU,CAAC;AAAA,IACzE;AAEA,aAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EAC5C,SAAS,KAAK;AACZ,UAAM,UAAU,eAAe,QAAQ,GAAG,IAAI,OAAO;AAAA,EAAK,IAAI,KAAK,KAAK,OAAO,GAAG;AAElF,YAAQ,MAAM,mCAAmC,KAAK,OAAO;AAAA,CAAI;AAEjE,QAAI,QAAQ,SAAS,qBAAqB,GAAG;AAE3C,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,aAAS,MAAM,MAAM;AAAA,EACvB;AACF;",
   "names": ["loader"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui-loader",
-  "version": "1.57.3",
+  "version": "1.57.4",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -18,15 +18,15 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/cli-color": "1.57.3",
-    "@tamagui/static": "1.57.3",
+    "@tamagui/cli-color": "1.57.4",
+    "@tamagui/static": "1.57.4",
     "esbuild-loader": "^3.0.1",
     "fs-extra": "^11.1.0",
     "loader-utils": "^3.2.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@tamagui/build": "1.57.3",
+    "@tamagui/build": "1.57.4",
     "prettyjson": "^1.2.5",
     "webpack": "^5.88.2"
   },

package/src/css.ts

@@ -1,32 +1,13 @@
-import { ExtractedResponse, TamaguiOptions } from '@tamagui/static'
+import { TamaguiOptions } from '@tamagui/static'
 import type { LoaderContext } from 'webpack'
 
-export const extractedInfoByFile = new Map<string, ExtractedResponse>()
-export const stylePathToFilePath = new Map<string, string>()
-
 export default function loader(this: LoaderContext<TamaguiOptions>) {
   this.async()
   const options = { ...this.getOptions() }
-  const sourcePath = `${this.resourcePath}`
-  let out = ''
-  if (options.cssPath) {
-    // get in memory info
-    const pathKey = stylePathToFilePath.get(sourcePath) ?? sourcePath
-    const info = extractedInfoByFile.get(pathKey)
-    // clear memory
-    stylePathToFilePath.delete(sourcePath)
-    extractedInfoByFile.delete(pathKey)
-    const out = info?.styles
-    return this.callback(null, out || '')
-  } else if (options.cssData) {
-    // get output CSS
-    out = Buffer.from(options.cssData, 'base64').toString('utf-8')
-  }
-
+  let out = Buffer.from(options.cssData, 'base64').toString('utf-8')
   if (out) {
     // use original JS sourcemap
     return this.callback(null, out || '')
   }
-
   this.callback({ message: 'No CSS found', name: 'missing_css' })
 }

package/src/loader.ts

@@ -6,8 +6,6 @@ import {
 } from '@tamagui/static'
 import type { LoaderContext } from 'webpack'
 
-import { extractedInfoByFile, stylePathToFilePath } from './css'
-
 Error.stackTraceLimit = Infinity
 
 // pass loader as path
@@ -22,15 +20,13 @@ process.env.TAMAGUI_TARGET = 'web'
 
 export const loader = async function loader(
   this: LoaderContext<TamaguiOptions>,
-  sourceIn: Buffer | string,
-  info
+  sourceIn: Buffer | string
 ) {
   this.cacheable(true)
   const callback = this.async()
   const source = sourceIn.toString()
 
   try {
-    const threaded = this.emitFile === undefined
     const options: TamaguiOptions = { ...this.getOptions() }
     const sourcePath = `${this.resourcePath}`
 
@@ -52,9 +48,7 @@ export const loader = async function loader(
       return callback(null, source)
     }
 
-    const cssPath = threaded
-      ? `${sourcePath}.tamagui.css`
-      : `${sourcePath}.${index++}.tamagui.css`
+    const cssPath = `${sourcePath}.${index++}.tamagui.css`
 
     const extracted = await extractToClassNames({
       extractor,
@@ -70,22 +64,12 @@ export const loader = async function loader(
 
     // add import to css
     if (extracted.styles) {
-      const cssQuery = threaded
-        ? `cssData=${Buffer.from(extracted.styles).toString('base64')}`
-        : `cssPath=${cssPath}`
+      const cssQuery = `cssData=${Buffer.from(extracted.styles).toString('base64')}`
       const remReq = this.remainingRequest
       const importPath = `${cssPath}!=!${CSS_LOADER_PATH}?${cssQuery}!${remReq}`
       extracted.js = `${extracted.js}\n\nrequire(${JSON.stringify(importPath)})`
     }
 
-    extractedInfoByFile.set(sourcePath, extracted)
-
-    if (!threaded) {
-      if (extracted.stylesPath) {
-        stylePathToFilePath.set(extracted.stylesPath, sourcePath)
-      }
-    }
-
     callback(null, extracted.js, extracted.map)
   } catch (err) {
     const message = err instanceof Error ? `${err.message}\n${err.stack}` : String(err)

package/types/css.d.ts

@@ -1,6 +1,4 @@
-import { ExtractedResponse, TamaguiOptions } from '@tamagui/static';
+import { TamaguiOptions } from '@tamagui/static';
 import type { LoaderContext } from 'webpack';
-export declare const extractedInfoByFile: Map<string, ExtractedResponse>;
-export declare const stylePathToFilePath: Map<string, string>;
 export default function loader(this: LoaderContext<TamaguiOptions>): void;
 //# sourceMappingURL=css.d.ts.map

package/types/css.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"css.d.ts","sourceRoot":"","sources":["../src/css.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE5C,eAAO,MAAM,mBAAmB,gCAAuC,CAAA;AACvE,eAAO,MAAM,mBAAmB,qBAA4B,CAAA;AAE5D,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,cAAc,CAAC,QAyBjE"}
+{"version":3,"file":"css.d.ts","sourceRoot":"","sources":["../src/css.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE5C,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,cAAc,CAAC,QASjE"}

package/types/loader.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
 import { TamaguiOptions } from '@tamagui/static';
 import type { LoaderContext } from 'webpack';
-export declare const loader: (this: LoaderContext<TamaguiOptions>, sourceIn: Buffer | string, info: any) => Promise<void>;
+export declare const loader: (this: LoaderContext<TamaguiOptions>, sourceIn: Buffer | string) => Promise<void>;
 //# sourceMappingURL=loader.d.ts.map

package/types/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,cAAc,EAIf,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAgB5C,eAAO,MAAM,MAAM,SACX,cAAc,cAAc,CAAC,YACzB,MAAM,GAAG,MAAM,6BA+E1B,CAAA"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,cAAc,EAIf,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAc5C,eAAO,MAAM,MAAM,SACX,cAAc,cAAc,CAAC,YACzB,MAAM,GAAG,MAAM,kBAiE1B,CAAA"}