@tamagui/next-plugin 1.90.7 → 1.90.8

package/dist/cjs/withTamagui.js

@@ -25,7 +25,7 @@ __export(withTamagui_exports, {
   withTamagui: () => withTamagui
 });
 module.exports = __toCommonJS(withTamagui_exports);
-var import_path = __toESM(require("path")), import_browserslist = __toESM(require("browserslist")), import_css = require("next/dist/build/webpack/config/blocks/css"), import_loaders = require("next/dist/build/webpack/config/blocks/css/loaders"), import_tamagui_loader = require("tamagui-loader"), import_webpack = __toESM(require("webpack")), import_static = require("@tamagui/static");
+var import_browserslist = __toESM(require("browserslist")), import_css = require("next/dist/build/webpack/config/blocks/css"), import_loaders = require("next/dist/build/webpack/config/blocks/css/loaders"), import_path = __toESM(require("path")), import_static = require("@tamagui/static"), import_tamagui_loader = require("tamagui-loader"), import_webpack = __toESM(require("webpack"));
 const withTamagui = (tamaguiOptionsIn) => (nextConfig = {}) => {
   const tamaguiOptions = {
     ...tamaguiOptionsIn,
@@ -39,8 +39,7 @@ const withTamagui = (tamaguiOptionsIn) => (nextConfig = {}) => {
     ],
     webpack: (webpackConfig, options) => {
       const { dir, config, dev, isServer } = options;
-      if (typeof globalThis.__DEV__ > "u" && (globalThis.__DEV__ = dev), !(typeof options.config?.swcMinify == "boolean"))
-        throw new Error("Next.js 12 only supported");
+      typeof globalThis.__DEV__ > "u" && (globalThis.__DEV__ = dev);
       const prefix = `${isServer ? " ssr " : " web "} |`, SEP = import_path.default.sep;
       process.env.ANALYZE === "true" && Object.assign(webpackConfig.optimization, {
         concatenateModules: !1
@@ -63,41 +62,7 @@ const withTamagui = (tamaguiOptionsIn) => (nextConfig = {}) => {
         ...tamaguiOptions.emitSingleCSSFile && {
           "process.env.TAMAGUI_INSERT_SELECTOR_TRIES": JSON.stringify("1")
         }
-      };
-      if (webpackConfig.plugins.push(new import_webpack.default.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), isServer || (nextConfig.modularizeImports ??= {}, nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
-        transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
-        skipDefaultConversion: !0
-      }), isServer) {
-        const externalize = (context, request) => {
-          const fullPath = request[0] === "." ? import_path.default.join(context, request) : request;
-          if (tamaguiOptions.shouldExcludeFromServer) {
-            const userRes = tamaguiOptions.shouldExcludeFromServer({
-              context,
-              request,
-              fullPath
-            });
-            if (userRes !== void 0)
-              return userRes;
-          }
-          if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith(`react-native${SEP}`))
-            return !1;
-          if (
-            // feather icons uses react-native-svg which needs to be aliased
-            // fullPath.includes('/lucide-icons/') ||
-            fullPath.startsWith("react-native-web") || fullPath.includes(`node_modules${SEP}react-native-web`) || new RegExp(`^(react-dom|react)${SEP}$`).test(fullPath)
-          )
-            return `commonjs ${fullPath}`;
-          if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom")))
-            return !/^@?react-native-/.test(request);
-        };
-        webpackConfig.externals = [
-          ...webpackConfig.externals.map((external) => typeof external != "function" ? external : (ctx, cb) => {
-            const isCb = typeof cb == "function", res = externalize(ctx.context, ctx.request);
-            return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
-          })
-        ];
-      }
-      const cssRules = webpackConfig.module.rules.find(
+      }, cssRules = webpackConfig.module.rules.find(
         (rule) => Array.isArray(rule.oneOf) && rule.oneOf.some(
           ({ test }) => typeof test == "object" && typeof test.test == "function" && test.test("filename.css")
         )
@@ -141,6 +106,39 @@ const withTamagui = (tamaguiOptionsIn) => (nextConfig = {}) => {
           use: cssLoader
         });
       }
+      if (webpackConfig.plugins.push(new import_webpack.default.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), isServer || (nextConfig.modularizeImports ??= {}, nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
+        transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
+        skipDefaultConversion: !0
+      }), isServer) {
+        const externalize = (context, request) => {
+          const fullPath = request[0] === "." ? import_path.default.join(context, request) : request;
+          if (tamaguiOptions.shouldExcludeFromServer) {
+            const userRes = tamaguiOptions.shouldExcludeFromServer({
+              context,
+              request,
+              fullPath
+            });
+            if (userRes !== void 0)
+              return userRes;
+          }
+          if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith(`react-native${SEP}`))
+            return !1;
+          if (
+            // feather icons uses react-native-svg which needs to be aliased
+            // fullPath.includes('/lucide-icons/') ||
+            fullPath.startsWith("react-native-web") || fullPath.includes(`node_modules${SEP}react-native-web`) || new RegExp(`^(react-dom|react)${SEP}$`).test(fullPath)
+          )
+            return `commonjs ${fullPath}`;
+          if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom")))
+            return !/^@?react-native-/.test(request);
+        };
+        webpackConfig.externals = [
+          ...webpackConfig.externals.map((external) => typeof external != "function" ? external : (ctx, cb) => {
+            const isCb = typeof cb == "function", res = externalize(ctx.context, ctx.request);
+            return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
+          })
+        ];
+      }
       return webpackConfig.plugins.push(tamaguiPlugin), typeof nextConfig.webpack == "function" ? nextConfig.webpack(webpackConfig, options) : webpackConfig;
     }
   };

