tailwindcss 0.0.0-insiders.e2d5f21 → 0.0.0-insiders.e6e24b8

package/CHANGELOG.md

@@ -14,7 +14,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Add `placeholder` variant ([#6106](https://github.com/tailwindlabs/tailwindcss/pull/6106))
-- Add tuple syntax for configuring screens while guaranteeing order ([#5956](https://github.com/tailwindlabs/tailwindcss/pull/5956))
 - Add composable `touch-action` utilities ([#6115](https://github.com/tailwindlabs/tailwindcss/pull/6115))
 - Add support for "arbitrary properties" ([#6161](https://github.com/tailwindlabs/tailwindcss/pull/6161))
 - Add `portrait` and `landscape` variants ([#6046](https://github.com/tailwindlabs/tailwindcss/pull/6046))
@@ -22,8 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `menu` reset to preflight ([#6213](https://github.com/tailwindlabs/tailwindcss/pull/6213))
 - Allow `0` as a valid `length` value ([#6233](https://github.com/tailwindlabs/tailwindcss/pull/6233), [#6259](https://github.com/tailwindlabs/tailwindcss/pull/6259))
 - Add CSS functions to data types ([#6258](https://github.com/tailwindlabs/tailwindcss/pull/6258))
-- Add CSS functions to data types ([#6258](https://github.com/tailwindlabs/tailwindcss/pull/6258))
 - Support negative values for `scale-*` utilities ([c48e629](https://github.com/tailwindlabs/tailwindcss/commit/c48e629955585ad18dadba9f470fda59cc448ab7))
+- Improve `length` data type, by validating each value individually ([#6283](https://github.com/tailwindlabs/tailwindcss/pull/6283))
 
 ### Changed
 

package/lib/util/dataTypes.js

@@ -82,8 +82,10 @@ let lengthUnits = [
 ];
 let lengthUnitsPattern = `(?:${lengthUnits.join('|')})`;
 function length(value) {
-    return value === '0' || new RegExp(`${lengthUnitsPattern}$`).test(value) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?${lengthUnitsPattern}`).test(value)
-    );
+    return value.split(UNDERSCORE).every((part)=>{
+        return part === '0' || new RegExp(`${lengthUnitsPattern}$`).test(part) || cssFunctions.some((fn)=>new RegExp(`^${fn}\\(.+?${lengthUnitsPattern}`).test(part)
+        );
+    });
 }
 let lineWidths = new Set([
     'thin',

package/lib/util/normalizeScreens.js

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.normalizeScreens = normalizeScreens;
-function normalizeScreens(screens) {
+function normalizeScreens(screens, root = true) {
     if (Array.isArray(screens)) {
         return screens.map((screen)=>{
+            if (root && Array.isArray(screen)) {
+                throw new Error('The tuple syntax is not supported for `screens`.');
+            }
             if (typeof screen === 'string') {
                 return {
                     name: screen.toString(),
@@ -46,7 +49,7 @@ function normalizeScreens(screens) {
         });
     }
     return normalizeScreens(Object.entries(screens !== null && screens !== void 0 ? screens : {
-    }));
+    }), false);
 }
 function resolveValue({ 'min-width': _minWidth , min =_minWidth , max , raw  } = {
 }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "0.0.0-insiders.e2d5f21",
+  "version": "0.0.0-insiders.e6e24b8",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -54,8 +54,8 @@
     "eslint": "^8.2.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.3.1",
-    "jest-diff": "^27.2.5",
+    "jest": "^27.4.3",
+    "jest-diff": "^27.4.2",
     "postcss": "^8.4.4",
     "postcss-cli": "^8.3.1",
     "prettier": "^2.5.0",

package/src/util/dataTypes.js

@@ -80,11 +80,13 @@ let lengthUnits = [
 ]
 let lengthUnitsPattern = `(?:${lengthUnits.join('|')})`
 export function length(value) {
-  return (
-    value === '0' ||
-    new RegExp(`${lengthUnitsPattern}$`).test(value) ||
-    cssFunctions.some((fn) => new RegExp(`^${fn}\\(.+?${lengthUnitsPattern}`).test(value))
-  )
+  return value.split(UNDERSCORE).every((part) => {
+    return (
+      part === '0' ||
+      new RegExp(`${lengthUnitsPattern}$`).test(part) ||
+      cssFunctions.some((fn) => new RegExp(`^${fn}\\(.+?${lengthUnitsPattern}`).test(part))
+    )
+  })
 }
 
 let lineWidths = new Set(['thin', 'medium', 'thick'])

package/src/util/normalizeScreens.js

@@ -7,14 +7,17 @@
  *   - { sm: '100px', md: '200px' } // Object with string values
  *   - { sm: { min: '100px' }, md: { max: '100px' } } // Object with object values
  *   - { sm: [{ min: '100px' }, { max: '200px' }] } // Object with object array (multiple values)
- *   - [['sm', '100px'], ['md', '200px']] // Tuple object
  *
  * Output(s):
  *   - [{ name: 'sm', values: [{ min: '100px', max: '200px' }] }] // List of objects, that contains multiple values
  */
-export function normalizeScreens(screens) {
+export function normalizeScreens(screens, root = true) {
   if (Array.isArray(screens)) {
     return screens.map((screen) => {
+      if (root && Array.isArray(screen)) {
+        throw new Error('The tuple syntax is not supported for `screens`.')
+      }
+
       if (typeof screen === 'string') {
         return { name: screen.toString(), values: [{ min: screen, max: undefined }] }
       }
@@ -34,7 +37,7 @@ export function normalizeScreens(screens) {
     })
   }
 
-  return normalizeScreens(Object.entries(screens ?? {}))
+  return normalizeScreens(Object.entries(screens ?? {}), false)
 }
 
 function resolveValue({ 'min-width': _minWidth, min = _minWidth, max, raw } = {}) {