tamagui-loader 1.0.1-beta.70 → 1.0.1-beta.71

package/dist/cjs/css.js

@@ -54,7 +54,7 @@ function loader() {
   } else if (options.cssData) {
     out = Buffer.from(options.cssData, "base64").toString("utf-8");
   }
-  if (options.cssData || options.cssPath) {
+  if (out) {
     return this.callback(null, out || "");
   }
   this.callback({ message: `No CSS found`, name: "missing_css" });

package/dist/cjs/css.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/css.ts"],
-  "sourcesContent": ["import { ExtractedResponse, TamaguiOptions } from '@tamagui/static'\nimport { LoaderContext } from 'webpack'\n\nexport const extractedInfoByFile = new Map<string, ExtractedResponse>()\nexport const stylePathToFilePath = new Map<string, string>()\n\nexport default function loader(this: LoaderContext<any>) {\n  this.async()\n  const options: TamaguiOptions = { ...this.getOptions() }\n  const sourcePath = `${this.resourcePath}`\n  let out = ''\n  if (options.cssPath) {\n    // get in memory info\n    const pathKey = stylePathToFilePath.get(sourcePath) ?? sourcePath\n    const info = extractedInfoByFile.get(pathKey)\n    // clear memory\n    stylePathToFilePath.delete(sourcePath)\n    extractedInfoByFile.delete(pathKey)\n    const out = info?.styles\n    return this.callback(null, out || '')\n  } else if (options.cssData) {\n    // get output CSS\n    out = Buffer.from(options.cssData, 'base64').toString('utf-8')\n  }\n  if (options.cssData || options.cssPath) {\n    // use original JS sourcemap\n    return this.callback(null, out || '')\n  }\n  this.callback({ message: `No CSS found`, name: 'missing_css' })\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,sBAAsB,oBAAI,IAA+B;AAC/D,MAAM,sBAAsB,oBAAI,IAAoB;AAE5C,kBAA0C;AACvD,OAAK,MAAM;AACX,QAAM,UAA0B,mBAAK,KAAK,WAAW;AACrD,QAAM,aAAa,GAAG,KAAK;AAC3B,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,UAAM,OAAM,6BAAM;AAClB,WAAO,KAAK,SAAS,MAAM,QAAO,EAAE;AAAA,EACtC,WAAW,QAAQ,SAAS;AAE1B,UAAM,OAAO,KAAK,QAAQ,SAAS,QAAQ,EAAE,SAAS,OAAO;AAAA,EAC/D;AACA,MAAI,QAAQ,WAAW,QAAQ,SAAS;AAEtC,WAAO,KAAK,SAAS,MAAM,OAAO,EAAE;AAAA,EACtC;AACA,OAAK,SAAS,EAAE,SAAS,gBAAgB,MAAM,cAAc,CAAC;AAChE;AAvBwB;",
+  "sourcesContent": ["import { ExtractedResponse, TamaguiOptions } from '@tamagui/static'\nimport { LoaderContext } from 'webpack'\n\nexport const extractedInfoByFile = new Map<string, ExtractedResponse>()\nexport const stylePathToFilePath = new Map<string, string>()\n\nexport default function loader(this: LoaderContext<any>) {\n  this.async()\n  const options: TamaguiOptions = { ...this.getOptions() }\n  const sourcePath = `${this.resourcePath}`\n  let out = ''\n  if (options.cssPath) {\n    // get in memory info\n    const pathKey = stylePathToFilePath.get(sourcePath) ?? sourcePath\n    const info = extractedInfoByFile.get(pathKey)\n    // clear memory\n    stylePathToFilePath.delete(sourcePath)\n    extractedInfoByFile.delete(pathKey)\n    const out = info?.styles\n    return this.callback(null, out || '')\n  } else if (options.cssData) {\n    // get output CSS\n    out = Buffer.from(options.cssData, 'base64').toString('utf-8')\n  }\n  if (out) {\n    // use original JS sourcemap\n    return this.callback(null, out || '')\n  }\n  this.callback({ message: `No CSS found`, name: 'missing_css' })\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,sBAAsB,oBAAI,IAA+B;AAC/D,MAAM,sBAAsB,oBAAI,IAAoB;AAE5C,kBAA0C;AACvD,OAAK,MAAM;AACX,QAAM,UAA0B,mBAAK,KAAK,WAAW;AACrD,QAAM,aAAa,GAAG,KAAK;AAC3B,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,UAAM,OAAM,6BAAM;AAClB,WAAO,KAAK,SAAS,MAAM,QAAO,EAAE;AAAA,EACtC,WAAW,QAAQ,SAAS;AAE1B,UAAM,OAAO,KAAK,QAAQ,SAAS,QAAQ,EAAE,SAAS,OAAO;AAAA,EAC/D;AACA,MAAI,KAAK;AAEP,WAAO,KAAK,SAAS,MAAM,OAAO,EAAE;AAAA,EACtC;AACA,OAAK,SAAS,EAAE,SAAS,gBAAgB,MAAM,cAAc,CAAC;AAChE;AAvBwB;",
   "names": []
 }

package/dist/cjs/loader.js

@@ -46,9 +46,10 @@ const extractor = (0, import_static.createExtractor)();
 let index = 0;
 let hasPatched = false;
 process.env.TAMAGUI_TARGET = "web";
-function loader(source) {
-  this.cacheable();
+const loader = /* @__PURE__ */ __name(function loader2(sourceIn) {
+  this.cacheable(true);
   this.async();
+  const source = sourceIn.toString();
   if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {
     (0, import_static.patchReactNativeWeb)();
     hasPatched = true;
@@ -67,19 +68,23 @@ function loader(source) {
     }
     const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`;
     const extracted = (0, import_static.extractToClassNames)({
-      loader: this,
       extractor,
-      cssLoaderPath: CSS_LOADER_PATH,
       source,
-      threaded,
       sourcePath,
-      cssPath,
       options,
       shouldPrintDebug
     });
     if (!extracted) {
       return this.callback(null, source);
     }
+    if (extracted.styles) {
+      const cssQuery = threaded ? `cssData=${Buffer.from(extracted.styles).toString("base64")}` : `cssPath=${cssPath}`;
+      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) {
@@ -91,8 +96,7 @@ function loader(source) {
     console.error("ERROR", err);
     return this.callback(null, source);
   }
-}
-__name(loader, "loader");
+}, "loader");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   loader

package/dist/cjs/loader.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/loader.ts"],
-  "sourcesContent": ["import {\n  TamaguiOptions,\n  createExtractor,\n  extractToClassNames,\n  patchReactNativeWeb,\n} from '@tamagui/static'\nimport { LoaderContext } from 'webpack'\n\nimport { extractedInfoByFile, stylePathToFilePath } from './css'\n\n// pass loader as path\nconst CSS_LOADER_PATH = require.resolve('./css')\n\nError.stackTraceLimit = Infinity\nconst extractor = createExtractor()\n\nlet index = 0\nlet hasPatched = false\n\nprocess.env.TAMAGUI_TARGET = 'web'\n\nexport function loader(this: LoaderContext<any>, source: string) {\n  this.cacheable()\n  this.async()\n\n  if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {\n    patchReactNativeWeb()\n    hasPatched = true\n  }\n\n  try {\n    const threaded = this.emitFile === undefined\n    const options: TamaguiOptions = { ...this.getOptions() }\n    const sourcePath = `${this.resourcePath}`\n    const startsWithComment = source[0] === '/' && source[1] === '/'\n\n    let shouldPrintDebug: boolean | 'verbose' =\n      (!!process.env.DEBUG &&\n        (process.env.DEBUG_FILE ? sourcePath.includes(process.env.DEBUG_FILE) : true)) ||\n      // supports esbuild style //! comments\n      (startsWithComment && (source.startsWith('// debug') || source.startsWith('//! debug')))\n\n    if (shouldPrintDebug && source.startsWith('// debug-verbose')) {\n      shouldPrintDebug = 'verbose'\n    }\n\n    // check if should ignore\n    if (\n      startsWithComment &&\n      (source.startsWith('// tamagui-ignore') || source.startsWith('//! tamagui-ignore'))\n    ) {\n      return this.callback(null, source)\n    }\n\n    const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`\n\n    const extracted = extractToClassNames({\n      loader: this,\n      extractor,\n      cssLoaderPath: CSS_LOADER_PATH,\n      source,\n      threaded,\n      sourcePath,\n      cssPath,\n      options,\n      shouldPrintDebug,\n    })\n\n    if (!extracted) {\n      return this.callback(null, source)\n    }\n\n    extractedInfoByFile.set(sourcePath, extracted)\n\n    if (!threaded) {\n      if (extracted.stylesPath) {\n        stylePathToFilePath.set(extracted.stylesPath, sourcePath)\n      }\n    }\n\n    this.callback(null, extracted.js, extracted.map)\n  } catch (err) {\n    console.error('ERROR', err)\n    return this.callback(null, source)\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAKO;AAGP,iBAAyD;AAGzD,MAAM,kBAAkC;AAExC,MAAM,kBAAkB;AACxB,MAAM,YAAY,mCAAgB;AAElC,IAAI,QAAQ;AACZ,IAAI,aAAa;AAEjB,QAAQ,IAAI,iBAAiB;AAEtB,gBAA0C,QAAgB;AAC/D,OAAK,UAAU;AACf,OAAK,MAAM;AAEX,MAAI,CAAC,QAAQ,IAAI,6BAA6B,CAAC,YAAY;AACzD,2CAAoB;AACpB,iBAAa;AAAA,EACf;AAEA,MAAI;AACF,UAAM,WAAW,KAAK,aAAa;AACnC,UAAM,UAA0B,mBAAK,KAAK,WAAW;AACrD,UAAM,aAAa,GAAG,KAAK;AAC3B,UAAM,oBAAoB,OAAO,OAAO,OAAO,OAAO,OAAO;AAE7D,QAAI,mBACD,CAAC,CAAC,QAAQ,IAAI,SACZ,SAAQ,IAAI,aAAa,WAAW,SAAS,QAAQ,IAAI,UAAU,IAAI,SAEzE,qBAAsB,QAAO,WAAW,UAAU,KAAK,OAAO,WAAW,WAAW;AAEvF,QAAI,oBAAoB,OAAO,WAAW,kBAAkB,GAAG;AAC7D,yBAAmB;AAAA,IACrB;AAGA,QACE,qBACC,QAAO,WAAW,mBAAmB,KAAK,OAAO,WAAW,oBAAoB,IACjF;AACA,aAAO,KAAK,SAAS,MAAM,MAAM;AAAA,IACnC;AAEA,UAAM,UAAU,WAAW,GAAG,0BAA0B,GAAG,cAAc;AAEzE,UAAM,YAAY,uCAAoB;AAAA,MACpC,QAAQ;AAAA,MACR;AAAA,MACA,eAAe;AAAA,MACf;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,WAAW;AACd,aAAO,KAAK,SAAS,MAAM,MAAM;AAAA,IACnC;AAEA,mCAAoB,IAAI,YAAY,SAAS;AAE7C,QAAI,CAAC,UAAU;AACb,UAAI,UAAU,YAAY;AACxB,uCAAoB,IAAI,UAAU,YAAY,UAAU;AAAA,MAC1D;AAAA,IACF;AAEA,SAAK,SAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EACjD,SAAS,KAAP;AACA,YAAQ,MAAM,SAAS,GAAG;AAC1B,WAAO,KAAK,SAAS,MAAM,MAAM;AAAA,EACnC;AACF;AAhEgB;",
+  "sourcesContent": ["import {\n  TamaguiOptions,\n  createExtractor,\n  extractToClassNames,\n  patchReactNativeWeb,\n} from '@tamagui/static'\nimport type { LoaderContext, RawLoaderDefinitionFunction } from 'webpack'\n\nimport { extractedInfoByFile, stylePathToFilePath } from './css'\n\n// pass loader as path\nconst CSS_LOADER_PATH = require.resolve('./css')\n\nError.stackTraceLimit = Infinity\nconst extractor = createExtractor()\n\nlet index = 0\nlet hasPatched = false\n\nprocess.env.TAMAGUI_TARGET = 'web'\n\nexport const loader: RawLoaderDefinitionFunction<TamaguiOptions> = function loader(this, sourceIn) {\n  this.cacheable(true)\n  this.async()\n  const source = sourceIn.toString()\n\n  if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {\n    patchReactNativeWeb()\n    hasPatched = true\n  }\n\n  try {\n    const threaded = this.emitFile === undefined\n    const options: TamaguiOptions = { ...this.getOptions() }\n    const sourcePath = `${this.resourcePath}`\n    const startsWithComment = source[0] === '/' && source[1] === '/'\n\n    let shouldPrintDebug: boolean | 'verbose' =\n      (!!process.env.DEBUG &&\n        (process.env.DEBUG_FILE ? sourcePath.includes(process.env.DEBUG_FILE) : true)) ||\n      // supports esbuild style //! comments\n      (startsWithComment && (source.startsWith('// debug') || source.startsWith('//! debug')))\n\n    if (shouldPrintDebug && source.startsWith('// debug-verbose')) {\n      shouldPrintDebug = 'verbose'\n    }\n\n    // check if should ignore\n    if (\n      startsWithComment &&\n      (source.startsWith('// tamagui-ignore') || source.startsWith('//! tamagui-ignore'))\n    ) {\n      return this.callback(null, source)\n    }\n\n    const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`\n\n    // cssLoaderPath: CSS_LOADER_PATH,\n    // threaded,\n    // cssPath,\n\n    const extracted = extractToClassNames({\n      extractor,\n      source,\n      sourcePath,\n      options,\n      shouldPrintDebug,\n    })\n\n    if (!extracted) {\n      return this.callback(null, source)\n    }\n\n    // add import to css\n    if (extracted.styles) {\n      const cssQuery = threaded\n        ? `cssData=${Buffer.from(extracted.styles).toString('base64')}`\n        : `cssPath=${cssPath}`\n      const remReq = this.remainingRequest\n      const importPath = `${cssPath}!=!${CSS_LOADER_PATH}?${cssQuery}!${remReq}`\n      extracted.js = `${extracted.js}\\n\\nrequire(${JSON.stringify(importPath)})`\n    }\n\n    extractedInfoByFile.set(sourcePath, extracted)\n\n    if (!threaded) {\n      if (extracted.stylesPath) {\n        stylePathToFilePath.set(extracted.stylesPath, sourcePath)\n      }\n    }\n\n    this.callback(null, extracted.js, extracted.map)\n  } catch (err) {\n    console.error('ERROR', err)\n    return this.callback(null, source)\n  }\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAKO;AAGP,iBAAyD;AAGzD,MAAM,kBAAkC;AAExC,MAAM,kBAAkB;AACxB,MAAM,YAAY,mCAAgB;AAElC,IAAI,QAAQ;AACZ,IAAI,aAAa;AAEjB,QAAQ,IAAI,iBAAiB;AAEtB,MAAM,SAAsD,wCAAsB,UAAU;AACjG,OAAK,UAAU,IAAI;AACnB,OAAK,MAAM;AACX,QAAM,SAAS,SAAS,SAAS;AAEjC,MAAI,CAAC,QAAQ,IAAI,6BAA6B,CAAC,YAAY;AACzD,2CAAoB;AACpB,iBAAa;AAAA,EACf;AAEA,MAAI;AACF,UAAM,WAAW,KAAK,aAAa;AACnC,UAAM,UAA0B,mBAAK,KAAK,WAAW;AACrD,UAAM,aAAa,GAAG,KAAK;AAC3B,UAAM,oBAAoB,OAAO,OAAO,OAAO,OAAO,OAAO;AAE7D,QAAI,mBACD,CAAC,CAAC,QAAQ,IAAI,SACZ,SAAQ,IAAI,aAAa,WAAW,SAAS,QAAQ,IAAI,UAAU,IAAI,SAEzE,qBAAsB,QAAO,WAAW,UAAU,KAAK,OAAO,WAAW,WAAW;AAEvF,QAAI,oBAAoB,OAAO,WAAW,kBAAkB,GAAG;AAC7D,yBAAmB;AAAA,IACrB;AAGA,QACE,qBACC,QAAO,WAAW,mBAAmB,KAAK,OAAO,WAAW,oBAAoB,IACjF;AACA,aAAO,KAAK,SAAS,MAAM,MAAM;AAAA,IACnC;AAEA,UAAM,UAAU,WAAW,GAAG,0BAA0B,GAAG,cAAc;AAMzE,UAAM,YAAY,uCAAoB;AAAA,MACpC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,WAAW;AACd,aAAO,KAAK,SAAS,MAAM,MAAM;AAAA,IACnC;AAGA,QAAI,UAAU,QAAQ;AACpB,YAAM,WAAW,WACb,WAAW,OAAO,KAAK,UAAU,MAAM,EAAE,SAAS,QAAQ,MAC1D,WAAW;AACf,YAAM,SAAS,KAAK;AACpB,YAAM,aAAa,GAAG,aAAa,mBAAmB,YAAY;AAClE,gBAAU,KAAK,GAAG,UAAU;AAAA;AAAA,UAAiB,KAAK,UAAU,UAAU;AAAA,IACxE;AAEA,mCAAoB,IAAI,YAAY,SAAS;AAE7C,QAAI,CAAC,UAAU;AACb,UAAI,UAAU,YAAY;AACxB,uCAAoB,IAAI,UAAU,YAAY,UAAU;AAAA,MAC1D;AAAA,IACF;AAEA,SAAK,SAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EACjD,SAAS,KAAP;AACA,YAAQ,MAAM,SAAS,GAAG;AAC1B,WAAO,KAAK,SAAS,MAAM,MAAM;AAAA,EACnC;AACF,GA3EmE;",
   "names": []
 }

package/dist/esm/css.js

@@ -18,7 +18,7 @@ function loader() {
   } else if (options.cssData) {
     out = Buffer.from(options.cssData, "base64").toString("utf-8");
   }
-  if (options.cssData || options.cssPath) {
+  if (out) {
     return this.callback(null, out || "");
   }
   this.callback({ message: `No CSS found`, name: "missing_css" });

package/dist/esm/css.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/css.ts"],
-  "sourcesContent": ["import { ExtractedResponse, TamaguiOptions } from '@tamagui/static'\nimport { LoaderContext } from 'webpack'\n\nexport const extractedInfoByFile = new Map<string, ExtractedResponse>()\nexport const stylePathToFilePath = new Map<string, string>()\n\nexport default function loader(this: LoaderContext<any>) {\n  this.async()\n  const options: TamaguiOptions = { ...this.getOptions() }\n  const sourcePath = `${this.resourcePath}`\n  let out = ''\n  if (options.cssPath) {\n    // get in memory info\n    const pathKey = stylePathToFilePath.get(sourcePath) ?? sourcePath\n    const info = extractedInfoByFile.get(pathKey)\n    // clear memory\n    stylePathToFilePath.delete(sourcePath)\n    extractedInfoByFile.delete(pathKey)\n    const out = info?.styles\n    return this.callback(null, out || '')\n  } else if (options.cssData) {\n    // get output CSS\n    out = Buffer.from(options.cssData, 'base64').toString('utf-8')\n  }\n  if (options.cssData || options.cssPath) {\n    // use original JS sourcemap\n    return this.callback(null, out || '')\n  }\n  this.callback({ message: `No CSS found`, name: 'missing_css' })\n}\n"],
-  "mappings": ";;AAGO,MAAM,sBAAsB,oBAAI,IAA+B;AAC/D,MAAM,sBAAsB,oBAAI,IAAoB;AAE5C,kBAA0C;AANzD;AAOE,OAAK,MAAM;AACX,QAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,QAAM,aAAa,GAAG,KAAK;AAC3B,MAAI,MAAM;AACV,MAAI,QAAQ,SAAS;AAEnB,UAAM,UAAU,0BAAoB,IAAI,UAAU,MAAlC,YAAuC;AACvD,UAAM,OAAO,oBAAoB,IAAI,OAAO;AAE5C,wBAAoB,OAAO,UAAU;AACrC,wBAAoB,OAAO,OAAO;AAClC,UAAM,OAAM,6BAAM;AAClB,WAAO,KAAK,SAAS,MAAM,QAAO,EAAE;AAAA,EACtC,WAAW,QAAQ,SAAS;AAE1B,UAAM,OAAO,KAAK,QAAQ,SAAS,QAAQ,EAAE,SAAS,OAAO;AAAA,EAC/D;AACA,MAAI,QAAQ,WAAW,QAAQ,SAAS;AAEtC,WAAO,KAAK,SAAS,MAAM,OAAO,EAAE;AAAA,EACtC;AACA,OAAK,SAAS,EAAE,SAAS,gBAAgB,MAAM,cAAc,CAAC;AAChE;AAvBwB;",
+  "sourcesContent": ["import { ExtractedResponse, TamaguiOptions } from '@tamagui/static'\nimport { LoaderContext } from 'webpack'\n\nexport const extractedInfoByFile = new Map<string, ExtractedResponse>()\nexport const stylePathToFilePath = new Map<string, string>()\n\nexport default function loader(this: LoaderContext<any>) {\n  this.async()\n  const options: TamaguiOptions = { ...this.getOptions() }\n  const sourcePath = `${this.resourcePath}`\n  let out = ''\n  if (options.cssPath) {\n    // get in memory info\n    const pathKey = stylePathToFilePath.get(sourcePath) ?? sourcePath\n    const info = extractedInfoByFile.get(pathKey)\n    // clear memory\n    stylePathToFilePath.delete(sourcePath)\n    extractedInfoByFile.delete(pathKey)\n    const out = info?.styles\n    return this.callback(null, out || '')\n  } else if (options.cssData) {\n    // get output CSS\n    out = Buffer.from(options.cssData, 'base64').toString('utf-8')\n  }\n  if (out) {\n    // use original JS sourcemap\n    return this.callback(null, out || '')\n  }\n  this.callback({ message: `No CSS found`, name: 'missing_css' })\n}\n"],
+  "mappings": ";;AAGO,MAAM,sBAAsB,oBAAI,IAA+B;AAC/D,MAAM,sBAAsB,oBAAI,IAAoB;AAE5C,kBAA0C;AANzD;AAOE,OAAK,MAAM;AACX,QAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,QAAM,aAAa,GAAG,KAAK;AAC3B,MAAI,MAAM;AACV,MAAI,QAAQ,SAAS;AAEnB,UAAM,UAAU,0BAAoB,IAAI,UAAU,MAAlC,YAAuC;AACvD,UAAM,OAAO,oBAAoB,IAAI,OAAO;AAE5C,wBAAoB,OAAO,UAAU;AACrC,wBAAoB,OAAO,OAAO;AAClC,UAAM,OAAM,6BAAM;AAClB,WAAO,KAAK,SAAS,MAAM,QAAO,EAAE;AAAA,EACtC,WAAW,QAAQ,SAAS;AAE1B,UAAM,OAAO,KAAK,QAAQ,SAAS,QAAQ,EAAE,SAAS,OAAO;AAAA,EAC/D;AACA,MAAI,KAAK;AAEP,WAAO,KAAK,SAAS,MAAM,OAAO,EAAE;AAAA,EACtC;AACA,OAAK,SAAS,EAAE,SAAS,gBAAgB,MAAM,cAAc,CAAC;AAChE;AAvBwB;",
   "names": []
 }

package/dist/esm/loader.js

@@ -12,9 +12,10 @@ const extractor = createExtractor();
 let index = 0;
 let hasPatched = false;
 process.env.TAMAGUI_TARGET = "web";
-function loader(source) {
-  this.cacheable();
+const loader = /* @__PURE__ */ __name(function loader2(sourceIn) {
+  this.cacheable(true);
   this.async();
+  const source = sourceIn.toString();
   if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {
     patchReactNativeWeb();
     hasPatched = true;
@@ -33,19 +34,23 @@ function loader(source) {
     }
     const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`;
     const extracted = extractToClassNames({
-      loader: this,
       extractor,
-      cssLoaderPath: CSS_LOADER_PATH,
       source,
-      threaded,
       sourcePath,
-      cssPath,
       options,
       shouldPrintDebug
     });
     if (!extracted) {
       return this.callback(null, source);
     }
+    if (extracted.styles) {
+      const cssQuery = threaded ? `cssData=${Buffer.from(extracted.styles).toString("base64")}` : `cssPath=${cssPath}`;
+      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) {
@@ -57,8 +62,7 @@ function loader(source) {
     console.error("ERROR", err);
     return this.callback(null, source);
   }
-}
-__name(loader, "loader");
+}, "loader");
 export {
   loader
 };

package/dist/esm/loader.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/loader.ts"],
-  "sourcesContent": ["import {\n  TamaguiOptions,\n  createExtractor,\n  extractToClassNames,\n  patchReactNativeWeb,\n} from '@tamagui/static'\nimport { LoaderContext } from 'webpack'\n\nimport { extractedInfoByFile, stylePathToFilePath } from './css'\n\n// pass loader as path\nconst CSS_LOADER_PATH = require.resolve('./css')\n\nError.stackTraceLimit = Infinity\nconst extractor = createExtractor()\n\nlet index = 0\nlet hasPatched = false\n\nprocess.env.TAMAGUI_TARGET = 'web'\n\nexport function loader(this: LoaderContext<any>, source: string) {\n  this.cacheable()\n  this.async()\n\n  if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {\n    patchReactNativeWeb()\n    hasPatched = true\n  }\n\n  try {\n    const threaded = this.emitFile === undefined\n    const options: TamaguiOptions = { ...this.getOptions() }\n    const sourcePath = `${this.resourcePath}`\n    const startsWithComment = source[0] === '/' && source[1] === '/'\n\n    let shouldPrintDebug: boolean | 'verbose' =\n      (!!process.env.DEBUG &&\n        (process.env.DEBUG_FILE ? sourcePath.includes(process.env.DEBUG_FILE) : true)) ||\n      // supports esbuild style //! comments\n      (startsWithComment && (source.startsWith('// debug') || source.startsWith('//! debug')))\n\n    if (shouldPrintDebug && source.startsWith('// debug-verbose')) {\n      shouldPrintDebug = 'verbose'\n    }\n\n    // check if should ignore\n    if (\n      startsWithComment &&\n      (source.startsWith('// tamagui-ignore') || source.startsWith('//! tamagui-ignore'))\n    ) {\n      return this.callback(null, source)\n    }\n\n    const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`\n\n    const extracted = extractToClassNames({\n      loader: this,\n      extractor,\n      cssLoaderPath: CSS_LOADER_PATH,\n      source,\n      threaded,\n      sourcePath,\n      cssPath,\n      options,\n      shouldPrintDebug,\n    })\n\n    if (!extracted) {\n      return this.callback(null, source)\n    }\n\n    extractedInfoByFile.set(sourcePath, extracted)\n\n    if (!threaded) {\n      if (extracted.stylesPath) {\n        stylePathToFilePath.set(extracted.stylesPath, sourcePath)\n      }\n    }\n\n    this.callback(null, extracted.js, extracted.map)\n  } catch (err) {\n    console.error('ERROR', err)\n    return this.callback(null, source)\n  }\n}\n"],
-  "mappings": ";;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA;AAGA,MAAM,kBAAkC;AAExC,MAAM,kBAAkB;AACxB,MAAM,YAAY,gBAAgB;AAElC,IAAI,QAAQ;AACZ,IAAI,aAAa;AAEjB,QAAQ,IAAI,iBAAiB;AAEtB,gBAA0C,QAAgB;AAC/D,OAAK,UAAU;AACf,OAAK,MAAM;AAEX,MAAI,CAAC,QAAQ,IAAI,6BAA6B,CAAC,YAAY;AACzD,wBAAoB;AACpB,iBAAa;AAAA,EACf;AAEA,MAAI;AACF,UAAM,WAAW,KAAK,aAAa;AACnC,UAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,UAAM,aAAa,GAAG,KAAK;AAC3B,UAAM,oBAAoB,OAAO,OAAO,OAAO,OAAO,OAAO;AAE7D,QAAI,mBACD,CAAC,CAAC,QAAQ,IAAI,SACZ,SAAQ,IAAI,aAAa,WAAW,SAAS,QAAQ,IAAI,UAAU,IAAI,SAEzE,qBAAsB,QAAO,WAAW,UAAU,KAAK,OAAO,WAAW,WAAW;AAEvF,QAAI,oBAAoB,OAAO,WAAW,kBAAkB,GAAG;AAC7D,yBAAmB;AAAA,IACrB;AAGA,QACE,qBACC,QAAO,WAAW,mBAAmB,KAAK,OAAO,WAAW,oBAAoB,IACjF;AACA,aAAO,KAAK,SAAS,MAAM,MAAM;AAAA,IACnC;AAEA,UAAM,UAAU,WAAW,GAAG,0BAA0B,GAAG,cAAc;AAEzE,UAAM,YAAY,oBAAoB;AAAA,MACpC,QAAQ;AAAA,MACR;AAAA,MACA,eAAe;AAAA,MACf;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,WAAW;AACd,aAAO,KAAK,SAAS,MAAM,MAAM;AAAA,IACnC;AAEA,wBAAoB,IAAI,YAAY,SAAS;AAE7C,QAAI,CAAC,UAAU;AACb,UAAI,UAAU,YAAY;AACxB,4BAAoB,IAAI,UAAU,YAAY,UAAU;AAAA,MAC1D;AAAA,IACF;AAEA,SAAK,SAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EACjD,SAAS,KAAP;AACA,YAAQ,MAAM,SAAS,GAAG;AAC1B,WAAO,KAAK,SAAS,MAAM,MAAM;AAAA,EACnC;AACF;AAhEgB;",
+  "sourcesContent": ["import {\n  TamaguiOptions,\n  createExtractor,\n  extractToClassNames,\n  patchReactNativeWeb,\n} from '@tamagui/static'\nimport type { LoaderContext, RawLoaderDefinitionFunction } from 'webpack'\n\nimport { extractedInfoByFile, stylePathToFilePath } from './css'\n\n// pass loader as path\nconst CSS_LOADER_PATH = require.resolve('./css')\n\nError.stackTraceLimit = Infinity\nconst extractor = createExtractor()\n\nlet index = 0\nlet hasPatched = false\n\nprocess.env.TAMAGUI_TARGET = 'web'\n\nexport const loader: RawLoaderDefinitionFunction<TamaguiOptions> = function loader(this, sourceIn) {\n  this.cacheable(true)\n  this.async()\n  const source = sourceIn.toString()\n\n  if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {\n    patchReactNativeWeb()\n    hasPatched = true\n  }\n\n  try {\n    const threaded = this.emitFile === undefined\n    const options: TamaguiOptions = { ...this.getOptions() }\n    const sourcePath = `${this.resourcePath}`\n    const startsWithComment = source[0] === '/' && source[1] === '/'\n\n    let shouldPrintDebug: boolean | 'verbose' =\n      (!!process.env.DEBUG &&\n        (process.env.DEBUG_FILE ? sourcePath.includes(process.env.DEBUG_FILE) : true)) ||\n      // supports esbuild style //! comments\n      (startsWithComment && (source.startsWith('// debug') || source.startsWith('//! debug')))\n\n    if (shouldPrintDebug && source.startsWith('// debug-verbose')) {\n      shouldPrintDebug = 'verbose'\n    }\n\n    // check if should ignore\n    if (\n      startsWithComment &&\n      (source.startsWith('// tamagui-ignore') || source.startsWith('//! tamagui-ignore'))\n    ) {\n      return this.callback(null, source)\n    }\n\n    const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`\n\n    // cssLoaderPath: CSS_LOADER_PATH,\n    // threaded,\n    // cssPath,\n\n    const extracted = extractToClassNames({\n      extractor,\n      source,\n      sourcePath,\n      options,\n      shouldPrintDebug,\n    })\n\n    if (!extracted) {\n      return this.callback(null, source)\n    }\n\n    // add import to css\n    if (extracted.styles) {\n      const cssQuery = threaded\n        ? `cssData=${Buffer.from(extracted.styles).toString('base64')}`\n        : `cssPath=${cssPath}`\n      const remReq = this.remainingRequest\n      const importPath = `${cssPath}!=!${CSS_LOADER_PATH}?${cssQuery}!${remReq}`\n      extracted.js = `${extracted.js}\\n\\nrequire(${JSON.stringify(importPath)})`\n    }\n\n    extractedInfoByFile.set(sourcePath, extracted)\n\n    if (!threaded) {\n      if (extracted.stylesPath) {\n        stylePathToFilePath.set(extracted.stylesPath, sourcePath)\n      }\n    }\n\n    this.callback(null, extracted.js, extracted.map)\n  } catch (err) {\n    console.error('ERROR', err)\n    return this.callback(null, source)\n  }\n}\n"],
+  "mappings": ";;AAAA;AAAA;AAAA;AAAA;AAAA;AAQA;AAGA,MAAM,kBAAkC;AAExC,MAAM,kBAAkB;AACxB,MAAM,YAAY,gBAAgB;AAElC,IAAI,QAAQ;AACZ,IAAI,aAAa;AAEjB,QAAQ,IAAI,iBAAiB;AAEtB,MAAM,SAAsD,wCAAsB,UAAU;AACjG,OAAK,UAAU,IAAI;AACnB,OAAK,MAAM;AACX,QAAM,SAAS,SAAS,SAAS;AAEjC,MAAI,CAAC,QAAQ,IAAI,6BAA6B,CAAC,YAAY;AACzD,wBAAoB;AACpB,iBAAa;AAAA,EACf;AAEA,MAAI;AACF,UAAM,WAAW,KAAK,aAAa;AACnC,UAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,UAAM,aAAa,GAAG,KAAK;AAC3B,UAAM,oBAAoB,OAAO,OAAO,OAAO,OAAO,OAAO;AAE7D,QAAI,mBACD,CAAC,CAAC,QAAQ,IAAI,SACZ,SAAQ,IAAI,aAAa,WAAW,SAAS,QAAQ,IAAI,UAAU,IAAI,SAEzE,qBAAsB,QAAO,WAAW,UAAU,KAAK,OAAO,WAAW,WAAW;AAEvF,QAAI,oBAAoB,OAAO,WAAW,kBAAkB,GAAG;AAC7D,yBAAmB;AAAA,IACrB;AAGA,QACE,qBACC,QAAO,WAAW,mBAAmB,KAAK,OAAO,WAAW,oBAAoB,IACjF;AACA,aAAO,KAAK,SAAS,MAAM,MAAM;AAAA,IACnC;AAEA,UAAM,UAAU,WAAW,GAAG,0BAA0B,GAAG,cAAc;AAMzE,UAAM,YAAY,oBAAoB;AAAA,MACpC;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAED,QAAI,CAAC,WAAW;AACd,aAAO,KAAK,SAAS,MAAM,MAAM;AAAA,IACnC;AAGA,QAAI,UAAU,QAAQ;AACpB,YAAM,WAAW,WACb,WAAW,OAAO,KAAK,UAAU,MAAM,EAAE,SAAS,QAAQ,MAC1D,WAAW;AACf,YAAM,SAAS,KAAK;AACpB,YAAM,aAAa,GAAG,aAAa,mBAAmB,YAAY;AAClE,gBAAU,KAAK,GAAG,UAAU;AAAA;AAAA,UAAiB,KAAK,UAAU,UAAU;AAAA,IACxE;AAEA,wBAAoB,IAAI,YAAY,SAAS;AAE7C,QAAI,CAAC,UAAU;AACb,UAAI,UAAU,YAAY;AACxB,4BAAoB,IAAI,UAAU,YAAY,UAAU;AAAA,MAC1D;AAAA,IACF;AAEA,SAAK,SAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EACjD,SAAS,KAAP;AACA,YAAQ,MAAM,SAAS,GAAG;AAC1B,WAAO,KAAK,SAAS,MAAM,MAAM;AAAA,EACnC;AACF,GA3EmE;",
   "names": []
 }

package/dist/jsx/css.js

@@ -18,7 +18,7 @@ function loader() {
   } else if (options.cssData) {
     out = Buffer.from(options.cssData, "base64").toString("utf-8");
   }
-  if (options.cssData || options.cssPath) {
+  if (out) {
     return this.callback(null, out || "");
   }
   this.callback({ message: `No CSS found`, name: "missing_css" });

package/dist/jsx/loader.js

@@ -12,9 +12,10 @@ const extractor = createExtractor();
 let index = 0;
 let hasPatched = false;
 process.env.TAMAGUI_TARGET = "web";
-function loader(source) {
-  this.cacheable();
+const loader = /* @__PURE__ */ __name(function loader2(sourceIn) {
+  this.cacheable(true);
   this.async();
+  const source = sourceIn.toString();
   if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {
     patchReactNativeWeb();
     hasPatched = true;
@@ -33,19 +34,23 @@ function loader(source) {
     }
     const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`;
     const extracted = extractToClassNames({
-      loader: this,
       extractor,
-      cssLoaderPath: CSS_LOADER_PATH,
       source,
-      threaded,
       sourcePath,
-      cssPath,
       options,
       shouldPrintDebug
     });
     if (!extracted) {
       return this.callback(null, source);
     }
+    if (extracted.styles) {
+      const cssQuery = threaded ? `cssData=${Buffer.from(extracted.styles).toString("base64")}` : `cssPath=${cssPath}`;
+      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) {
@@ -57,8 +62,7 @@ function loader(source) {
     console.error("ERROR", err);
     return this.callback(null, source);
   }
-}
-__name(loader, "loader");
+}, "loader");
 export {
   loader
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui-loader",
-  "version": "1.0.1-beta.70",
+  "version": "1.0.1-beta.71",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -17,12 +17,12 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/static": "^1.0.1-beta.70",
+    "@tamagui/static": "^1.0.1-beta.71",
     "fs-extra": "^9.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.70"
+    "@tamagui/build": "^1.0.1-beta.71"
   },
   "publishConfig": {
     "access": "public"

package/src/css.ts

@@ -22,7 +22,7 @@ export default function loader(this: LoaderContext<any>) {
     // get output CSS
     out = Buffer.from(options.cssData, 'base64').toString('utf-8')
   }
-  if (options.cssData || options.cssPath) {
+  if (out) {
     // use original JS sourcemap
     return this.callback(null, out || '')
   }

package/src/loader.ts

@@ -4,7 +4,7 @@ import {
   extractToClassNames,
   patchReactNativeWeb,
 } from '@tamagui/static'
-import { LoaderContext } from 'webpack'
+import type { LoaderContext, RawLoaderDefinitionFunction } from 'webpack'
 
 import { extractedInfoByFile, stylePathToFilePath } from './css'
 
@@ -19,9 +19,10 @@ let hasPatched = false
 
 process.env.TAMAGUI_TARGET = 'web'
 
-export function loader(this: LoaderContext<any>, source: string) {
-  this.cacheable()
+export const loader: RawLoaderDefinitionFunction<TamaguiOptions> = function loader(this, sourceIn) {
+  this.cacheable(true)
   this.async()
+  const source = sourceIn.toString()
 
   if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {
     patchReactNativeWeb()
@@ -54,14 +55,14 @@ export function loader(this: LoaderContext<any>, source: string) {
 
     const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`
 
+    // cssLoaderPath: CSS_LOADER_PATH,
+    // threaded,
+    // cssPath,
+
     const extracted = extractToClassNames({
-      loader: this,
       extractor,
-      cssLoaderPath: CSS_LOADER_PATH,
       source,
-      threaded,
       sourcePath,
-      cssPath,
       options,
       shouldPrintDebug,
     })
@@ -70,6 +71,16 @@ export function loader(this: LoaderContext<any>, source: string) {
       return this.callback(null, source)
     }
 
+    // add import to css
+    if (extracted.styles) {
+      const cssQuery = threaded
+        ? `cssData=${Buffer.from(extracted.styles).toString('base64')}`
+        : `cssPath=${cssPath}`
+      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) {

package/types/loader.d.ts

@@ -1,3 +1,4 @@
-import { LoaderContext } from 'webpack';
-export declare function loader(this: LoaderContext<any>, source: string): void;
+import { TamaguiOptions } from '@tamagui/static';
+import type { RawLoaderDefinitionFunction } from 'webpack';
+export declare const loader: RawLoaderDefinitionFunction<TamaguiOptions>;
 //# 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":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAevC,wBAAgB,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,QAgE9D"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAIf,MAAM,iBAAiB,CAAA;AACxB,OAAO,KAAK,EAAiB,2BAA2B,EAAE,MAAM,SAAS,CAAA;AAezE,eAAO,MAAM,MAAM,EAAE,2BAA2B,CAAC,cAAc,CA2E9D,CAAA"}