package/dist/cjs/withTamagui.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/withTamagui.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["path", "webpack", "browserslist"]
 }

package/dist/cjs/withTamagui.native.js

@@ -26,7 +26,7 @@ __export(withTamagui_exports, {
   withTamagui: () => withTamagui
 });
 module.exports = __toCommonJS(withTamagui_exports);
-var import_path = __toESM(require("path")), import_browserslist = __toESM(require("browserslist")), import_css = require("next/dist/build/webpack/config/blocks/css"), import_loaders = require("next/dist/build/webpack/config/blocks/css/loaders"), import_tamagui_loader = require("tamagui-loader"), import_webpack = __toESM(require("webpack")), import_static = require("@tamagui/static");
+var import_browserslist = __toESM(require("browserslist")), import_css = require("next/dist/build/webpack/config/blocks/css"), import_loaders = require("next/dist/build/webpack/config/blocks/css/loaders"), import_path = __toESM(require("path")), import_static = require("@tamagui/static"), import_tamagui_loader = require("tamagui-loader"), import_webpack = __toESM(require("webpack"));
 function _array_like_to_array(arr, len) {
   (len == null || len > arr.length) && (len = arr.length);
   for (var i = 0, arr2 = new Array(len); i < len; i++)
@@ -100,11 +100,8 @@ var withTamagui = function(tamaguiOptionsIn) {
         "expo-linear-gradient"
       ]),
       webpack: function(webpackConfig, options) {
-        var _options_config, dir = options.dir, config = options.config, dev = options.dev, isServer = options.isServer;
+        var dir = options.dir, config = options.config, dev = options.dev, isServer = options.isServer;
         typeof globalThis.__DEV__ > "u" && (globalThis.__DEV__ = dev);
-        var isNext12 = typeof ((_options_config = options.config) === null || _options_config === void 0 ? void 0 : _options_config.swcMinify) == "boolean";
-        if (!isNext12)
-          throw new Error("Next.js 12 only supported");
         var prefix = "".concat(isServer ? " ssr " : " web ", " |"), SEP = import_path.default.sep;
         process.env.ANALYZE === "true" && Object.assign(webpackConfig.optimization, {
           concatenateModules: !1
@@ -126,45 +123,7 @@ var withTamagui = function(tamaguiOptionsIn) {
           tamaguiOptions.emitSingleCSSFile && {
             "process.env.TAMAGUI_INSERT_SELECTOR_TRIES": JSON.stringify("1")
           }
-        );
-        if (webpackConfig.plugins.push(new import_webpack.default.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), !isServer) {
-          var _nextConfig, _modularizeImports;
-          (_modularizeImports = (_nextConfig = nextConfig).modularizeImports) !== null && _modularizeImports !== void 0 || (_nextConfig.modularizeImports = {}), nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
-            transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
-            skipDefaultConversion: !0
-          };
-        }
-        if (isServer) {
-          var externalize = function(context, request) {
-            var fullPath = request[0] === "." ? import_path.default.join(context, request) : request;
-            if (tamaguiOptions.shouldExcludeFromServer) {
-              var userRes = tamaguiOptions.shouldExcludeFromServer({
-                context,
-                request,
-                fullPath
-              });
-              if (userRes !== void 0)
-                return userRes;
-            }
-            if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith("react-native".concat(SEP)))
-              return !1;
-            if (
-              // feather icons uses react-native-svg which needs to be aliased
-              // fullPath.includes('/lucide-icons/') ||
-              fullPath.startsWith("react-native-web") || fullPath.includes("node_modules".concat(SEP, "react-native-web")) || new RegExp("^(react-dom|react)".concat(SEP, "$")).test(fullPath)
-            )
-              return "commonjs ".concat(fullPath);
-            if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom")))
-              return !/^@?react-native-/.test(request);
-          };
-          webpackConfig.externals = _to_consumable_array(webpackConfig.externals.map(function(external) {
-            return typeof external != "function" ? external : function(ctx, cb) {
-              var isCb = typeof cb == "function", res = externalize(ctx.context, ctx.request);
-              return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
-            };
-          }));
-        }
-        var cssRules = webpackConfig.module.rules.find(function(rule) {
+        ), cssRules = webpackConfig.module.rules.find(function(rule) {
           return Array.isArray(rule.oneOf) && rule.oneOf.some(function(param) {
             var test = param.test;
             return typeof test == "object" && typeof test.test == "function" && test.test("filename.css");
@@ -214,6 +173,43 @@ var withTamagui = function(tamaguiOptionsIn) {
             });
           }
         }
+        if (webpackConfig.plugins.push(new import_webpack.default.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), !isServer) {
+          var _nextConfig, _modularizeImports;
+          (_modularizeImports = (_nextConfig = nextConfig).modularizeImports) !== null && _modularizeImports !== void 0 || (_nextConfig.modularizeImports = {}), nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
+            transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
+            skipDefaultConversion: !0
+          };
+        }
+        if (isServer) {
+          var externalize = function(context, request) {
+            var fullPath = request[0] === "." ? import_path.default.join(context, request) : request;
+            if (tamaguiOptions.shouldExcludeFromServer) {
+              var userRes = tamaguiOptions.shouldExcludeFromServer({
+                context,
+                request,
+                fullPath
+              });
+              if (userRes !== void 0)
+                return userRes;
+            }
+            if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith("react-native".concat(SEP)))
+              return !1;
+            if (
+              // feather icons uses react-native-svg which needs to be aliased
+              // fullPath.includes('/lucide-icons/') ||
+              fullPath.startsWith("react-native-web") || fullPath.includes("node_modules".concat(SEP, "react-native-web")) || new RegExp("^(react-dom|react)".concat(SEP, "$")).test(fullPath)
+            )
+              return "commonjs ".concat(fullPath);
+            if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom")))
+              return !/^@?react-native-/.test(request);
+          };
+          webpackConfig.externals = _to_consumable_array(webpackConfig.externals.map(function(external) {
+            return typeof external != "function" ? external : function(ctx, cb) {
+              var isCb = typeof cb == "function", res = externalize(ctx.context, ctx.request);
+              return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
+            };
+          }));
+        }
         return webpackConfig.plugins.push(tamaguiPlugin), typeof nextConfig.webpack == "function" ? nextConfig.webpack(webpackConfig, options) : webpackConfig;
       }
     });

