@niibase/uniwind 1.6.4 → 1.8.0

package/dist/common/hooks/useCSSVariable/useCSSVariable.js

@@ -5,14 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useCSSVariable = exports.getCSSVariable = void 0;
 var _react = require("react");
+var _reactNative = require("react-native");
+var _consts = require("../../common/consts");
 var _utils = require("../../common/utils");
 var _context = require("../../core/context");
 var _listener = require("../../core/listener");
 var _logger = require("../../core/logger");
-var _types = require("../../types");
 var _getVariableValue = require("./getVariableValue");
 let warned = false;
 const logDevError = name => {
+  if (_reactNative.Platform.OS === "web" && (typeof document === "undefined" || typeof window === "undefined")) {
+    return;
+  }
   warned = true;
   _logger.Logger.warn(`We couldn't find your variable ${name}. Make sure it's used at least once in your className, or define it in a static theme as described in the docs: https://docs.uniwind.dev/api/use-css-variable`);
 };
@@ -51,7 +55,7 @@ const useCSSVariable = name => {
   }, [name]);
   (0, _react.useLayoutEffect)(() => {
     const updateValue = () => setValue(getCSSVariable(nameRef.current, uniwindContext));
-    const dispose = _listener.UniwindListener.subscribe(updateValue, [_types.StyleDependency.Theme, _types.StyleDependency.Variables]);
+    const dispose = _listener.UniwindListener.subscribe(updateValue, [_consts.StyleDependency.Theme, _consts.StyleDependency.Variables]);
     return dispose;
   }, [uniwindContext]);
   return value;

package/dist/common/hooks/useUniwind.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useUniwind = void 0;
 var _react = require("react");
+var _consts = require("../common/consts");
 var _core = require("../core");
 var _context = require("../core/context");
 var _listener = require("../core/listener");
-var _types = require("../types");
 const useUniwind = () => {
   const uniwindContext = (0, _context.useUniwindContext)();
   const [theme, setTheme] = (0, _react.useState)(_core.Uniwind.currentTheme);
@@ -20,7 +20,7 @@ const useUniwind = () => {
     const dispose = _listener.UniwindListener.subscribe(() => {
       setTheme(_core.Uniwind.currentTheme);
       setHasAdaptiveThemes(_core.Uniwind.hasAdaptiveThemes);
-    }, [_types.StyleDependency.Theme, _types.StyleDependency.AdaptiveThemes]);
+    }, [_consts.StyleDependency.Theme, _consts.StyleDependency.AdaptiveThemes]);
     return () => {
       dispose();
     };

package/dist/metro/index.cjs

@@ -1,11 +1,14 @@
 'use strict';
 
-const consts = require('../shared/uniwind.B5q8hBGv.cjs');
+const config = require('../shared/uniwind.BEqYiPBB.cjs');
+const node_path = require('node:path');
+const _package = require('../shared/uniwind.DJ5M1Q4q.cjs');
 const FileStoreBase = require('metro-cache/private/stores/FileStore');
 const os = require('os');
 const path = require('path');
