@niibase/uniwind 1.7.0 → 1.8.0

package/dist/shared/{uniwind.u-s1XVU8.mjs → uniwind.DgC4MT51.mjs}

@@ -129,6 +129,7 @@ const overwriteDisabled = `@custom-variant disabled {
 const OVERWRITE_CSS = overwriteDisabled;
 
 const red = "\x1B[91m";
+const blue = "\x1B[36m";
 const reset = "\x1B[0m";
 class Logger {
   constructor(name) {
@@ -140,6 +141,9 @@ class Logger {
       return;
     }
   }
+  static info(message) {
+    console.log(`${blue}[Uniwind] ${message}${reset}`);
+  }
   static error(message, meta = "") {
     console.log(`${red}Uniwind Error ${meta}- ${message}${reset}`);
   }
@@ -205,6 +209,9 @@ const generateCSSForThemes = async (themes, input) => {
     }
     const importUrls = /* @__PURE__ */ new Set();
     const importsCSS = dependencies.filter((dependency) => {
+      if (dependency.type !== "import") {
+        return false;
+      }
       if (dependency.url.startsWith(".")) {
         importUrls.add(path.resolve(path.dirname(cssPath), dependency.url));
         return false;
@@ -448,7 +455,7 @@ class RuleVisitor {
       return;
     }
     this.processedClassNames.add(firstSelector.name);
-    return {
+    return this.removeNulls({
       type: "scope",
       value: {
         loc: styleRule.value.loc,
@@ -456,7 +463,7 @@ class RuleVisitor {
         scopeStart: [[{ type: "class", name: selectedVariant }]],
         scopeEnd: this.bundlerConfig.themes.filter((theme) => theme !== selectedVariant).map((theme) => [{ type: "class", name: theme }])
       }
-    };
+    });
   }
   // Fixes lightningcss serialization bug
   removeNulls(value) {
@@ -554,6 +561,14 @@ class UniwindBundlerConfig {
   static fromViteConfig(config) {
     return new UniwindBundlerConfig(config, Platform.Web);
   }
+  static fromCliConfig(config) {
+    if (typeof config.cssEntryFile === "undefined") {
+      throw new Error(
+        "Uniwind: You need to pass css entry file, e.g. uniwind generate-artifacts --css ./global.css. Run uniwind generate-artifacts --help for usage."
+      );
+    }
+    return new UniwindBundlerConfig(config, Platform.Web);
+  }
   get cssPath() {
     return path.join(process.cwd(), this.config.cssEntryFile);
   }
@@ -584,6 +599,4 @@ class UniwindBundlerConfig {
   }
 }
 
-const name = "@niibase/uniwind";
-
-export { DEFAULT_SCREEN_HEIGHT as D, Logger as L, Platform as P, StyleDependency as S, UniwindBundlerConfig as U, DEFAULT_SCREEN_WIDTH as a, UNIWIND_PLATFORM_VARIABLES as b, UNIWIND_THEME_VARIABLES as c, isDefined as i, name as n };
+export { DEFAULT_SCREEN_HEIGHT as D, Logger as L, Platform as P, StyleDependency as S, UniwindBundlerConfig as U, DEFAULT_SCREEN_WIDTH as a, UNIWIND_PLATFORM_VARIABLES as b, UNIWIND_THEME_VARIABLES as c, isDefined as i };

package/dist/vite/index.cjs

@@ -1,11 +1,14 @@
 'use strict';
 
 const node = require('@tailwindcss/node');
+const node_module = require('node:module');
 const path = require('path');
-const _package = require('../shared/uniwind.CFiAZ3D-.cjs');
+const _package = require('../shared/uniwind.DJ5M1Q4q.cjs');
+const config = require('../shared/uniwind.BEqYiPBB.cjs');
 require('fs');
 require('lightningcss');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
@@ -20,17 +23,79 @@ const styleSheetPath = path__default.resolve(
   "../module/components/web/createOrderedCSSStyleSheet.js"
 );
 const cssArtifactPath = path__default.resolve(dirname, "../../uniwind.css");
-const uniwind = (config) => {
-  const bundlerConfig = _package.UniwindBundlerConfig.fromViteConfig(config);
+const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('vite/index.cjs', document.baseURI).href)));
+const viteVersion = require$1("vite/package.json").version;
+const isVite8 = Number(viteVersion.split(".")[0]) >= 8;
+const resolveOrderedCSSStyleSheet = (source, importer) => {
+  const normalizedSource = node.normalizePath(source);
+  const isTarget = source === "./createOrderedCSSStyleSheet" || normalizedSource.endsWith("react-native-web/dist/exports/StyleSheet/dom/createOrderedCSSStyleSheet.js");
+  if (isTarget && importer !== void 0 && node.normalizePath(importer).includes("react-native-web/dist/exports/StyleSheet")) {
+    return styleSheetPath;
+  }
+};
+const vite8OptimizeDeps = {
+  exclude: [_package.name, "react-native"],
+  rolldownOptions: {
+    plugins: [{
+      name: "uniwind-rolldown-plugin",
+      resolveId: resolveOrderedCSSStyleSheet
+    }]
+  }
+};
+const vite7OptimizeDeps = {
+  exclude: [_package.name, "react-native"],
+  esbuildOptions: {
+    plugins: [{
+      name: "uniwind-esbuild-plugin",
+      setup: (build) => {
+        build.onResolve(
+          { filter: /^\.\/createOrderedCSSStyleSheet$/ },
+          (args) => {
+            const resolved = resolveOrderedCSSStyleSheet(args.path, args.importer);
+            if (resolved !== void 0) {
+              return { path: resolved };
+            }
+          }
+        );
+      }
+    }]
+  }
+};
+const vite8Resolve = {
+  alias: [{
+    find: /^react-native$/,
+    replacement: componentPath,
+    customResolver: {
+      resolveId(_, importer) {
+        if (importer !== void 0 && node.normalizePath(importer).includes(`${_package.name}/dist`)) {
+          return this.resolve("react-native-web", importer, { skipSelf: true });
+        }
+        return componentPath;
+      }
+    }
+  }]
+};
+const vite7Resolve = {
+  alias: [{
+    find: /^react-native$/,
+    replacement: componentPath,
+    customResolver: {
+      resolveId(_, importer) {
+        if (importer !== void 0 && node.normalizePath(importer).includes(`${_package.name}/dist`)) {
+          return this.resolve("react-native-web");
+        }
+        return componentPath;
+      }
+    }
+  }]
+};
+const uniwind = (config$1) => {
+  const bundlerConfig = config.UniwindBundlerConfig.fromViteConfig(config$1);
   return {
     name: "uniwind",
     enforce: "pre",
     resolveId: (source, importer) => {
-      const normalizedSource = node.normalizePath(source);
-      const isTarget = source === "./createOrderedCSSStyleSheet" || normalizedSource.endsWith("react-native-web/dist/exports/StyleSheet/dom/createOrderedCSSStyleSheet.js");
-      if (isTarget && importer !== void 0 && node.normalizePath(importer).includes("react-native-web/dist/exports/StyleSheet")) {
-        return styleSheetPath;
-      }
+      return resolveOrderedCSSStyleSheet(source, importer);
     },
     config: () => ({
       css: {
@@ -39,40 +104,8 @@ const uniwind = (config) => {
           visitor: bundlerConfig.cssVisitor
         }
       },
-      optimizeDeps: {
-        exclude: [_package.name, "react-native"],
-        esbuildOptions: {
-          plugins: [{
-            name: "uniwind-esbuild-plugin",
-            setup: (build) => {
-              build.onResolve(
-                { filter: /^\.\/createOrderedCSSStyleSheet$/ },
-                (args) => {
-                  if (node.normalizePath(args.importer).includes("react-native-web/dist/exports/StyleSheet")) {
-                    return { path: styleSheetPath };
-                  }
-                }
-              );
-            }
-          }]
-        }
-      },
-      resolve: {
-        alias: [
-          {
-            find: /^react-native$/,
-            replacement: componentPath,
-            customResolver: {
-              resolveId(_, importer) {
-                if (importer !== void 0 && node.normalizePath(importer).includes(`${_package.name}/dist`)) {
-                  return this.resolve("react-native-web");
-                }
-                return componentPath;
-              }
-            }
-          }
-        ]
-      }
+      optimizeDeps: isVite8 ? vite8OptimizeDeps : vite7OptimizeDeps,
+      resolve: isVite8 ? vite8Resolve : vite7Resolve
     }),
     transform: (code, id) => {
       const normalizedId = node.normalizePath(id);

package/dist/vite/index.mjs

@@ -1,6 +1,8 @@
 import { normalizePath } from '@tailwindcss/node';
+import { createRequire } from 'node:module';
 import path from 'path';
-import { n as name, U as UniwindBundlerConfig } from '../shared/uniwind.u-s1XVU8.mjs';
+import { n as name } from '../shared/uniwind.CFAAUZ2t.mjs';
+import { U as UniwindBundlerConfig } from '../shared/uniwind.DgC4MT51.mjs';
 import 'fs';
 import 'lightningcss';
 
@@ -14,17 +16,79 @@ const styleSheetPath = path.resolve(
   "../module/components/web/createOrderedCSSStyleSheet.js"
 );
 const cssArtifactPath = path.resolve(dirname, "../../uniwind.css");
+const require = createRequire(import.meta.url);
+const viteVersion = require("vite/package.json").version;
+const isVite8 = Number(viteVersion.split(".")[0]) >= 8;
+const resolveOrderedCSSStyleSheet = (source, importer) => {
+  const normalizedSource = normalizePath(source);
+  const isTarget = source === "./createOrderedCSSStyleSheet" || normalizedSource.endsWith("react-native-web/dist/exports/StyleSheet/dom/createOrderedCSSStyleSheet.js");
+  if (isTarget && importer !== void 0 && normalizePath(importer).includes("react-native-web/dist/exports/StyleSheet")) {
+    return styleSheetPath;
+  }
+};
+const vite8OptimizeDeps = {
+  exclude: [name, "react-native"],
+  rolldownOptions: {
+    plugins: [{
+      name: "uniwind-rolldown-plugin",
+      resolveId: resolveOrderedCSSStyleSheet
+    }]
+  }
+};
+const vite7OptimizeDeps = {
+  exclude: [name, "react-native"],
+  esbuildOptions: {
+    plugins: [{
+      name: "uniwind-esbuild-plugin",
+      setup: (build) => {
+        build.onResolve(
+          { filter: /^\.\/createOrderedCSSStyleSheet$/ },
+          (args) => {
+            const resolved = resolveOrderedCSSStyleSheet(args.path, args.importer);
+            if (resolved !== void 0) {
+              return { path: resolved };
+            }
+          }
+        );
+      }
+    }]
+  }
+};
+const vite8Resolve = {
+  alias: [{
+    find: /^react-native$/,
+    replacement: componentPath,
+    customResolver: {
+      resolveId(_, importer) {
+        if (importer !== void 0 && normalizePath(importer).includes(`${name}/dist`)) {
+          return this.resolve("react-native-web", importer, { skipSelf: true });
+        }
+        return componentPath;
+      }
+    }
+  }]
+};
+const vite7Resolve = {
+  alias: [{
+    find: /^react-native$/,
+    replacement: componentPath,
+    customResolver: {
+      resolveId(_, importer) {
+        if (importer !== void 0 && normalizePath(importer).includes(`${name}/dist`)) {
+          return this.resolve("react-native-web");
+        }
+        return componentPath;
+      }
+    }
+  }]
+};
 const uniwind = (config) => {
   const bundlerConfig = UniwindBundlerConfig.fromViteConfig(config);
   return {
     name: "uniwind",
     enforce: "pre",
     resolveId: (source, importer) => {
-      const normalizedSource = normalizePath(source);
-      const isTarget = source === "./createOrderedCSSStyleSheet" || normalizedSource.endsWith("react-native-web/dist/exports/StyleSheet/dom/createOrderedCSSStyleSheet.js");
-      if (isTarget && importer !== void 0 && normalizePath(importer).includes("react-native-web/dist/exports/StyleSheet")) {
-        return styleSheetPath;
-      }
+      return resolveOrderedCSSStyleSheet(source, importer);
     },
     config: () => ({
       css: {
@@ -33,40 +97,8 @@ const uniwind = (config) => {
           visitor: bundlerConfig.cssVisitor
         }
       },
-      optimizeDeps: {
-        exclude: [name, "react-native"],
-        esbuildOptions: {
-          plugins: [{
-            name: "uniwind-esbuild-plugin",
-            setup: (build) => {
-              build.onResolve(
-                { filter: /^\.\/createOrderedCSSStyleSheet$/ },
-                (args) => {
-                  if (normalizePath(args.importer).includes("react-native-web/dist/exports/StyleSheet")) {
-                    return { path: styleSheetPath };
-                  }
-                }
-              );
-            }
-          }]
-        }
-      },
-      resolve: {
-        alias: [
-          {
-            find: /^react-native$/,
-            replacement: componentPath,
-            customResolver: {
-              resolveId(_, importer) {
-                if (importer !== void 0 && normalizePath(importer).includes(`${name}/dist`)) {
-                  return this.resolve("react-native-web");
-                }
-                return componentPath;
-              }
-            }
-          }
-        ]
-      }
+      optimizeDeps: isVite8 ? vite8OptimizeDeps : vite7OptimizeDeps,
+      resolve: isVite8 ? vite8Resolve : vite7Resolve
     }),
     transform: (code, id) => {
       const normalizedId = normalizePath(id);

package/package.json

@@ -1,11 +1,14 @@
 {
     "private": false,
     "name": "@niibase/uniwind",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "description": "A fork of Uniwind with Reanimated 4 support",
     "homepage": "https://uniwind.dev",
     "author": "Unistack",
     "type": "module",
+    "bin": {
+        "uniwind": "./dist/cli/index.mjs"
+    },
     "repository": "https://github.com/divineniiquaye/uniwind-oss",
     "sideEffects": false,
     "scripts": {
@@ -22,7 +25,7 @@
         "test:native": "jest --config jest.config.native.js",
         "test:web": "jest --config jest.config.web.js",
         "test:types": "tsc --project tests/type-test/tsconfig.json",
-        "test:e2e": "playwright test",
+        "test:e2e": "bun --bun playwright test",
         "release": "release-it"
     },
     "keywords": [
@@ -83,8 +86,8 @@
         "LICENSE"
     ],
     "dependencies": {
-        "@tailwindcss/node": "4.2.1",
-        "@tailwindcss/oxide": "4.2.1",
+        "@tailwindcss/node": "4.3.0",
+        "@tailwindcss/oxide": "4.3.0",
         "culori": "4.0.2",
         "lightningcss": "1.30.1"
     },
@@ -94,35 +97,48 @@
         "react-native-gesture-handler": ">=2.28.0",
         "react-native-reanimated": ">=4",
         "react-native-safe-area-context": ">=5.6.0",
-        "tailwindcss": ">=4"
+        "tailwindcss": ">=4",
+        "metro": "*",
+        "metro-cache": "*",
+        "@expo/metro-config": "*",
+        "metro-transform-worker": "*"
+    },
+    "peerDependenciesMeta": {
+        "@expo/metro-config": {
+            "optional": true
+        },
+        "metro-transform-worker": {
+            "optional": true
+        }
     },
     "devDependencies": {
-        "@playwright/test": "1.58.2",
-        "@react-native/babel-preset": "0.84.1",
+        "@playwright/test": "1.60.0",
+        "@react-native/babel-preset": "0.85.3",
+        "@react-native/jest-preset": "0.85.3",
+        "@swc/core": "1.15.33",
+        "@swc/jest": "0.2.39",
         "@testing-library/jest-dom": "6.9.1",
         "@testing-library/jest-native": "5.4.3",
         "@testing-library/react": "16.3.2",
         "@testing-library/react-native": "13.3.3",
         "@types/bun": "catalog:",
         "@types/culori": "4.0.1",
-        "@types/jest": "30.0.0",
+        "@types/jest": "29.5.14",
         "@types/react": "catalog:",
-        "dpdm": "4.0.1",
-        "git-cliff": "2.12.0",
-        "jest": "30.2.0",
-        "jest-environment-jsdom": "30.2.0",
-        "metro": "0.84.2",
-        "prettier": "3.8.1",
-        "react-native-gesture-handler": "2.28.0",
+        "dpdm": "4.2.0",
+        "git-cliff": "2.13.1",
+        "jest": "29.7.0",
+        "jest-environment-jsdom": "29.7.0",
+        "metro": "0.84.4",
+        "prettier": "3.8.3",
+        "react-native-gesture-handler": "2.31.2",
         "react-native-reanimated": "catalog:",
-        "react-native-safe-area-context": "5.6.0",
+        "react-native-safe-area-context": "5.7.0",
         "react-native-web": "catalog:",
-        "react-test-renderer": "19.2.4",
-        "release-it": "19.2.4",
-        "ts-jest": "29.4.6",
+        "react-test-renderer": "19.2.3",
+        "release-it": "20.0.1",
         "typescript": "catalog:",
         "unbuild": "3.6.1",
-        "vite": "catalog:",
-        "esbuild": "0.27.3"
+        "vite": "catalog:"
     }
 }

package/src/bundler/adapters/metro/metro.ts

@@ -2,14 +2,21 @@ import { UniwindBundlerConfig } from '@/bundler/config'
 import type { UniwindConfig } from '@/bundler/types'
 import { Platform } from '@/common/consts'
 import type { MetroConfig } from 'metro-config'
+import type { CustomResolver } from 'metro-resolver'
+import { join } from 'node:path'
+import { name as UNIWIND_PACKAGE_NAME } from '../../../../package.json'
 import { cacheStore, patchMetroGraphToSupportUncachedModules } from './patches'
 import { nativeResolver, webResolver } from './resolvers'
 
+const isUniwindRequest = (moduleName: string) => moduleName === UNIWIND_PACKAGE_NAME || moduleName.startsWith(`${UNIWIND_PACKAGE_NAME}/`)
+
 export const withUniwindConfig = <T extends MetroConfig>(
     config: T,
     uniwindConfig: UniwindConfig,
 ): T => {
     const bundlerConfig = UniwindBundlerConfig.fromMetroConfig(uniwindConfig)
+    const pinnedUniwindOrigin = join(config.projectRoot ?? process.cwd(), 'package.json')
+
     patchMetroGraphToSupportUncachedModules()
 
     return {
@@ -30,9 +37,23 @@ export const withUniwindConfig = <T extends MetroConfig>(
                 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: CustomResolver = (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,

package/src/bundler/adapters/metro/patches.ts

@@ -39,7 +39,7 @@ export const patchMetroGraphToSupportUncachedModules = () => {
     function traverseDependencies(this: Graph, paths: Array<string>, options: GraphOptions<any>) {
         this.dependencies.forEach(dependency => {
             if (
-                dependency.output.find(file => file.data.css?.skipCache === true)
+                dependency.output.find(file => (file.data as any)?.css?.skipCache === true)
                 && !paths.includes(dependency.path)
             ) {
                 // @ts-expect-error Hidden property