package/dist/cjs/withTamagui.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/packages/next-plugin/src/withTamagui.ts"],
-  "mappings": "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",
-  "names": ["withTamagui", "tamaguiOptionsIn", "nextConfig", "tamaguiOptions", "loadTamaguiBuildConfigSync", "isAppDir", "appDir", "experimental", "transpilePackages", "webpack", "webpackConfig", "options", "dir", "config", "dev", "isServer", "globalThis", "isNext12", "swcMinify", "Error", "prefix", "SEP", "path", "sep", "process", "env", "ANALYZE", "Object", "assign", "optimization", "concatenateModules", "tamaguiPlugin", "TamaguiPlugin", "defines", "JSON", "stringify", "__DEV__", "TAMAGUI_DOES_SSR_CSS", "emitSingleCSSFile", "plugins", "push", "DefinePlugin", "IGNORE_TS_CONFIG_PATHS", "DEBUG", "console", "info", "resolve", "paths", "modularizeImports", "transform", "skipDefaultConversion", "externalize", "context", "request", "fullPath", "join", "shouldExcludeFromServer", "userRes", "undefined", "isInComponentModule", "includes", "startsWith", "RegExp", "test", "externals", "map", "external", "ctx", "cb", "isCb", "res", "Promise", "cssRules", "module", "rules", "find", "rule", "Array", "isArray", "oneOf", "some", "enableLegacyFontSupport", "unshift", "use", "loader", "require", "limit", "inlineFontLimit", "fallback", "publicPath", "assetPrefix", "outputPath", "name", "cssLoader", "getGlobalCssLoader", "future", "isEdgeRuntime", "isProduction", "targetWeb", "isClient", "isDevelopment", "lazyPostCSS", "getSupportedBrowsers", "includeCSSTest", "sideEffects", "browsers", "browserslist", "loadConfig"]
+  "mappings": "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",
+  "names": ["withTamagui", "tamaguiOptionsIn", "nextConfig", "tamaguiOptions", "loadTamaguiBuildConfigSync", "isAppDir", "appDir", "experimental", "transpilePackages", "webpack", "webpackConfig", "options", "dir", "config", "dev", "isServer", "globalThis", "prefix", "SEP", "path", "sep", "process", "env", "ANALYZE", "Object", "assign", "optimization", "concatenateModules", "tamaguiPlugin", "TamaguiPlugin", "defines", "JSON", "stringify", "__DEV__", "TAMAGUI_DOES_SSR_CSS", "emitSingleCSSFile", "cssRules", "module", "rules", "find", "rule", "Array", "isArray", "oneOf", "some", "test", "enableLegacyFontSupport", "unshift", "use", "loader", "require", "limit", "inlineFontLimit", "fallback", "publicPath", "assetPrefix", "outputPath", "name", "cssLoader", "getGlobalCssLoader", "future", "isEdgeRuntime", "isProduction", "targetWeb", "isClient", "isDevelopment", "lazyPostCSS", "getSupportedBrowsers", "includeCSSTest", "sideEffects", "plugins", "push", "DefinePlugin", "IGNORE_TS_CONFIG_PATHS", "DEBUG", "console", "info", "resolve", "paths", "modularizeImports", "transform", "skipDefaultConversion", "externalize", "context", "request", "fullPath", "join", "shouldExcludeFromServer", "userRes", "undefined", "isInComponentModule", "includes", "startsWith", "RegExp", "externals", "map", "external", "ctx", "cb", "isCb", "res", "Promise", "browsers", "browserslist", "loadConfig"]
 }

package/dist/esm/withTamagui.js

@@ -1,10 +1,10 @@
-import path from "path";
 import browserslist from "browserslist";
 import { lazyPostCSS } from "next/dist/build/webpack/config/blocks/css";
 import { getGlobalCssLoader } from "next/dist/build/webpack/config/blocks/css/loaders";
+import path from "path";
+import { loadTamaguiBuildConfigSync } from "@tamagui/static";
 import { TamaguiPlugin } from "tamagui-loader";
 import webpack from "webpack";