-const node_path = require('node:path');
-const common = require('../shared/uniwind.Cv73KtI-.cjs');
+require('fs');
+require('@tailwindcss/node');
+require('lightningcss');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -33,7 +36,7 @@ const patchMetroGraphToSupportUncachedModules = () => {
   original_traverseDependencies.__patched = true;
   function traverseDependencies(paths, options) {
     this.dependencies.forEach((dependency) => {
-      if (dependency.output.find((file) => file.data.css?.skipCache === true) && !paths.includes(dependency.path)) {
+      if (dependency.output.find((file) => file.data?.css?.skipCache === true) && !paths.includes(dependency.path)) {
         dependency.unstable_transformResultKey = `${dependency.unstable_transformResultKey}.`;
         paths.push(dependency.path);
       }
@@ -79,7 +82,7 @@ const nativeResolver = (extraComponents) => ({
   const resolution = resolver(context, moduleName, platform);
   if (cachedInternalBasePath === null) {
     try {
-      cachedInternalBasePath = node_path.dirname(require.resolve(`${common.name}/package.json`));
+      cachedInternalBasePath = node_path.dirname(require.resolve(`${_package.name}/package.json`));
     } catch {
       cachedInternalBasePath = "";
     }
@@ -92,16 +95,16 @@ const nativeResolver = (extraComponents) => ({
     return resolution;
   }
   if (moduleName === "react-native") {
-    return resolver(context, `${common.name}/components`, platform);
+    return resolver(context, `${_package.name}/components`, platform);
   }
   if (moduleName === "react-native-gesture-handler") {
-    return resolver(context, `${common.name}/components/react-native-gesture-handler`, platform);
+    return resolver(context, `${_package.name}/components/react-native-gesture-handler`, platform);
   }
   if (resolution.filePath.includes(`${node_path.sep}react-native${node_path.sep}Libraries${node_path.sep}`)) {
     const filename = node_path.basename(resolution.filePath.split(node_path.sep).at(-1) ?? "");
     const module = filename.split(".").at(0);
     if (module !== void 0 && SUPPORTED_COMPONENTS.includes(module)) {
-      return resolver(context, `${common.name}/components/${module}`, platform);
+      return resolver(context, `${_package.name}/components/${module}`, platform);
     }
   }
   if (moduleName in extraComponents) {
@@ -119,7 +122,7 @@ const webResolver = (extraComponents) => ({
   const resolution = resolver(context, moduleName, platform);
   if (cachedInternalBasePath === null) {
     try {
-      cachedInternalBasePath = node_path.dirname(require.resolve(`${common.name}/package.json`));
+      cachedInternalBasePath = node_path.dirname(require.resolve(`${_package.name}/package.json`));
     } catch {
       cachedInternalBasePath = "";
     }
@@ -141,45 +144,48 @@ const webResolver = (extraComponents) => ({
   if (!isIndex || module === void 0 || !SUPPORTED_COMPONENTS.includes(module) || context.originModulePath.endsWith(`${module}${node_path.sep}index.js`)) {
     return resolution;
   }
-  return resolver(context, `${common.name}/components/${module}`, platform);
+  return resolver(context, `${_package.name}/components/${module}`, platform);
 };
 
-const withUniwindConfig = (config, uniwindConfig) => {
-  uniwindConfig.themes = common.uniq([
-    "light",
-    "dark",
-    ...uniwindConfig.extraThemes ?? []
-  ]);
+const isUniwindRequest = (moduleName) => moduleName === _package.name || moduleName.startsWith(`${_package.name}/`);
+const withUniwindConfig = (config$1, uniwindConfig) => {
+  const bundlerConfig = config.UniwindBundlerConfig.fromMetroConfig(uniwindConfig);
+  const pinnedUniwindOrigin = node_path.join(config$1.projectRoot ?? process.cwd(), "package.json");
   patchMetroGraphToSupportUncachedModules();
-  if (typeof uniwindConfig === "undefined") {
-    throw new Error("Uniwind: You need to pass second parameter to withUniwindConfig");
-  }
-  if (typeof uniwindConfig.cssEntryFile === "undefined") {
-    throw new Error(
-      'Uniwind: You need to pass css css entry file to withUniwindConfig, e.g. withUniwindConfig(config, { cssEntryFile: "./global.css" })'
-    );
-  }
   return {
-    ...config,
+    ...config$1,
     cacheStores: [cacheStore],
-    transformerPath: require.resolve("./metro-transformer.cjs"),
+    transformerPath: require.resolve("./transformer.cjs"),
     transformer: {
-      ...config.transformer,
-      uniwind: uniwindConfig
+      ...config$1.transformer,
+      uniwind: bundlerConfig.toMetroConfig()
     },
     resolver: {
-      ...config.resolver,
+      ...config$1.resolver,
       sourceExts: [
-        ...config.resolver?.sourceExts ?? [],
+        ...config$1.resolver?.sourceExts ?? [],
         "css"
       ],
-      assetExts: config.resolver?.assetExts?.filter(
+      assetExts: config$1.resolver?.assetExts?.filter(
         (ext) => ext !== "css"
       ),
       resolveRequest: (context, moduleName, platform) => {
-        const resolver = config.resolver?.resolveRequest ?? context.resolveRequest;
-        const platformResolver = (platform === consts.Platform.Web ? webResolver : nativeResolver)(uniwindConfig.extraComponents ?? {});
-        const resolved = platformResolver({
+        const baseResolver = config$1.resolver?.resolveRequest ?? context.resolveRequest;
+        const resolver = (nextContext, nextModuleName, nextPlatform) => {
+          if (isUniwindRequest(nextModuleName)) {
+            return baseResolver(
+              {
+                ...nextContext,
+                originModulePath: pinnedUniwindOrigin
+              },
+              nextModuleName,
+              nextPlatform
+            );
+          }
+          return baseResolver(nextContext, nextModuleName, nextPlatform);
+        };
+        const platformResolver = platform === config.Platform.Web ? webResolver : nativeResolver;
+        const resolved = platformResolver(uniwindConfig.extraComponents ?? {})({
           context,
           moduleName,
           platform,

package/dist/metro/index.d.ts

@@ -2,11 +2,13 @@ import type { MetroConfig } from 'metro-config'
 
 type Polyfills = {
     rem?: number
+    responsive?: 'text' | 'components' | boolean
 }
 
 type UniwindConfig = {
     cssEntryFile: string
     extraThemes?: Array<string>
+    extraComponents?: Record<string, string>
     dtsFile?: string
     polyfills?: Polyfills
     debug?: boolean

package/dist/metro/index.mjs

@@ -1,9 +1,12 @@
-import { P as Platform } from '../shared/uniwind.JSWK3vHl.mjs';
+import { U as UniwindBundlerConfig, P as Platform } from '../shared/uniwind.DgC4MT51.mjs';
+import { dirname, sep, basename, join } from 'node:path';
+import { n as name } from '../shared/uniwind.CFAAUZ2t.mjs';
 import FileStoreBase from 'metro-cache/private/stores/FileStore';
 import os from 'os';
 import path from 'path';
-import { dirname, sep, basename } from 'node:path';
-import { n as name, u as uniq } from '../shared/uniwind.PtWWxxnh.mjs';
+import 'fs';
+import '@tailwindcss/node';
+import 'lightningcss';
 
 class FileStore extends FileStoreBase {
   async set(key, value) {
@@ -25,7 +28,7 @@ const patchMetroGraphToSupportUncachedModules = () => {
   original_traverseDependencies.__patched = true;
   function traverseDependencies(paths, options) {
     this.dependencies.forEach((dependency) => {
-      if (dependency.output.find((file) => file.data.css?.skipCache === true) && !paths.includes(dependency.path)) {
+      if (dependency.output.find((file) => file.data?.css?.skipCache === true) && !paths.includes(dependency.path)) {
         dependency.unstable_transformResultKey = `${dependency.unstable_transformResultKey}.`;
         paths.push(dependency.path);
       }
@@ -136,28 +139,18 @@ const webResolver = (extraComponents) => ({
   return resolver(context, `${name}/components/${module}`, platform);
 };
 
+const isUniwindRequest = (moduleName) => moduleName === name || moduleName.startsWith(`${name}/`);
 const withUniwindConfig = (config, uniwindConfig) => {
-  uniwindConfig.themes = uniq([
-    "light",
-    "dark",
-    ...uniwindConfig.extraThemes ?? []
-  ]);
+  const bundlerConfig = UniwindBundlerConfig.fromMetroConfig(uniwindConfig);
+  const pinnedUniwindOrigin = join(config.projectRoot ?? process.cwd(), "package.json");
   patchMetroGraphToSupportUncachedModules();
-  if (typeof uniwindConfig === "undefined") {
-    throw new Error("Uniwind: You need to pass second parameter to withUniwindConfig");
-  }
-  if (typeof uniwindConfig.cssEntryFile === "undefined") {
-    throw new Error(
-      'Uniwind: You need to pass css css entry file to withUniwindConfig, e.g. withUniwindConfig(config, { cssEntryFile: "./global.css" })'
-    );
-  }
   return {
     ...config,
     cacheStores: [cacheStore],
-    transformerPath: require.resolve("./metro-transformer.cjs"),
+    transformerPath: require.resolve("./transformer.cjs"),
     transformer: {
       ...config.transformer,
-      uniwind: uniwindConfig
+      uniwind: bundlerConfig.toMetroConfig()
     },
     resolver: {
       ...config.resolver,
@@ -169,9 +162,22 @@ const withUniwindConfig = (config, uniwindConfig) => {
         (ext) => ext !== "css"
       ),
       resolveRequest: (context, moduleName, platform) => {
-        const resolver = config.resolver?.resolveRequest ?? context.resolveRequest;
-        const platformResolver = (platform === Platform.Web ? webResolver : nativeResolver)(uniwindConfig.extraComponents ?? {});
-        const resolved = platformResolver({
+        const baseResolver = config.resolver?.resolveRequest ?? context.resolveRequest;
+        const resolver = (nextContext, nextModuleName, nextPlatform) => {
+          if (isUniwindRequest(nextModuleName)) {
+            return baseResolver(
+              {
+                ...nextContext,
+                originModulePath: pinnedUniwindOrigin
+              },
+              nextModuleName,
+              nextPlatform
+            );
+          }
+          return baseResolver(nextContext, nextModuleName, nextPlatform);
+        };
+        const platformResolver = platform === Platform.Web ? webResolver : nativeResolver;
+        const resolved = platformResolver(uniwindConfig.extraComponents ?? {})({
           context,
           moduleName,
           platform,