tailwindcss 0.0.0-insiders.df011dc → 0.0.0-insiders.e2d5f21

package/lib/util/transformThemeValue.js

@@ -1,32 +1,63 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 exports.default = transformThemeValue;
-
 var _postcss = _interopRequireDefault(require("postcss"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 function transformThemeValue(themeSection) {
-  if (['fontSize', 'outline'].includes(themeSection)) {
-    return value => Array.isArray(value) ? value[0] : value;
-  }
-
-  if (['fontFamily', 'boxShadow', 'transitionProperty', 'transitionDuration', 'transitionDelay', 'transitionTimingFunction', 'backgroundImage', 'backgroundSize', 'backgroundColor', 'cursor', 'animation'].includes(themeSection)) {
-    return value => Array.isArray(value) ? value.join(', ') : value;
-  } // For backwards compatibility reasons, before we switched to underscores
-  // instead of commas for arbitrary values.
-
-
-  if (['gridTemplateColumns', 'gridTemplateRows', 'objectPosition'].includes(themeSection)) {
-    return value => typeof value === 'string' ? _postcss.default.list.comma(value).join(' ') : value;
-  }
-
-  if (themeSection === 'colors') {
-    return value => typeof value === 'function' ? value({}) : value;
-  }
-
-  return value => value;
-}
+    if ([
+        'fontSize',
+        'outline'
+    ].includes(themeSection)) {
+        return (value)=>{
+            if (typeof value === 'function') value = value({
+            });
+            if (Array.isArray(value)) value = value[0];
+            return value;
+        };
+    }
+    if ([
+        'fontFamily',
+        'boxShadow',
+        'transitionProperty',
+        'transitionDuration',
+        'transitionDelay',
+        'transitionTimingFunction',
+        'backgroundImage',
+        'backgroundSize',
+        'backgroundColor',
+        'cursor',
+        'animation', 
+    ].includes(themeSection)) {
+        return (value)=>{
+            if (typeof value === 'function') value = value({
+            });
+            if (Array.isArray(value)) value = value.join(', ');
+            return value;
+        };
+    }
+    // For backwards compatibility reasons, before we switched to underscores
+    // instead of commas for arbitrary values.
+    if ([
+        'gridTemplateColumns',
+        'gridTemplateRows',
+        'objectPosition'
+    ].includes(themeSection)) {
+        return (value)=>{
+            if (typeof value === 'function') value = value({
+            });
+            if (typeof value === 'string') value = _postcss.default.list.comma(value).join(' ');
+            return value;
+        };
+    }
+    return (value)=>{
+        if (typeof value === 'function') value = value({
+        });
+        return value;
+    };
+}

package/lib/util/withAlphaVariable.js

@@ -1,65 +1,67 @@
 "use strict";
-
 Object.defineProperty(exports, "__esModule", {
-  value: true
+    value: true
 });
 exports.withAlphaValue = withAlphaValue;
 exports.default = withAlphaVariable;
-
 var _color = require("./color");
-
 function withAlphaValue(color, alphaValue, defaultValue) {
-  if (typeof color === 'function') {
-    return color({
-      opacityValue: alphaValue
+    if (typeof color === 'function') {
+        return color({
+            opacityValue: alphaValue
+        });
+    }
+    let parsed = (0, _color).parseColor(color);
+    if (parsed === null) {
+        return defaultValue;
+    }
+    return (0, _color).formatColor({
+        ...parsed,
+        alpha: alphaValue
     });
-  }
-
-  let parsed = (0, _color.parseColor)(color);
-
-  if (parsed === null) {
-    return defaultValue;
-  }
-
-  return (0, _color.formatColor)({ ...parsed,
-    alpha: alphaValue
-  });
 }
-
-function withAlphaVariable({
-  color,
-  property,
-  variable
-}) {
-  if (typeof color === 'function') {
+function withAlphaVariable({ color , property , variable  }) {
+    let properties = [].concat(property);
+    if (typeof color === 'function') {
+        return {
+            [variable]: '1',
+            ...Object.fromEntries(properties.map((p)=>{
+                return [
+                    p,
+                    color({
+                        opacityVariable: variable,
+                        opacityValue: `var(${variable})`
+                    })
+                ];
+            }))
+        };
+    }
+    const parsed = (0, _color).parseColor(color);
+    if (parsed === null) {
+        return Object.fromEntries(properties.map((p)=>[
+                p,
+                color
+            ]
+        ));
+    }
+    if (parsed.alpha !== undefined) {
+        // Has an alpha value, return color as-is
+        return Object.fromEntries(properties.map((p)=>[
+                p,
+                color
+            ]
+        ));
+    }
     return {
-      [variable]: '1',
-      [property]: color({
-        opacityVariable: variable,
-        opacityValue: `var(${variable})`
-      })
+        [variable]: '1',
+        ...Object.fromEntries(properties.map((p)=>{
+            return [
+                p,
+                (0, _color).formatColor({
+                    ...parsed,
+                    alpha: `var(${variable})`
+                })
+            ];
+        }))
     };
-  }
-
-  const parsed = (0, _color.parseColor)(color);
-
-  if (parsed === null) {
-    return {
-      [property]: color
-    };
-  }
-
-  if (parsed.alpha !== undefined) {
-    // Has an alpha value, return color as-is
-    return {
-      [property]: color
-    };
-  }
-
-  return {
-    [variable]: '1',
-    [property]: (0, _color.formatColor)({ ...parsed,
-      alpha: `var(${variable})`
-    })
-  };
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-insiders.df011dc",
+  "version": "0.0.0-insiders.e2d5f21",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -18,17 +18,18 @@
     "David Hemphill <davidlee.hemphill@gmail.com>"
   ],
   "scripts": {
-    "prebabelify": "npm run generate:plugin-list && rimraf lib",
-    "babelify": "babel src --out-dir lib --copy-files",
-    "postbabelify": "ncc build lib/cli-peer-dependencies.js -o peers",
-    "rebuild-fixtures": "npm run babelify && babel-node scripts/rebuildFixtures.js",
-    "prepublishOnly": "npm install --force && npm run babelify",
+    "preswcify": "npm run generate:plugin-list && rimraf lib",
+    "swcify": "swc src --out-dir lib --copy-files",
+    "postswcify": "esbuild lib/cli-peer-dependencies.js --bundle --platform=node --outfile=peers/index.js",
+    "rebuild-fixtures": "npm run swcify && node -r @swc/register scripts/rebuildFixtures.js",
+    "prepublishOnly": "npm install --force && npm run swcify",
     "style": "eslint .",
+    "pretest": "npm run generate:plugin-list",
     "test": "cross-env TAILWIND_MODE=build jest",
     "test:integrations": "npm run test --prefix ./integrations",
     "install:integrations": "node scripts/install-integrations.js",
     "posttest": "npm run style",
-    "generate:plugin-list": "babel-node scripts/create-plugin-list.js"
+    "generate:plugin-list": "node -r @swc/register scripts/create-plugin-list.js"
   },
   "files": [
     "src/*",
@@ -42,24 +43,22 @@
     "*.js"
   ],
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.15.5",
-    "@babel/node": "^7.12.13",
-    "@babel/preset-env": "^7.15.0",
-    "@tailwindcss/aspect-ratio": "^0.2.1",
-    "@vercel/ncc": "^0.29.2",
-    "autoprefixer": "^10.3.3",
-    "babel-jest": "^27.1.0",
+    "@swc/cli": "^0.1.52",
+    "@swc/core": "^1.2.106",
+    "@swc/jest": "^0.1.5",
+    "@swc/register": "^0.1.7",
+    "autoprefixer": "^10.4.0",
     "cross-env": "^7.0.3",
-    "cssnano": "^5.0.8",
-    "eslint": "^7.32.0",
+    "cssnano": "^5.0.12",
+    "esbuild": "^0.13.12",
+    "eslint": "^8.2.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.1.0",
-    "jest-diff": "^27.1.0",
-    "postcss": "^8.3.6",
+    "jest": "^27.3.1",
+    "jest-diff": "^27.2.5",
+    "postcss": "^8.4.4",
     "postcss-cli": "^8.3.1",
-    "prettier": "^2.3.2",
+    "prettier": "^2.5.0",
     "rimraf": "^3.0.0"
   },
   "peerDependencies": {
@@ -76,15 +75,15 @@
     "didyoumean": "^1.2.2",
     "dlv": "^1.1.3",
     "fast-glob": "^3.2.7",
-    "glob-parent": "^6.0.1",
-    "is-glob": "^4.0.1",
+    "glob-parent": "^6.0.2",
+    "is-glob": "^4.0.3",
     "normalize-path": "^3.0.0",
     "object-hash": "^2.2.0",
     "postcss-js": "^3.0.3",
     "postcss-load-config": "^3.1.0",
     "postcss-nested": "5.0.6",
     "postcss-selector-parser": "^6.0.6",
-    "postcss-value-parser": "^4.1.0",
+    "postcss-value-parser": "^4.2.0",
     "quick-lru": "^5.1.1",
     "resolve": "^1.20.0",
     "tmp": "^0.2.1"
@@ -95,18 +94,6 @@
     "not ie 11",
     "not op_mini all"
   ],
-  "babel": {
-    "presets": [
-      [
-        "@babel/preset-env",
-        {
-          "targets": {
-            "node": "12.13.0"
-          }
-        }
-      ]
-    ]
-  },
   "jest": {
     "testTimeout": 30000,
     "setupFilesAfterEnv": [
@@ -115,7 +102,10 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/integrations/"
-    ]
+    ],
+    "transform": {
+      "\\.js$": "@swc/jest"
+    }
   },
   "engines": {
     "node": ">=12.13.0"