-import { loadTamaguiBuildConfigSync } from "@tamagui/static";
 const withTamagui = (tamaguiOptionsIn) => (nextConfig = {}) => {
   const tamaguiOptions = {
     ...tamaguiOptionsIn,
@@ -18,8 +18,7 @@ const withTamagui = (tamaguiOptionsIn) => (nextConfig = {}) => {
     ],
     webpack: (webpackConfig, options) => {
       const { dir, config, dev, isServer } = options;
-      if (typeof globalThis.__DEV__ > "u" && (globalThis.__DEV__ = dev), !(typeof options.config?.swcMinify == "boolean"))
-        throw new Error("Next.js 12 only supported");
+      typeof globalThis.__DEV__ > "u" && (globalThis.__DEV__ = dev);
       const prefix = `${isServer ? " ssr " : " web "} |`, SEP = path.sep;
       process.env.ANALYZE === "true" && Object.assign(webpackConfig.optimization, {
         concatenateModules: !1
@@ -42,41 +41,7 @@ const withTamagui = (tamaguiOptionsIn) => (nextConfig = {}) => {
         ...tamaguiOptions.emitSingleCSSFile && {
           "process.env.TAMAGUI_INSERT_SELECTOR_TRIES": JSON.stringify("1")
         }
-      };
-      if (webpackConfig.plugins.push(new webpack.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), isServer || (nextConfig.modularizeImports ??= {}, nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
-        transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
-        skipDefaultConversion: !0
-      }), isServer) {
-        const externalize = (context, request) => {
-          const fullPath = request[0] === "." ? path.join(context, request) : request;
-          if (tamaguiOptions.shouldExcludeFromServer) {
-            const userRes = tamaguiOptions.shouldExcludeFromServer({
-              context,
-              request,
-              fullPath
-            });
-            if (userRes !== void 0)
-              return userRes;
-          }
-          if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith(`react-native${SEP}`))
-            return !1;
-          if (
-            // feather icons uses react-native-svg which needs to be aliased
-            // fullPath.includes('/lucide-icons/') ||
-            fullPath.startsWith("react-native-web") || fullPath.includes(`node_modules${SEP}react-native-web`) || new RegExp(`^(react-dom|react)${SEP}$`).test(fullPath)
-          )
-            return `commonjs ${fullPath}`;
-          if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom")))
-            return !/^@?react-native-/.test(request);
-        };
-        webpackConfig.externals = [
-          ...webpackConfig.externals.map((external) => typeof external != "function" ? external : (ctx, cb) => {
-            const isCb = typeof cb == "function", res = externalize(ctx.context, ctx.request);
-            return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
-          })
-        ];
-      }
-      const cssRules = webpackConfig.module.rules.find(
+      }, cssRules = webpackConfig.module.rules.find(
         (rule) => Array.isArray(rule.oneOf) && rule.oneOf.some(
           ({ test }) => typeof test == "object" && typeof test.test == "function" && test.test("filename.css")
         )
@@ -120,6 +85,39 @@ const withTamagui = (tamaguiOptionsIn) => (nextConfig = {}) => {
           use: cssLoader
         });
       }
+      if (webpackConfig.plugins.push(new webpack.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), isServer || (nextConfig.modularizeImports ??= {}, nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
+        transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
+        skipDefaultConversion: !0
+      }), isServer) {
+        const externalize = (context, request) => {
+          const fullPath = request[0] === "." ? path.join(context, request) : request;
+          if (tamaguiOptions.shouldExcludeFromServer) {
+            const userRes = tamaguiOptions.shouldExcludeFromServer({
+              context,
+              request,
+              fullPath
+            });
+            if (userRes !== void 0)
+              return userRes;
+          }
+          if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith(`react-native${SEP}`))
+            return !1;
+          if (
+            // feather icons uses react-native-svg which needs to be aliased
+            // fullPath.includes('/lucide-icons/') ||
+            fullPath.startsWith("react-native-web") || fullPath.includes(`node_modules${SEP}react-native-web`) || new RegExp(`^(react-dom|react)${SEP}$`).test(fullPath)
+          )
+            return `commonjs ${fullPath}`;
+          if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom")))
+            return !/^@?react-native-/.test(request);
+        };
+        webpackConfig.externals = [
+          ...webpackConfig.externals.map((external) => typeof external != "function" ? external : (ctx, cb) => {
+            const isCb = typeof cb == "function", res = externalize(ctx.context, ctx.request);
+            return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
+          })
+        ];
+      }
       return webpackConfig.plugins.push(tamaguiPlugin), typeof nextConfig.webpack == "function" ? nextConfig.webpack(webpackConfig, options) : webpackConfig;
     }
   };

package/dist/esm/withTamagui.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/withTamagui.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/withTamagui.mjs

@@ -1,10 +1,10 @@
-import path from "path";
 import browserslist from "browserslist";
 import { lazyPostCSS } from "next/dist/build/webpack/config/blocks/css";
 import { getGlobalCssLoader } from "next/dist/build/webpack/config/blocks/css/loaders";
+import path from "path";
+import { loadTamaguiBuildConfigSync } from "@tamagui/static";
 import { TamaguiPlugin } from "tamagui-loader";
 import webpack from "webpack";
