@niibase/uniwind 1.6.4 → 1.8.0

package/CHANGELOG.md

@@ -1,3 +1,74 @@
+## What's Changed in 1.8.0
+
+
+
+### 🚀 Features
+
+* vite 8 support (#560) by @Brentlok
+* public generate-artifacts script (#550) by @Brentlok
+
+### 🐛 Bug Fixes
+
+* bundler infinite loop when multiple uniwind instances are installed (#570) by @Brentlok
+* combined variants overriding each other (#567) by @Brentlok
+* phantom dependencies (#561) by @Brentlok
+
+### 🔨 Refactoring
+
+* replace computed with functions in styles (#547) by @Brentlok
+
+### 🧪 Testing
+
+* generate artifacts before test by @Brentlok
+
+### 🏠 Chores
+
+* update dependencies (#549) by @Brentlok
+
+### 📦 Other
+
+* Merge branch 'updates' by @divineniiquaye
+
+
+**Full Changelog**: https://github.com/divineniiquaye/uniwind/compare/v1.7.0...v1.8.0
+
+
+## What's Changed in 1.7.0
+
+
+
+### 🚀 Features
+
+* introduce responsive scaling support by @divineniiquaye
+
+### 🐛 Bug Fixes
+
+* reemove redundant constructor assignment from css processor by @divineniiquaye
+* dont parse flex: 1 (#543) by @Brentlok
+* deeply find themed variables (#535) by @Brentlok
+
+### 🔨 Refactoring
+
+* major bundler refactor (#523) by @Brentlok
+
+### 🏠 Chores
+
+* pass bundler config directly by @Brentlok
+* generate artifacts before compiling virtual code by @Brentlok
+* update version by @Brentlok
+* silent css variable warning for SSR (#539) by @Brentlok
+
+### 📦 Other
+
+* Merge branch 'updates' by @divineniiquaye
+* Fix !important modifier having no effect on native (#534) by @jezsung
+
+### New Contributors
+* @jezsung made their first contribution
+
+**Full Changelog**: https://github.com/divineniiquaye/uniwind/compare/v1.6.4...v1.7.0
+
+
 ## What's Changed in 1.6.4
 
 

package/dist/cli/index.cjs

@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+'use strict';
+
+const config = require('../shared/uniwind.BEqYiPBB.cjs');
+const node_url = require('node:url');
+const path = require('path');
+require('fs');
+require('@tailwindcss/node');
+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);
+
+const dirname = path__default.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli/index.cjs', document.baseURI).href))));
+const cssArtifactPath = path__default.resolve(dirname, "../../uniwind.css");
+const printHelp = () => {
+  console.log([
+    "Usage: uniwind generate-artifacts --css <file> [--theme <name>...] [--dts <file>]",
+    "",
+    "Options:",
+    "  --css <file>      CSS entry file path, e.g. ./global.css",
+    "  --theme <name>    Extra theme name. Can be passed multiple times",
+    "  --dts <file>      Generated TypeScript declarations path",
+    "  --help            Show help"
+  ].join("\n"));
+};
+const readValue = (args, index, flag) => {
+  const value = args[index + 1];
+  if (value === void 0 || value.startsWith("--")) {
+    throw new Error(`Uniwind: ${flag} requires a value`);
+  }
+  return value;
+};
+const parseGenerateArtifactsArgs = (args) => {
+  const parsed = {
+    extraThemes: []
+  };
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index];
+    switch (arg) {
+      case "--css":
+        parsed.cssEntryFile = readValue(args, index, arg);
+        index++;
+        break;
+      case "--theme":
+        parsed.extraThemes.push(readValue(args, index, arg));
+        index++;
+        break;
+      case "--dts":
+        parsed.dtsFile = readValue(args, index, arg);
+        index++;
+        break;
+      case "--help":
+        printHelp();
+        process.exit(0);
+      default:
+        throw new Error(`Uniwind: Unknown option ${arg}`);
+    }
+  }
+  return parsed;
+};
+const generateArtifacts = async (args) => {
+  const parsed = parseGenerateArtifactsArgs(args);
+  const bundlerConfig = config.UniwindBundlerConfig.fromCliConfig({
+    cssEntryFile: parsed.cssEntryFile,
+    dtsFile: parsed.dtsFile,
+    extraThemes: parsed.extraThemes
+  });
+  await bundlerConfig.generateArtifacts(cssArtifactPath);
+  config.Logger.info("Artifacts generated");
+};
+const main = async () => {
+  const [command, ...args] = process.argv.slice(2);
+  if (command === "--help" || command === void 0) {
+    printHelp();
+    return;
+  }
+  switch (command) {
+    case "generate-artifacts":
+      await generateArtifacts(args);
+      break;
+    default:
+      throw new Error(`Uniwind: Unknown command ${command}`);
+  }
+};
+main().catch((error) => {
+  console.error(error instanceof Error ? error.message : error);
+  process.exit(1);
+});

package/dist/cli/index.mjs

@@ -0,0 +1,84 @@
+#!/usr/bin/env node
+import { U as UniwindBundlerConfig, L as Logger } from '../shared/uniwind.DgC4MT51.mjs';
+import { fileURLToPath } from 'node:url';
+import path from 'path';
+import 'fs';
+import '@tailwindcss/node';
+import 'lightningcss';
+
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+const cssArtifactPath = path.resolve(dirname, "../../uniwind.css");
+const printHelp = () => {
+  console.log([
+    "Usage: uniwind generate-artifacts --css <file> [--theme <name>...] [--dts <file>]",
+    "",
+    "Options:",
+    "  --css <file>      CSS entry file path, e.g. ./global.css",
+    "  --theme <name>    Extra theme name. Can be passed multiple times",
+    "  --dts <file>      Generated TypeScript declarations path",
+    "  --help            Show help"
+  ].join("\n"));
+};
+const readValue = (args, index, flag) => {
+  const value = args[index + 1];
+  if (value === void 0 || value.startsWith("--")) {
+    throw new Error(`Uniwind: ${flag} requires a value`);
+  }
+  return value;
+};
+const parseGenerateArtifactsArgs = (args) => {
+  const parsed = {
+    extraThemes: []
+  };
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index];
+    switch (arg) {
+      case "--css":
+        parsed.cssEntryFile = readValue(args, index, arg);
+        index++;
+        break;
+      case "--theme":
+        parsed.extraThemes.push(readValue(args, index, arg));
+        index++;
+        break;
+      case "--dts":
+        parsed.dtsFile = readValue(args, index, arg);
+        index++;
+        break;
+      case "--help":
+        printHelp();
+        process.exit(0);
+      default:
+        throw new Error(`Uniwind: Unknown option ${arg}`);
+    }
+  }
+  return parsed;
+};
+const generateArtifacts = async (args) => {
+  const parsed = parseGenerateArtifactsArgs(args);
+  const bundlerConfig = UniwindBundlerConfig.fromCliConfig({
+    cssEntryFile: parsed.cssEntryFile,
+    dtsFile: parsed.dtsFile,
+    extraThemes: parsed.extraThemes
+  });
+  await bundlerConfig.generateArtifacts(cssArtifactPath);
+  Logger.info("Artifacts generated");
+};
+const main = async () => {
+  const [command, ...args] = process.argv.slice(2);
+  if (command === "--help" || command === void 0) {
+    printHelp();
+    return;
+  }
+  switch (command) {
+    case "generate-artifacts":
+      await generateArtifacts(args);
+      break;
+    default:
+      throw new Error(`Uniwind: Unknown command ${command}`);
+  }
+};
+main().catch((error) => {
+  console.error(error instanceof Error ? error.message : error);
+  process.exit(1);
+});

package/dist/common/{css → bundler/artifacts/css}/index.js

@@ -5,17 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildCSS = void 0;
 var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
 var _extraUtilities = require("./extraUtilities");
 var _insets = require("./insets");
 var _overwrite = require("./overwrite");
 var _themes = require("./themes");
 var _variants = require("./variants");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const dirname = typeof __dirname !== "undefined" ? __dirname : import.meta.dirname;
-const buildCSS = async (themes, input) => {
+const buildCSS = async (themes, input, cssFilePath) => {
   const themesCSS = await (0, _themes.generateCSSForThemes)(themes, input);
-  const cssFilePath = _path.default.join(dirname, "../../uniwind.css");
   const oldCSSFile = _fs.default.existsSync(cssFilePath) ? _fs.default.readFileSync(cssFilePath, "utf-8") : "";
   const newCssFile = [_variants.VARIANTS_CSS, _insets.INSETS_CSS, _overwrite.OVERWRITE_CSS, _extraUtilities.EXTRA_UTILITIES_CSS, themesCSS].join("\n");
   if (oldCSSFile === newCssFile) {

package/dist/common/{css → bundler/artifacts/css}/themes.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.generateCSSForThemes = void 0;
+var _logger = require("@/bundler/logger");
 var _node = require("@tailwindcss/node");
 var _fs = _interopRequireDefault(require("fs"));
 var _lightningcss = require("lightningcss");
 var _path = _interopRequireDefault(require("path"));
-var _logger = require("../metro/logger");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const readFileSafe = filePath => {
   try {
@@ -53,6 +53,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.default.resolve(_path.default.dirname(cssPath), dependency.url));
         return false;

package/dist/common/{utils/buildDtsFile.js → bundler/artifacts/dts.js}

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildDtsFile = void 0;
 var _fs = _interopRequireDefault(require("fs"));
-var _package = require("../../package.json");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const buildDtsFile = (dtsPath, stringifiedThemes) => {
   const oldDtsContent = _fs.default.existsSync(dtsPath) ? _fs.default.readFileSync(dtsPath, "utf-8") : "";
-  const dtsContent = [`// NOTE: This file is generated by ${_package.name} and it should not be edited manually.`, `/// <reference types="${_package.name}/types" />`, "", `declare module '${_package.name}' {`, `    export interface UniwindConfig {`, `        themes: readonly ${stringifiedThemes}`, `    }`, `}`, "", `export {}`, ""].join("\n");
+  const dtsContent = [`// NOTE: This file is generated by uniwind and it should not be edited manually.`, `/// <reference types="uniwind/types" />`, "", `declare module 'uniwind' {`, `    export interface UniwindConfig {`, `        themes: readonly ${stringifiedThemes}`, `    }`, `}`, "", `export {}`, ""].join("\n");
   if (oldDtsContent === dtsContent) {
     return;
   }

package/dist/common/bundler/cli/index.js

@@ -0,0 +1,76 @@
+// #!/usr/bin/env node
+"use strict";
+
+var _config = require("@/bundler/config");
+var _logger = require("@/bundler/logger");
+var _nodeUrl = require("node:url");
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const dirname = _path.default.dirname((0, _nodeUrl.fileURLToPath)(require('url').pathToFileURL(__filename).toString()));
+const cssArtifactPath = _path.default.resolve(dirname, "../../uniwind.css");
+const printHelp = () => {
+  console.log(["Usage: uniwind generate-artifacts --css <file> [--theme <name>...] [--dts <file>]", "", "Options:", "  --css <file>      CSS entry file path, e.g. ./global.css", "  --theme <name>    Extra theme name. Can be passed multiple times", "  --dts <file>      Generated TypeScript declarations path", "  --help            Show help"].join("\n"));
+};
+const readValue = (args, index, flag) => {
+  const value = args[index + 1];
+  if (value === void 0 || value.startsWith("--")) {
+    throw new Error(`Uniwind: ${flag} requires a value`);
+  }
+  return value;
+};
+const parseGenerateArtifactsArgs = args => {
+  const parsed = {
+    extraThemes: []
+  };
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index];
+    switch (arg) {
+      case "--css":
+        parsed.cssEntryFile = readValue(args, index, arg);
+        index++;
+        break;
+      case "--theme":
+        parsed.extraThemes.push(readValue(args, index, arg));
+        index++;
+        break;
+      case "--dts":
+        parsed.dtsFile = readValue(args, index, arg);
+        index++;
+        break;
+      case "--help":
+        printHelp();
+        process.exit(0);
+      default:
+        throw new Error(`Uniwind: Unknown option ${arg}`);
+    }
+  }
+  return parsed;
+};
+const generateArtifacts = async args => {
+  const parsed = parseGenerateArtifactsArgs(args);
+  const bundlerConfig = _config.UniwindBundlerConfig.fromCliConfig({
+    cssEntryFile: parsed.cssEntryFile,
+    dtsFile: parsed.dtsFile,
+    extraThemes: parsed.extraThemes
+  });
+  await bundlerConfig.generateArtifacts(cssArtifactPath);
+  _logger.Logger.info("Artifacts generated");
+};
+const main = async () => {
+  const [command, ...args] = process.argv.slice(2);
+  if (command === "--help" || command === void 0) {
+    printHelp();
+    return;
+  }
+  switch (command) {
+    case "generate-artifacts":
+      await generateArtifacts(args);
+      break;
+    default:
+      throw new Error(`Uniwind: Unknown command ${command}`);
+  }
+};
+main().catch(error => {
+  console.error(error instanceof Error ? error.message : error);
+  process.exit(1);
+});

package/dist/common/bundler/config.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.UniwindBundlerConfig = void 0;
+var _css = require("@/bundler/artifacts/css");
+var _dts = require("@/bundler/artifacts/dts");
+var _cssVisitor = require("@/bundler/css-visitor");
+var _consts = require("@/common/consts");
+var _utils = require("@/common/utils");
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+class UniwindBundlerConfig {
+  constructor(config, platform) {
+    this.config = config;
+    this.platform = platform;
+  }
+  static fromMetroConfig(config, platform) {
+    const getPlatform = () => {
+      if (!(0, _utils.isDefined)(platform)) {
+        return _consts.Platform.Native;
+      }
+      if (!config.isTV) {
+        return platform;
+      }
+      if (platform === _consts.Platform.Android) {
+        return _consts.Platform.AndroidTV;
+      }
+      if (platform === _consts.Platform.iOS) {
+        return _consts.Platform.AppleTV;
+      }
+      throw new Error(`Platform ${platform} not supported`);
+    };
+    if (typeof config === "undefined") {
+      throw new Error("Uniwind: You need to pass second parameter to withUniwindConfig");
+    }
+    if (typeof config.cssEntryFile === "undefined") {
+      throw new Error('Uniwind: You need to pass css css entry file to withUniwindConfig, e.g. withUniwindConfig(config, { cssEntryFile: "./global.css" })');
+    }
+    return new UniwindBundlerConfig(config, getPlatform());
+  }
+  static fromViteConfig(config) {
+    return new UniwindBundlerConfig(config, _consts.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, _consts.Platform.Web);
+  }
+  get cssPath() {
+    return _path.default.join(process.cwd(), this.config.cssEntryFile);
+  }
+  get themes() {
+    return Array.from(/* @__PURE__ */new Set(["light", "dark", ...(this.config.extraThemes ?? [])]));
+  }
+  get cssVisitor() {
+    return new _cssVisitor.UniwindCSSVisitor(this);
+  }
+  get polyfills() {
+    return this.config.polyfills;
+  }
+  get stringifiedThemes() {
+    return `[${this.themes.map(theme => `'${theme}'`).join(", ")}]`;
+  }
+  toMetroConfig() {
+    return this.config;
+  }
+  async generateArtifacts(cssArtifactPath) {
+    await (0, _css.buildCSS)(this.themes, this.config.cssEntryFile, cssArtifactPath);
+    (0, _dts.buildDtsFile)(this.config.dtsFile ?? "uniwind-types.d.ts", this.stringifiedThemes);
+  }
+}
+exports.UniwindBundlerConfig = UniwindBundlerConfig;

package/dist/common/bundler/css-compiler/compileCSS.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.compileCSS = void 0;
+var _consts = require("@/common/consts");
+var _compileNativeCSS = require("./compileNativeCSS");
+var _compileTailwind = require("./compileTailwind");
+var _compileWebCSS = require("./compileWebCSS");
+const compileCSS = async bundlerConfig => {
+  const tailwindCSS = await (0, _compileTailwind.compileTailwind)(bundlerConfig);
+  if (bundlerConfig.platform === _consts.Platform.Web) {
+    return (0, _compileWebCSS.compileWebCSS)(bundlerConfig, tailwindCSS);
+  }
+  return (0, _compileNativeCSS.compileNativeCSS)(bundlerConfig, tailwindCSS);
+};
+exports.compileCSS = compileCSS;

package/dist/common/bundler/css-compiler/compileNativeCSS.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.compileNativeCSS = void 0;
+var _cssProcessor = require("../css-processor");
+const compileNativeCSS = (bundlerConfig, tailwindCSS) => {
+  const Processor = new _cssProcessor.ProcessorBuilder(bundlerConfig);
+  Processor.transform(tailwindCSS);
+  const stylesheet = (0, _cssProcessor.serializeJSObject)((0, _cssProcessor.addMetaToStylesTemplate)(Processor, bundlerConfig.platform), (key, value) => `"${key}": ${value}`);
+  const vars = (0, _cssProcessor.serializeJSObject)(Processor.vars, (key, value) => `"${key}": vars => ${value}`);
+  const keyframes = (0, _cssProcessor.serializeJSObject)(Processor.keyframes, (key, value) => `get "${key}"() { return ${value} }`);
+  const scopedVars = Object.fromEntries(Object.entries(Processor.scopedVars).map(([scopedVarsName, scopedVars2]) => [scopedVarsName, (0, _cssProcessor.serializeJSObject)(scopedVars2, (key, value) => `"${key}": vars => ${value}`)]));
+  const serializedScopedVars = Object.entries(scopedVars).map(([scopedVarsName, scopedVars2]) => `"${scopedVarsName}": ({ ${scopedVars2} }),`).join("");
+  const currentColorVar = `currentColor: () => rt.colorScheme === 'dark' ? '#ffffff' : '#000000',`;
+  return ["({", `scopedVars: ({ ${serializedScopedVars} }),`, `vars: ({ ${currentColorVar} ${vars} }),`, `stylesheet: ({ ${stylesheet} }),`, `keyframes: ({ ${keyframes} }),`, "})"].join("");
+};
+exports.compileNativeCSS = compileNativeCSS;

package/dist/common/bundler/css-compiler/compileTailwind.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.compileTailwind = void 0;
+var _node = require("@tailwindcss/node");
+var _oxide = require("@tailwindcss/oxide");
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const compileTailwind = async bundlerConfig => {
+  const css = await _fs.default.promises.readFile(bundlerConfig.cssPath, "utf-8");
+  const compiler = await (0, _node.compile)(css, {
+    base: _path.default.dirname(bundlerConfig.cssPath),
+    onDependency: () => void 0
+  });
+  const scanner = new _oxide.Scanner({
+    sources: [...compiler.sources, {
+      negated: false,
+      pattern: "**/*",
+      base: _path.default.dirname(bundlerConfig.cssPath)
+    }]
+  });
+  return compiler.build(scanner.scan());
+};
+exports.compileTailwind = compileTailwind;

package/dist/common/bundler/css-compiler/compileWebCSS.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.compileWebCSS = void 0;
+var _lightningcss = require("lightningcss");
+const compileWebCSS = (bundlerConfig, tailwindCSS) => {
+  return (0, _lightningcss.transform)({
+    code: Buffer.from(tailwindCSS),
+    filename: "uniwind.css",
+    visitor: bundlerConfig.cssVisitor
+  }).code.toString();
+};
+exports.compileWebCSS = compileWebCSS;

package/dist/common/{vite → bundler/css-compiler}/index.js

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _vite = require("./vite");
-Object.keys(_vite).forEach(function (key) {
+var _compileCSS = require("./compileCSS");
+Object.keys(_compileCSS).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _vite[key]) return;
+  if (key in exports && exports[key] === _compileCSS[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _vite[key];
+      return _compileCSS[key];
     }
   });
 });