tamagui-loader 1.0.1-rc.8 → 1.0.1

package/dist/jsx/css.js

@@ -1,16 +1,17 @@
 const extractedInfoByFile = /* @__PURE__ */ new Map();
 const stylePathToFilePath = /* @__PURE__ */ new Map();
 function loader() {
+  var _a;
   this.async();
   const options = { ...this.getOptions() };
   const sourcePath = `${this.resourcePath}`;
   let out = "";
   if (options.cssPath) {
-    const pathKey = stylePathToFilePath.get(sourcePath) ?? sourcePath;
+    const pathKey = (_a = stylePathToFilePath.get(sourcePath)) != null ? _a : sourcePath;
     const info = extractedInfoByFile.get(pathKey);
     stylePathToFilePath.delete(sourcePath);
     extractedInfoByFile.delete(pathKey);
-    const out2 = info?.styles;
+    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");
@@ -18,7 +19,7 @@ function loader() {
   if (out) {
     return this.callback(null, out || "");
   }
-  this.callback({ message: "No CSS found", name: "missing_css" });
+  this.callback({ message: `No CSS found`, name: "missing_css" });
 }
 export {
   loader as default,

package/dist/jsx/css.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/css.ts"],
-  "sourcesContent": ["import { ExtractedResponse, TamaguiOptions } from '@tamagui/static'\nimport type { 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<TamaguiOptions>) {\n  this.async()\n  const options = { ...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\n  if (out) {\n    // use original JS sourcemap\n    return this.callback(null, out || '')\n  }\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,SAAR,SAA6D;AAClE,OAAK,MAAM;AACX,QAAM,UAAU,EAAE,GAAG,KAAK,WAAW,EAAE;AACvC,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,UAAMA,OAAM,MAAM;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"]
+  "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;",
+  "names": []
 }

package/dist/jsx/index.js

@@ -1,18 +1,13 @@
-import path from "path";
 process.env.TAMAGUI_TARGET = process.env.TAMAGUI_TARGET || "web";
 process.env.TAMAGUI_COMPILE_PROCESS = "1";
 process.env.IS_STATIC = "is_static";
-export * from "./plugin";
 var src_default = require("./loader").loader;
-const shouldExclude = (filePath, projectRoot) => {
-  if (filePath.includes(projectRoot) && filePath.endsWith("sx") || isTamaguiDistJSX(filePath)) {
+const shouldExclude = (path, projectRoot) => {
+  if (path.includes("react-native-web") || path.includes("react-native-reanimated") || path.includes("react-native-gesture-handler") || path.includes("@gorhom/portal") || path.includes(projectRoot) || path.includes("/dist/jsx/")) {
     return false;
   }
   return true;
 };
-function isTamaguiDistJSX(filePath) {
-  return filePath.includes("/dist/jsx/".replace(/\//g, path.sep));
-}
 export {
   src_default as default,
   shouldExclude

package/dist/jsx/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "sourcesContent": ["import path from 'path'\n\nprocess.env.TAMAGUI_TARGET = process.env.TAMAGUI_TARGET || 'web'\nprocess.env.TAMAGUI_COMPILE_PROCESS = '1'\nprocess.env.IS_STATIC = 'is_static'\n\nexport * from './plugin'\n\nexport default require('./loader').loader\n\n// helper for webpack exclude specific to tamagui\n\nexport const shouldExclude = (filePath: string, projectRoot: string) => {\n  if (\n    (filePath.includes(projectRoot) && filePath.endsWith('sx')) ||\n    isTamaguiDistJSX(filePath)\n  ) {\n    return false\n  }\n  return true\n}\n\nfunction isTamaguiDistJSX(filePath: string) {\n  return filePath.includes('/dist/jsx/'.replace(/\\//g, path.sep))\n}\n"],
-  "mappings": "AAAA,OAAO,UAAU;AAEjB,QAAQ,IAAI,iBAAiB,QAAQ,IAAI,kBAAkB;AAC3D,QAAQ,IAAI,0BAA0B;AACtC,QAAQ,IAAI,YAAY;AAExB,cAAc;AAEd,IAAO,cAAQ,QAAQ,UAAU,EAAE;AAI5B,MAAM,gBAAgB,CAAC,UAAkB,gBAAwB;AACtE,MACG,SAAS,SAAS,WAAW,KAAK,SAAS,SAAS,IAAI,KACzD,iBAAiB,QAAQ,GACzB;AACA,WAAO;AAAA,EACT;AACA,SAAO;AACT;AAEA,SAAS,iBAAiB,UAAkB;AAC1C,SAAO,SAAS,SAAS,aAAa,QAAQ,OAAO,KAAK,GAAG,CAAC;AAChE;",
+  "sourcesContent": ["process.env.TAMAGUI_TARGET = process.env.TAMAGUI_TARGET || 'web'\nprocess.env.TAMAGUI_COMPILE_PROCESS = '1'\nprocess.env.IS_STATIC = 'is_static'\n\nexport default require('./loader').loader\n\n// helper for webpack exclude specific to tamagui\n\nexport const shouldExclude = (path: string, projectRoot: string) => {\n  if (\n    path.includes('react-native-web') ||\n    path.includes('react-native-reanimated') ||\n    path.includes('react-native-gesture-handler') ||\n    path.includes('@gorhom/portal') ||\n    path.includes(projectRoot) ||\n    path.includes('/dist/jsx/')\n  ) {\n    return false\n  }\n  return true\n}\n"],
+  "mappings": "AAAA,QAAQ,IAAI,iBAAiB,QAAQ,IAAI,kBAAkB;AAC3D,QAAQ,IAAI,0BAA0B;AACtC,QAAQ,IAAI,YAAY;AAExB,IAAO,cAAQ,QAAQ,UAAU,EAAE;AAI5B,MAAM,gBAAgB,CAAC,MAAc,gBAAwB;AAClE,MACE,KAAK,SAAS,kBAAkB,KAChC,KAAK,SAAS,yBAAyB,KACvC,KAAK,SAAS,8BAA8B,KAC5C,KAAK,SAAS,gBAAgB,KAC9B,KAAK,SAAS,WAAW,KACzB,KAAK,SAAS,YAAY,GAC1B;AACA,WAAO;AAAA,EACT;AACA,SAAO;AACT;",
   "names": []
 }

package/dist/jsx/loader.js

@@ -1,36 +1,38 @@
-import { Color, colorLog } from "@tamagui/cli-color";
+Error.stackTraceLimit = Infinity;
 import {
   createExtractor,
   extractToClassNames,
-  getPragmaOptions
+  patchReactNativeWeb
 } 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;
+let hasPatched = false;
 process.env.TAMAGUI_TARGET = "web";
-const loader = async function loader2(sourceIn) {
+const loader = function loader2(sourceIn) {
   this.cacheable(true);
-  const callback = this.async();
+  this.async();
   const source = sourceIn.toString();
+  if (!process.env.TAMAGUI_DISABLE_RNW_PATCH && !hasPatched) {
+    patchReactNativeWeb();
+    hasPatched = true;
+  }
   try {
     const threaded = this.emitFile === void 0;
     const options = { ...this.getOptions() };
     const sourcePath = `${this.resourcePath}`;
-    const { shouldDisable, shouldPrintDebug } = getPragmaOptions({
-      source,
-      path: sourcePath
-    });
-    if (shouldDisable) {
-      if (shouldPrintDebug) {
-        console.log("Disabling on file via pragma");
-      }
-      return callback(null, source);
+    const startsWithComment = source[0] === "/" && source[1] === "/";
+    let shouldPrintDebug = !!process.env.DEBUG && (process.env.DEBUG_FILE ? sourcePath.includes(process.env.DEBUG_FILE) : true) || startsWithComment && (source.startsWith("// debug") || source.startsWith("//! debug"));
+    if (shouldPrintDebug && source.startsWith("// debug-verbose")) {
+      shouldPrintDebug = "verbose";
     }
-    const cssPath = threaded ? `${sourcePath}.tamagui.css` : `${sourcePath}.${index++}.tamagui.css`;
-    const extracted = await extractToClassNames({
+    if (startsWithComment && (source.startsWith("// tamagui-ignore") || source.startsWith("//! tamagui-ignore"))) {
+      return this.callback(null, source);
+    }
+    const cssPath = threaded ? `${sourcePath}.module.css` : `${sourcePath}.${index++}.module.css`;
+    const extracted = extractToClassNames({
       extractor,
       source,
       sourcePath,
@@ -38,10 +40,9 @@ const loader = async function loader2(sourceIn) {
       shouldPrintDebug
     });
     if (!extracted) {
-      return callback(null, source);
+      return this.callback(null, source);
     }
     if (extracted.styles) {
-      this.addDependency(cssPath);
       const cssQuery = threaded ? `cssData=${Buffer.from(extracted.styles).toString("base64")}` : `cssPath=${cssPath}`;
       const remReq = this.remainingRequest;
       const importPath = `${cssPath}!=!${CSS_LOADER_PATH}?${cssQuery}!${remReq}`;
@@ -55,18 +56,9 @@ require(${JSON.stringify(importPath)})`;
         stylePathToFilePath.set(extracted.stylesPath, sourcePath);
       }
     }
-    callback(null, extracted.js, extracted.map);
+    this.callback(null, extracted.js, extracted.map);
   } catch (err) {
-    const message = err instanceof Error ? `${err.message}
-${err.stack}` : String(err);
-    console.error("Tamagui Webpack Loader Error:\n", `  ${message}
-`);
-    if (message.includes("Cannot create proxy")) {
-      console.log(
-        "This is usually due to components not loading at build-time. Check for logs just below the line above:"
-      );
-      colorLog(Color.FgYellow, `"Tamagui built config and components"`);
-    }
+    console.error("ERROR", err);
     return this.callback(null, source);
   }
 };

package/dist/jsx/loader.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/loader.ts"],
-  "sourcesContent": ["import { Color, colorLog } from '@tamagui/cli-color'\nimport {\n  TamaguiOptions,\n  createExtractor,\n  extractToClassNames,\n  getPragmaOptions,\n} from '@tamagui/static'\nimport type { LoaderContext } from 'webpack'\n\nimport { extractedInfoByFile, stylePathToFilePath } from './css'\n\nError.stackTraceLimit = Infinity\n\n// pass loader as path\nconst CSS_LOADER_PATH = require.resolve('./css')\n\nError.stackTraceLimit = Infinity\nconst extractor = createExtractor()\n\nlet index = 0\n\nprocess.env.TAMAGUI_TARGET = 'web'\n\nexport const loader = async function loader(\n  this: LoaderContext<TamaguiOptions>,\n  sourceIn: Buffer | string\n) {\n  this.cacheable(true)\n  const callback = this.async()\n  const source = sourceIn.toString()\n\n  try {\n    const threaded = this.emitFile === undefined\n    const options: TamaguiOptions = { ...this.getOptions() }\n    const sourcePath = `${this.resourcePath}`\n    const { shouldDisable, shouldPrintDebug } = getPragmaOptions({\n      source,\n      path: sourcePath,\n    })\n\n    if (shouldDisable) {\n      if (shouldPrintDebug) {\n        // eslint-disable-next-line no-console\n        console.log('Disabling on file via pragma')\n      }\n      return callback(null, source)\n    }\n\n    const cssPath = threaded\n      ? `${sourcePath}.tamagui.css`\n      : `${sourcePath}.${index++}.tamagui.css`\n\n    const extracted = await extractToClassNames({\n      extractor,\n      source,\n      sourcePath,\n      options,\n      shouldPrintDebug,\n    })\n\n    if (!extracted) {\n      return callback(null, source)\n    }\n\n    // add import to css\n    if (extracted.styles) {\n      this.addDependency(cssPath)\n\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    callback(null, extracted.js, extracted.map)\n  } catch (err) {\n    const message = err instanceof Error ? `${err.message}\\n${err.stack}` : String(err)\n\n    // eslint-disable-next-line no-console\n    console.error('Tamagui Webpack Loader Error:\\n', `  ${message}\\n`)\n\n    if (message.includes('Cannot create proxy')) {\n      // eslint-disable-next-line no-console\n      console.log(\n        'This is usually due to components not loading at build-time. Check for logs just below the line above:'\n      )\n      colorLog(Color.FgYellow, `\"Tamagui built config and components\"`)\n    }\n\n    return this.callback(null, source)\n  }\n}\n"],
-  "mappings": "AAAA,SAAS,OAAO,gBAAgB;AAChC;AAAA,EAEE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAGP,SAAS,qBAAqB,2BAA2B;AAEzD,MAAM,kBAAkB;AAGxB,MAAM,kBAAkC;AAExC,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,WAAW,KAAK,aAAa;AACnC,UAAM,UAA0B,EAAE,GAAG,KAAK,WAAW,EAAE;AACvD,UAAM,aAAa,GAAG,KAAK;AAC3B,UAAM,EAAE,eAAe,iBAAiB,IAAI,iBAAiB;AAAA,MAC3D;AAAA,MACA,MAAM;AAAA,IACR,CAAC;AAED,QAAI,eAAe;AACjB,UAAI,kBAAkB;AAEpB,gBAAQ,IAAI,8BAA8B;AAAA,MAC5C;AACA,aAAO,SAAS,MAAM,MAAM;AAAA,IAC9B;AAEA,UAAM,UAAU,WACZ,GAAG,2BACH,GAAG,cAAc;AAErB,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,WAAK,cAAc,OAAO;AAE1B,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,aAAS,MAAM,UAAU,IAAI,UAAU,GAAG;AAAA,EAC5C,SAAS,KAAP;AACA,UAAM,UAAU,eAAe,QAAQ,GAAG,IAAI;AAAA,EAAY,IAAI,UAAU,OAAO,GAAG;AAGlF,YAAQ,MAAM,mCAAmC,KAAK;AAAA,CAAW;AAEjE,QAAI,QAAQ,SAAS,qBAAqB,GAAG;AAE3C,cAAQ;AAAA,QACN;AAAA,MACF;AACA,eAAS,MAAM,UAAU,uCAAuC;AAAA,IAClE;AAEA,WAAO,KAAK,SAAS,MAAM,MAAM;AAAA,EACnC;AACF;",
-  "names": ["loader"]
+  "sourcesContent": ["Error.stackTraceLimit = Infinity\n\nimport {\n  TamaguiOptions,\n  createExtractor,\n  extractToClassNames,\n  patchReactNativeWeb,\n} from '@tamagui/static'\nimport type { 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    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,MAAM,kBAAkB;AAExB;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,iBAAsB,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;AAEzE,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;",
+  "names": []
 }

package/dist/jsx/plugin.js

@@ -6,15 +6,14 @@ class TamaguiPlugin {
     this.pluginName = "TamaguiPlugin";
   }
   apply(compiler) {
+    var _a, _b, _c;
     compiler.hooks.normalModuleFactory.tap(this.pluginName, (nmf) => {
-      nmf.hooks.createModule.tap(
-        this.pluginName,
-        (createData) => {
-          if (createData.matchResource?.endsWith(".tamagui.css")) {
-            createData.settings.sideEffects = true;
-          }
+      nmf.hooks.createModule.tap(this.pluginName, (createData) => {
+        var _a2;
+        if ((_a2 = createData.matchResource) == null ? void 0 : _a2.endsWith(".tamagui.css")) {
+          createData.settings.sideEffects = true;
         }
-      );
+      });
     });
     compiler.options.resolve.extensions = [
       .../* @__PURE__ */ new Set([
@@ -37,14 +36,12 @@ class TamaguiPlugin {
     }
     const { jsLoader } = this.options;
     const existing = compiler.options.module.rules;
-    const rules = existing.find((x) => typeof x === "object" && "oneOf" in x ? x : null)?.oneOf ?? existing;
-    const nextJsRules = rules.findIndex(
-      (x) => x?.use && x.use.loader === "next-swc-loader" && x.issuerLayer !== "api"
-    );
+    const rules = (_b = (_a = existing.find((x) => typeof x === "object" && "oneOf" in x ? x : null)) == null ? void 0 : _a.oneOf) != null ? _b : existing;
+    const nextJsRules = rules.findIndex((x) => (x == null ? void 0 : x.use) && x.use.loader === "next-swc-loader" && x.issuerLayer !== "api");
     const startIndex = nextJsRules ? nextJsRules + 1 : 0;
     const existingLoader = nextJsRules ? rules[startIndex] : void 0;
     rules.splice(startIndex, 0, {
-      test: this.options.test ?? /\.(jsx?|tsx?)$/,
+      test: (_c = this.options.test) != null ? _c : /\.(jsx?|tsx?)$/,
       exclude: this.options.exclude,
       use: [
         ...jsLoader ? [jsLoader] : [],

package/dist/jsx/plugin.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/plugin.ts"],
   "sourcesContent": ["import type { TamaguiOptions } from '@tamagui/static'\nimport type { Compiler, RuleSetRule } from 'webpack'\n\ntype PluginOptions = TamaguiOptions & {\n  commonjs?: boolean\n  exclude?: RuleSetRule['exclude']\n  test?: RuleSetRule['test']\n  jsLoader?: any\n}\n\nexport class TamaguiPlugin {\n  pluginName = 'TamaguiPlugin'\n\n  constructor(\n    public options: PluginOptions = {\n      components: ['@tamagui/core'],\n    }\n  ) {}\n\n  apply(compiler: Compiler) {\n    // mark as side effect\n    compiler.hooks.normalModuleFactory.tap(this.pluginName, (nmf) => {\n      nmf.hooks.createModule.tap(\n        this.pluginName,\n        // @ts-expect-error CreateData is typed as 'object'...\n        (createData: { matchResource?: string; settings: { sideEffects?: boolean } }) => {\n          if (createData.matchResource?.endsWith('.tamagui.css')) {\n            createData.settings.sideEffects = true\n          }\n        }\n      )\n    })\n\n    compiler.options.resolve.extensions = [\n      ...new Set([\n        '.web.tsx',\n        '.web.ts',\n        '.web.js',\n        '.ts',\n        '.tsx',\n        '.js',\n        ...(compiler.options.resolve.extensions || []),\n      ]),\n    ]\n\n    // look for compiled js with jsx intact as specified by module:jsx\n    const mainFields = compiler.options.resolve.mainFields\n    if (mainFields) {\n      compiler.options.resolve.mainFields = Array.isArray(mainFields)\n        ? mainFields\n        : [mainFields]\n      mainFields.unshift('module:jsx')\n    }\n\n    if (!compiler.options.module) {\n      return\n    }\n\n    const { jsLoader } = this.options\n\n    const existing = compiler.options.module.rules as any[]\n\n    const rules =\n      (existing.find((x) => (typeof x === 'object' && 'oneOf' in x ? x : null))\n        ?.oneOf as any[]) ?? existing\n\n    const nextJsRules = rules.findIndex(\n      (x) => x?.use && x.use.loader === 'next-swc-loader' && x.issuerLayer !== 'api'\n    )\n\n    const startIndex = nextJsRules ? nextJsRules + 1 : 0\n    const existingLoader = nextJsRules ? rules[startIndex] : undefined\n\n    rules.splice(startIndex, 0, {\n      test: this.options.test ?? /\\.(jsx?|tsx?)$/,\n      exclude: this.options.exclude,\n      use: [\n        ...(jsLoader ? [jsLoader] : []),\n        ...(existingLoader && nextJsRules ? [].concat(existingLoader.use) : []),\n        ...(!(jsLoader || existingLoader)\n          ? [\n              {\n                loader: require.resolve('esbuild-loader'),\n                options: {\n                  target: 'es2021',\n                  keepNames: true,\n                  loader: {\n                    '.tsx': 'tsx',\n                    '.png': 'copy',\n                    '.jpg': 'copy',\n                    '.gif': 'copy',\n                  },\n\n                  tsconfigRaw: {\n                    module: this.options.commonjs ? 'commonjs' : 'esnext',\n                    isolatedModules: true,\n                    jsx: 'preserve',\n                    resolveJsonModule: true,\n                  },\n                },\n              },\n            ]\n          : []),\n        {\n          loader: require.resolve('tamagui-loader'),\n          options: {\n            ...this.options,\n          },\n        },\n      ],\n    })\n  }\n}\n"],
-  "mappings": "AAUO,MAAM,cAAc;AAAA,EAGzB,YACS,UAAyB;AAAA,IAC9B,YAAY,CAAC,eAAe;AAAA,EAC9B,GACA;AAHO;AAHT,sBAAa;AAAA,EAMV;AAAA,EAEH,MAAM,UAAoB;AAExB,aAAS,MAAM,oBAAoB,IAAI,KAAK,YAAY,CAAC,QAAQ;AAC/D,UAAI,MAAM,aAAa;AAAA,QACrB,KAAK;AAAA,QAEL,CAAC,eAAgF;AAC/E,cAAI,WAAW,eAAe,SAAS,cAAc,GAAG;AACtD,uBAAW,SAAS,cAAc;AAAA,UACpC;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAED,aAAS,QAAQ,QAAQ,aAAa;AAAA,MACpC,GAAG,oBAAI,IAAI;AAAA,QACT;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAI,SAAS,QAAQ,QAAQ,cAAc,CAAC;AAAA,MAC9C,CAAC;AAAA,IACH;AAGA,UAAM,aAAa,SAAS,QAAQ,QAAQ;AAC5C,QAAI,YAAY;AACd,eAAS,QAAQ,QAAQ,aAAa,MAAM,QAAQ,UAAU,IAC1D,aACA,CAAC,UAAU;AACf,iBAAW,QAAQ,YAAY;AAAA,IACjC;AAEA,QAAI,CAAC,SAAS,QAAQ,QAAQ;AAC5B;AAAA,IACF;AAEA,UAAM,EAAE,SAAS,IAAI,KAAK;AAE1B,UAAM,WAAW,SAAS,QAAQ,OAAO;AAEzC,UAAM,QACH,SAAS,KAAK,CAAC,MAAO,OAAO,MAAM,YAAY,WAAW,IAAI,IAAI,IAAK,GACpE,SAAmB;AAEzB,UAAM,cAAc,MAAM;AAAA,MACxB,CAAC,MAAM,GAAG,OAAO,EAAE,IAAI,WAAW,qBAAqB,EAAE,gBAAgB;AAAA,IAC3E;AAEA,UAAM,aAAa,cAAc,cAAc,IAAI;AACnD,UAAM,iBAAiB,cAAc,MAAM,cAAc;AAEzD,UAAM,OAAO,YAAY,GAAG;AAAA,MAC1B,MAAM,KAAK,QAAQ,QAAQ;AAAA,MAC3B,SAAS,KAAK,QAAQ;AAAA,MACtB,KAAK;AAAA,QACH,GAAI,WAAW,CAAC,QAAQ,IAAI,CAAC;AAAA,QAC7B,GAAI,kBAAkB,cAAc,CAAC,EAAE,OAAO,eAAe,GAAG,IAAI,CAAC;AAAA,QACrE,GAAI,EAAE,YAAY,kBACd;AAAA,UACE;AAAA,YACE,QAAwB;AAAA,YACxB,SAAS;AAAA,cACP,QAAQ;AAAA,cACR,WAAW;AAAA,cACX,QAAQ;AAAA,gBACN,QAAQ;AAAA,gBACR,QAAQ;AAAA,gBACR,QAAQ;AAAA,gBACR,QAAQ;AAAA,cACV;AAAA,cAEA,aAAa;AAAA,gBACX,QAAQ,KAAK,QAAQ,WAAW,aAAa;AAAA,gBAC7C,iBAAiB;AAAA,gBACjB,KAAK;AAAA,gBACL,mBAAmB;AAAA,cACrB;AAAA,YACF;AAAA,UACF;AAAA,QACF,IACA,CAAC;AAAA,QACL;AAAA,UACE,QAAwB;AAAA,UACxB,SAAS;AAAA,YACP,GAAG,KAAK;AAAA,UACV;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
+  "mappings": "AAUO,MAAM,cAAc;AAAA,EAGzB,YACS,UAAyB;AAAA,IAC9B,YAAY,CAAC,eAAe;AAAA,EAC9B,GACA;AAHO;AAHT,sBAAa;AAAA,EAMV;AAAA,EAEH,MAAM,UAAoB;AAnB5B;AAqBI,aAAS,MAAM,oBAAoB,IAAI,KAAK,YAAY,CAAC,QAAQ;AAC/D,UAAI,MAAM,aAAa,IACrB,KAAK,YAEL,CAAC,eAAgF;AAzBzF;AA0BU,YAAI,kBAAW,kBAAX,oBAA0B,SAAS,iBAAiB;AACtD,qBAAW,SAAS,cAAc;AAAA,QACpC;AAAA,MACF,CACF;AAAA,IACF,CAAC;AAED,aAAS,QAAQ,QAAQ,aAAa;AAAA,MACpC,GAAG,oBAAI,IAAI;AAAA,QACT;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,GAAI,SAAS,QAAQ,QAAQ,cAAc,CAAC;AAAA,MAC9C,CAAC;AAAA,IACH;AAGA,UAAM,aAAa,SAAS,QAAQ,QAAQ;AAC5C,QAAI,YAAY;AACd,eAAS,QAAQ,QAAQ,aAAa,MAAM,QAAQ,UAAU,IAC1D,aACA,CAAC,UAAU;AACf,iBAAW,QAAQ,YAAY;AAAA,IACjC;AAEA,QAAI,CAAC,SAAS,QAAQ,QAAQ;AAC5B;AAAA,IACF;AAEA,UAAM,EAAE,aAAa,KAAK;AAE1B,UAAM,WAAW,SAAS,QAAQ,OAAO;AAEzC,UAAM,QACH,qBAAS,KAAK,CAAC,MAAO,OAAO,MAAM,YAAY,WAAW,IAAI,IAAI,IAAK,MAAvE,mBACG,UADH,YACsB;AAEzB,UAAM,cAAc,MAAM,UACxB,CAAC,MAAM,wBAAG,QAAO,EAAE,IAAI,WAAW,qBAAqB,EAAE,gBAAgB,KAC3E;AAEA,UAAM,aAAa,cAAc,cAAc,IAAI;AACnD,UAAM,iBAAiB,cAAc,MAAM,cAAc;AAEzD,UAAM,OAAO,YAAY,GAAG;AAAA,MAC1B,MAAM,WAAK,QAAQ,SAAb,YAAqB;AAAA,MAC3B,SAAS,KAAK,QAAQ;AAAA,MACtB,KAAK;AAAA,QACH,GAAI,WAAW,CAAC,QAAQ,IAAI,CAAC;AAAA,QAC7B,GAAI,kBAAkB,cAAc,CAAC,EAAE,OAAO,eAAe,GAAG,IAAI,CAAC;AAAA,QACrE,GAAI,CAAE,aAAY,kBACd;AAAA,UACE;AAAA,YACE,QAAwB;AAAA,YACxB,SAAS;AAAA,cACP,QAAQ;AAAA,cACR,WAAW;AAAA,cACX,QAAQ;AAAA,gBACN,QAAQ;AAAA,gBACR,QAAQ;AAAA,gBACR,QAAQ;AAAA,gBACR,QAAQ;AAAA,cACV;AAAA,cAEA,aAAa;AAAA,gBACX,QAAQ,KAAK,QAAQ,WAAW,aAAa;AAAA,gBAC7C,iBAAiB;AAAA,gBACjB,KAAK;AAAA,gBACL,mBAAmB;AAAA,cACrB;AAAA,YACF;AAAA,UACF;AAAA,QACF,IACA,CAAC;AAAA,QACL;AAAA,UACE,QAAwB;AAAA,UACxB,SAAS;AAAA,YACP,GAAG,KAAK;AAAA,UACV;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tamagui-loader",
-  "version": "1.0.1-rc.8",
+  "version": "1.0.1",
   "types": "./types/index.d.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -18,14 +18,14 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/cli-color": "^1.0.1-rc.8",
-    "@tamagui/static": "^1.0.1-rc.8",
+    "@tamagui/cli-color": "^1.0.1",
+    "@tamagui/static": "^1.0.1",
     "fs-extra": "^10.1.0",
     "loader-utils": "^3.2.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-rc.8",
+    "@tamagui/build": "^1.0.1",
     "webpack": "^5.74.0"
   },
   "publishConfig": {