-import { loadTamaguiBuildConfigSync } from "@tamagui/static";
 const withTamagui = tamaguiOptionsIn => (nextConfig = {}) => {
   const tamaguiOptions = {
       ...tamaguiOptionsIn,
@@ -21,7 +21,7 @@ const withTamagui = tamaguiOptionsIn => (nextConfig = {}) => {
         dev,
         isServer
       } = options;
-      if (typeof globalThis.__DEV__ > "u" && (globalThis.__DEV__ = dev), !(typeof options.config?.swcMinify == "boolean")) throw new Error("Next.js 12 only supported");
+      typeof globalThis.__DEV__ > "u" && (globalThis.__DEV__ = dev);
       const prefix = `${isServer ? " ssr " : " web "} |`,
         SEP = path.sep;
       process.env.ANALYZE === "true" && Object.assign(webpackConfig.optimization, {
@@ -44,37 +44,10 @@ const withTamagui = tamaguiOptionsIn => (nextConfig = {}) => {
           ...(tamaguiOptions.emitSingleCSSFile && {
             "process.env.TAMAGUI_INSERT_SELECTOR_TRIES": JSON.stringify("1")
           })
-        };
-      if (webpackConfig.plugins.push(new webpack.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), isServer || (nextConfig.modularizeImports ??= {}, nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
-        transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
-        skipDefaultConversion: !0
-      }), isServer) {
-        const externalize = (context, request) => {
-          const fullPath = request[0] === "." ? path.join(context, request) : request;
-          if (tamaguiOptions.shouldExcludeFromServer) {
-            const userRes = tamaguiOptions.shouldExcludeFromServer({
-              context,
-              request,
-              fullPath
-            });
-            if (userRes !== void 0) return userRes;
-          }
-          if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith(`react-native${SEP}`)) return !1;
-          if (
-          // feather icons uses react-native-svg which needs to be aliased
-          // fullPath.includes('/lucide-icons/') ||
-          fullPath.startsWith("react-native-web") || fullPath.includes(`node_modules${SEP}react-native-web`) || new RegExp(`^(react-dom|react)${SEP}$`).test(fullPath)) return `commonjs ${fullPath}`;
-          if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom"))) return !/^@?react-native-/.test(request);
-        };
-        webpackConfig.externals = [...webpackConfig.externals.map(external => typeof external != "function" ? external : (ctx, cb) => {
-          const isCb = typeof cb == "function",
-            res = externalize(ctx.context, ctx.request);
-          return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
-        })];
-      }
-      const cssRules = webpackConfig.module.rules.find(rule => Array.isArray(rule.oneOf) && rule.oneOf.some(({
-        test
-      }) => typeof test == "object" && typeof test.test == "function" && test.test("filename.css"))).oneOf;
+        },
+        cssRules = webpackConfig.module.rules.find(rule => Array.isArray(rule.oneOf) && rule.oneOf.some(({
+          test
+        }) => typeof test == "object" && typeof test.test == "function" && test.test("filename.css"))).oneOf;
       if (cssRules) {
         tamaguiOptions.enableLegacyFontSupport && cssRules.unshift({
           test: /\.(woff(2)?|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
@@ -110,6 +83,33 @@ const withTamagui = tamaguiOptionsIn => (nextConfig = {}) => {
           use: cssLoader
         });
       }
+      if (webpackConfig.plugins.push(new webpack.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), isServer || (nextConfig.modularizeImports ??= {}, nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
+        transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
+        skipDefaultConversion: !0
+      }), isServer) {
+        const externalize = (context, request) => {
+          const fullPath = request[0] === "." ? path.join(context, request) : request;
+          if (tamaguiOptions.shouldExcludeFromServer) {
+            const userRes = tamaguiOptions.shouldExcludeFromServer({
+              context,
+              request,
+              fullPath
+            });
+            if (userRes !== void 0) return userRes;
+          }
+          if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith(`react-native${SEP}`)) return !1;
+          if (
+          // feather icons uses react-native-svg which needs to be aliased
+          // fullPath.includes('/lucide-icons/') ||
+          fullPath.startsWith("react-native-web") || fullPath.includes(`node_modules${SEP}react-native-web`) || new RegExp(`^(react-dom|react)${SEP}$`).test(fullPath)) return `commonjs ${fullPath}`;
+          if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom"))) return !/^@?react-native-/.test(request);
+        };
+        webpackConfig.externals = [...webpackConfig.externals.map(external => typeof external != "function" ? external : (ctx, cb) => {
+          const isCb = typeof cb == "function",
+            res = externalize(ctx.context, ctx.request);
+          return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
+        })];
+      }
       return webpackConfig.plugins.push(tamaguiPlugin), typeof nextConfig.webpack == "function" ? nextConfig.webpack(webpackConfig, options) : webpackConfig;
     }
   };

package/dist/esm/withTamagui.native.js

@@ -1,10 +1,10 @@
-import path from "path";
 import browserslist from "browserslist";
 import { lazyPostCSS } from "next/dist/build/webpack/config/blocks/css";
 import { getGlobalCssLoader } from "next/dist/build/webpack/config/blocks/css/loaders";
+import path from "path";
+import { loadTamaguiBuildConfigSync } from "@tamagui/static";
 import { TamaguiPlugin } from "tamagui-loader";
 import webpack from "webpack";
-import { loadTamaguiBuildConfigSync } from "@tamagui/static";
 function _array_like_to_array(arr, len) {
   (len == null || len > arr.length) && (len = arr.length);
   for (var i = 0, arr2 = new Array(len); i < len; i++)
@@ -78,11 +78,8 @@ var withTamagui = function(tamaguiOptionsIn) {
         "expo-linear-gradient"
       ]),
       webpack: function(webpackConfig, options) {
-        var _options_config, dir = options.dir, config = options.config, dev = options.dev, isServer = options.isServer;
+        var dir = options.dir, config = options.config, dev = options.dev, isServer = options.isServer;
         typeof globalThis.__DEV__ > "u" && (globalThis.__DEV__ = dev);
-        var isNext12 = typeof ((_options_config = options.config) === null || _options_config === void 0 ? void 0 : _options_config.swcMinify) == "boolean";
-        if (!isNext12)
-          throw new Error("Next.js 12 only supported");
         var prefix = "".concat(isServer ? " ssr " : " web ", " |"), SEP = path.sep;
         process.env.ANALYZE === "true" && Object.assign(webpackConfig.optimization, {
           concatenateModules: !1
@@ -104,45 +101,7 @@ var withTamagui = function(tamaguiOptionsIn) {
           tamaguiOptions.emitSingleCSSFile && {
             "process.env.TAMAGUI_INSERT_SELECTOR_TRIES": JSON.stringify("1")
           }
-        );
-        if (webpackConfig.plugins.push(new webpack.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), !isServer) {
-          var _nextConfig, _modularizeImports;
-          (_modularizeImports = (_nextConfig = nextConfig).modularizeImports) !== null && _modularizeImports !== void 0 || (_nextConfig.modularizeImports = {}), nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
-            transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
-            skipDefaultConversion: !0
-          };
-        }
-        if (isServer) {
-          var externalize = function(context, request) {
-            var fullPath = request[0] === "." ? path.join(context, request) : request;
-            if (tamaguiOptions.shouldExcludeFromServer) {
-              var userRes = tamaguiOptions.shouldExcludeFromServer({
-                context,
-                request,
-                fullPath
-              });
-              if (userRes !== void 0)
-                return userRes;
-            }
-            if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith("react-native".concat(SEP)))
-              return !1;
-            if (
-              // feather icons uses react-native-svg which needs to be aliased
-              // fullPath.includes('/lucide-icons/') ||
-              fullPath.startsWith("react-native-web") || fullPath.includes("node_modules".concat(SEP, "react-native-web")) || new RegExp("^(react-dom|react)".concat(SEP, "$")).test(fullPath)
-            )
-              return "commonjs ".concat(fullPath);
-            if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom")))
-              return !/^@?react-native-/.test(request);
-          };
-          webpackConfig.externals = _to_consumable_array(webpackConfig.externals.map(function(external) {
-            return typeof external != "function" ? external : function(ctx, cb) {
-              var isCb = typeof cb == "function", res = externalize(ctx.context, ctx.request);
-              return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
-            };
-          }));
-        }
-        var cssRules = webpackConfig.module.rules.find(function(rule) {
+        ), cssRules = webpackConfig.module.rules.find(function(rule) {
           return Array.isArray(rule.oneOf) && rule.oneOf.some(function(param) {
             var test = param.test;
             return typeof test == "object" && typeof test.test == "function" && test.test("filename.css");
@@ -192,6 +151,43 @@ var withTamagui = function(tamaguiOptionsIn) {
             });
           }
         }
+        if (webpackConfig.plugins.push(new webpack.DefinePlugin(defines)), process.env.IGNORE_TS_CONFIG_PATHS && (process.env.DEBUG && console.info(prefix, "ignoring tsconfig paths"), webpackConfig.resolve.plugins[0] && (delete webpackConfig.resolve.plugins[0].paths["@tamagui/*"], delete webpackConfig.resolve.plugins[0].paths.tamagui)), !isServer) {
+          var _nextConfig, _modularizeImports;
+          (_modularizeImports = (_nextConfig = nextConfig).modularizeImports) !== null && _modularizeImports !== void 0 || (_nextConfig.modularizeImports = {}), nextConfig.modularizeImports["@tamagui/lucide-icons"] = {
+            transform: "@tamagui/lucide-icons/dist/esm/icons/{{kebabCase member}}",
+            skipDefaultConversion: !0
+          };
+        }
+        if (isServer) {
+          var externalize = function(context, request) {
+            var fullPath = request[0] === "." ? path.join(context, request) : request;
+            if (tamaguiOptions.shouldExcludeFromServer) {
+              var userRes = tamaguiOptions.shouldExcludeFromServer({
+                context,
+                request,
+                fullPath
+              });
+              if (userRes !== void 0)
+                return userRes;
+            }
+            if (tamaguiPlugin.isInComponentModule(fullPath) || fullPath.includes("react-native-web") || fullPath === "react-native" || fullPath.startsWith("react-native".concat(SEP)))
+              return !1;
+            if (
+              // feather icons uses react-native-svg which needs to be aliased
+              // fullPath.includes('/lucide-icons/') ||
+              fullPath.startsWith("react-native-web") || fullPath.includes("node_modules".concat(SEP, "react-native-web")) || new RegExp("^(react-dom|react)".concat(SEP, "$")).test(fullPath)
+            )
+              return "commonjs ".concat(fullPath);
+            if (!(fullPath.startsWith("moti") || fullPath.startsWith("solito") || fullPath === "tamagui" || fullPath.startsWith("@tamagui") || fullPath === "react-native-safe-area-context" || fullPath === "expo-linear-gradient" || fullPath.startsWith("@react-navigation") || fullPath.startsWith("@gorhom")))
+              return !/^@?react-native-/.test(request);
+          };
+          webpackConfig.externals = _to_consumable_array(webpackConfig.externals.map(function(external) {
+            return typeof external != "function" ? external : function(ctx, cb) {
+              var isCb = typeof cb == "function", res = externalize(ctx.context, ctx.request);
+              return isCb ? typeof res == "string" ? cb(null, res) : res ? external(ctx, cb) : cb() : res ? typeof res == "string" ? Promise.resolve(res) : external(ctx) : Promise.resolve(void 0);
+            };
+          }));
+        }
         return webpackConfig.plugins.push(tamaguiPlugin), typeof nextConfig.webpack == "function" ? nextConfig.webpack(webpackConfig, options) : webpackConfig;
       }
     });

package/dist/esm/withTamagui.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/packages/next-plugin/src/withTamagui.ts"],
-  "mappings": "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",
-  "names": ["path", "browserslist", "lazyPostCSS", "getGlobalCssLoader", "TamaguiPlugin", "webpack", "loadTamaguiBuildConfigSync", "withTamagui", "tamaguiOptionsIn", "nextConfig", "tamaguiOptions", "isAppDir", "appDir", "experimental", "transpilePackages", "webpackConfig", "options", "dir", "config", "dev", "isServer", "globalThis", "isNext12", "swcMinify", "Error", "prefix", "SEP", "sep", "process", "env", "ANALYZE", "Object", "assign", "optimization", "concatenateModules", "tamaguiPlugin", "defines", "JSON", "stringify", "__DEV__", "TAMAGUI_DOES_SSR_CSS", "emitSingleCSSFile", "plugins", "push", "DefinePlugin", "IGNORE_TS_CONFIG_PATHS", "DEBUG", "console", "info", "resolve", "paths", "modularizeImports", "transform", "skipDefaultConversion", "externalize", "context", "request", "fullPath", "join", "shouldExcludeFromServer", "userRes", "undefined", "isInComponentModule", "includes", "startsWith", "RegExp", "test", "externals", "map", "external", "ctx", "cb", "isCb", "res", "Promise", "cssRules", "module", "rules", "find", "rule", "Array", "isArray", "oneOf", "some", "enableLegacyFontSupport", "unshift", "use", "loader", "require", "limit", "inlineFontLimit", "fallback", "publicPath", "assetPrefix", "outputPath", "name", "cssLoader", "future", "isEdgeRuntime", "isProduction", "targetWeb", "isClient", "isDevelopment", "getSupportedBrowsers", "includeCSSTest", "sideEffects", "browsers", "loadConfig"]
+  "mappings": "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",
+  "names": ["browserslist", "lazyPostCSS", "getGlobalCssLoader", "path", "loadTamaguiBuildConfigSync", "TamaguiPlugin", "webpack", "withTamagui", "tamaguiOptionsIn", "nextConfig", "tamaguiOptions", "isAppDir", "appDir", "experimental", "transpilePackages", "webpackConfig", "options", "dir", "config", "dev", "isServer", "globalThis", "prefix", "SEP", "sep", "process", "env", "ANALYZE", "Object", "assign", "optimization", "concatenateModules", "tamaguiPlugin", "defines", "JSON", "stringify", "__DEV__", "TAMAGUI_DOES_SSR_CSS", "emitSingleCSSFile", "cssRules", "module", "rules", "find", "rule", "Array", "isArray", "oneOf", "some", "test", "enableLegacyFontSupport", "unshift", "use", "loader", "require", "limit", "inlineFontLimit", "fallback", "publicPath", "assetPrefix", "outputPath", "name", "cssLoader", "future", "isEdgeRuntime", "isProduction", "targetWeb", "isClient", "isDevelopment", "getSupportedBrowsers", "includeCSSTest", "sideEffects", "plugins", "push", "DefinePlugin", "IGNORE_TS_CONFIG_PATHS", "DEBUG", "console", "info", "resolve", "paths", "modularizeImports", "transform", "skipDefaultConversion", "externalize", "context", "request", "fullPath", "join", "shouldExcludeFromServer", "userRes", "undefined", "isInComponentModule", "includes", "startsWith", "RegExp", "externals", "map", "external", "ctx", "cb", "isCb", "res", "Promise", "browsers", "loadConfig"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/next-plugin",
-  "version": "1.90.7",
+  "version": "1.90.8",
   "source": "src/index.ts",
   "license": "MIT",
   "types": "./types/index.d.ts",
@@ -21,21 +21,21 @@
   },
   "dependencies": {
     "@babel/preset-react": "^7.23.3",
-    "@tamagui/proxy-worm": "1.90.7",
-    "@tamagui/react-native-svg": "1.90.7",
-    "@tamagui/static": "1.90.7",
+    "@tamagui/proxy-worm": "1.90.8",
+    "@tamagui/react-native-svg": "1.90.8",
+    "@tamagui/static": "1.90.8",
     "babel-loader": "^9.1.2",
     "browserslist": "^4.22.2",
     "css-loader": "^6.7.4",
     "esbuild-loader": "^3.0.1",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.5.0",
-    "tamagui-loader": "1.90.7",
+    "tamagui-loader": "1.90.8",
     "thread-loader": "^4.0.1",
     "url-loader": "^4.1.1"
   },
   "devDependencies": {
-    "@tamagui/build": "1.90.7",
+    "@tamagui/build": "1.90.8",
     "next": "^14.0.4"
   },
   "peerDependencies": {

package/src/withTamagui.ts

@@ -1,12 +1,12 @@
-import path from 'path'
-
 import browserslist from 'browserslist'
 import { lazyPostCSS } from 'next/dist/build/webpack/config/blocks/css'
 import { getGlobalCssLoader } from 'next/dist/build/webpack/config/blocks/css/loaders'
+import path from 'path'
+
+import { loadTamaguiBuildConfigSync } from '@tamagui/static'
 import type { PluginOptions as LoaderPluginOptions } from 'tamagui-loader'
 import { TamaguiPlugin } from 'tamagui-loader'
 import webpack from 'webpack'
-import { loadTamaguiBuildConfigSync } from '@tamagui/static'
 
 export type WithTamaguiProps = LoaderPluginOptions & {
   appDir?: boolean
@@ -43,11 +43,6 @@ export const withTamagui = (tamaguiOptionsIn?: WithTamaguiProps) => {
           globalThis['__DEV__'] = dev
         }
 
-        const isNext12 = typeof options.config?.swcMinify === 'boolean'
-        if (!isNext12) {
-          throw new Error(`Next.js 12 only supported`)
-        }
-
         const prefix = `${isServer ? ' ssr ' : ' web '} |`
         const SEP = path.sep
 
@@ -80,6 +75,77 @@ export const withTamagui = (tamaguiOptionsIn?: WithTamaguiProps) => {
           }),
         }
 
+        /**
+         * Non-server support
+         */
+        const cssRules = webpackConfig.module.rules.find(
+          (rule) =>
+            Array.isArray(rule.oneOf) &&
+            rule.oneOf.some(
+              ({ test }) =>
+                typeof test === 'object' &&
+                typeof test.test === 'function' &&
+                test.test('filename.css')
+            )
+        ).oneOf
+
+        /**
+         * Font Support
+         */
+        if (cssRules) {
+          if (tamaguiOptions.enableLegacyFontSupport) {
+            // fonts support
+            cssRules.unshift({
+              test: /\.(woff(2)?|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
+              use: [
+                {
+                  loader: require.resolve('url-loader'),
+                  options: {
+                    limit: nextConfig.inlineFontLimit || 1024,
+                    fallback: require.resolve('file-loader'),
+                    publicPath: `${
+                      nextConfig.assetPrefix || ''
+                    }/_next/static/chunks/fonts/`,
+                    outputPath: `${isServer ? '../' : ''}static/chunks/fonts/`,
+                    name: '[name].[ext]',
+                  },
+                },
+              ],
+            })
+          }
+
+          /**
+           * CSS Support
+           */
+          const cssLoader = getGlobalCssLoader(
+            // @ts-ignore
+            {
+              assetPrefix:
+                nextConfig.assetPrefix ||
+                options.config.assetPrefix ||
+                config.assetPrefix,
+              future: nextConfig.future,
+              experimental: nextConfig.experimental || {},
+              isEdgeRuntime: true,
+              isProduction: !dev,
+              targetWeb: true,
+              isClient: !isServer,
+              isServer,
+              isDevelopment: dev,
+            },
+            // @ts-ignore
+            () => lazyPostCSS(dir, getSupportedBrowsers(dir, dev)),
+            []
+          )
+          if (!isAppDir) {
+            cssRules.unshift({
+              test: tamaguiOptions.includeCSSTest ?? /\.tamagui\.css$/,
+              sideEffects: true,
+              use: cssLoader,
+            })
+          }
+        }
+
         webpackConfig.plugins.push(new webpack.DefinePlugin(defines))
 
         if (process.env.IGNORE_TS_CONFIG_PATHS) {
@@ -192,77 +258,6 @@ export const withTamagui = (tamaguiOptionsIn?: WithTamaguiProps) => {
           ]
         }
 
-        /**
-         * Non-server support
-         */
-        const cssRules = webpackConfig.module.rules.find(
-          (rule) =>
-            Array.isArray(rule.oneOf) &&
-            rule.oneOf.some(
-              ({ test }) =>
-                typeof test === 'object' &&
-                typeof test.test === 'function' &&
-                test.test('filename.css')
-            )
-        ).oneOf
-
-        /**
-         * Font Support
-         */
-        if (cssRules) {
-          if (tamaguiOptions.enableLegacyFontSupport) {
-            // fonts support
-            cssRules.unshift({
-              test: /\.(woff(2)?|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/,
-              use: [
-                {
-                  loader: require.resolve('url-loader'),
-                  options: {
-                    limit: nextConfig.inlineFontLimit || 1024,
-                    fallback: require.resolve('file-loader'),
-                    publicPath: `${
-                      nextConfig.assetPrefix || ''
-                    }/_next/static/chunks/fonts/`,
-                    outputPath: `${isServer ? '../' : ''}static/chunks/fonts/`,
-                    name: '[name].[ext]',
-                  },
-                },
-              ],
-            })
-          }
-
-          /**
-           * CSS Support
-           */
-          const cssLoader = getGlobalCssLoader(
-            // @ts-ignore
-            {
-              assetPrefix:
-                nextConfig.assetPrefix ||
-                options.config.assetPrefix ||
-                config.assetPrefix,
-              future: nextConfig.future,
-              experimental: nextConfig.experimental || {},
-              isEdgeRuntime: true,
-              isProduction: !dev,
-              targetWeb: true,
-              isClient: !isServer,
-              isServer,
-              isDevelopment: dev,
-            },
-            // @ts-ignore
-            () => lazyPostCSS(dir, getSupportedBrowsers(dir, dev)),
-            []
-          )
-          if (!isAppDir) {
-            cssRules.unshift({
-              test: tamaguiOptions.includeCSSTest ?? /\.tamagui\.css$/,
-              sideEffects: true,
-              use: cssLoader,
-            })
-          }
-        }
-
         webpackConfig.plugins.push(tamaguiPlugin)
 
         if (typeof nextConfig.webpack === 'function') {

package/types/withTamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withTamagui.d.ts","sourceRoot":"","sources":["../src/withTamagui.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,IAAI,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAK1E,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG;IACnD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IACrD,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,GAAG,SAAS,CAAA;IAC1E,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE;QAChC,OAAO,EAAE,MAAM,CAAA;QACf,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;KACjB,KAAK,OAAO,GAAG,MAAM,GAAG,SAAS,CAAA;CACnC,CAAA;AAED,eAAO,MAAM,WAAW,sBAAuB,gBAAgB,mBACzC,GAAG,QA4PxB,CAAA"}
+{"version":3,"file":"withTamagui.d.ts","sourceRoot":"","sources":["../src/withTamagui.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,aAAa,IAAI,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAI1E,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG;IACnD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAAA;IACrD,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,GAAG,SAAS,CAAA;IAC1E,uBAAuB,CAAC,EAAE,CAAC,KAAK,EAAE;QAChC,OAAO,EAAE,MAAM,CAAA;QACf,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;KACjB,KAAK,OAAO,GAAG,MAAM,GAAG,SAAS,CAAA;CACnC,CAAA;AAED,eAAO,MAAM,WAAW,sBAAuB,gBAAgB,mBACzC,GAAG,QAuPxB,CAAA"}