Merge pull request #38 from mertasan/case-sensitive

mertasan · web-flow · commit 97df7427fab1 · 2022-08-10T19:15:13.000+03:00
Add uppercase support to keys
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,24 +19,30 @@ jobs:
         node-version: [12, 14, 16]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
 
+      - name: Get npm cache directory
+        id: npm-cache-dir
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+
       - name: Use cached node_modules
-        id: cache-tests
-        uses: actions/cache@v2
+        id: npm-cache
+        uses: actions/cache@v3
         with:
-          path: node_modules
-          key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}-tests
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            nodeModules-
+            ${{ runner.os }}-node-${{ matrix.node-version }}-
+            ${{ runner.os }}-node-
 
       - name: Install dependencies
-        if: steps.cache-tests.outputs.cache-hit != 'true'
+        if: steps.npm-cache.outputs.cache-hit != 'true'
         run: npm install
         env:
           CI: true
diff --git a/__tests__/issues.test.js b/__tests__/issues.test.js
@@ -114,3 +114,42 @@ test('issue 25', async () => {
     "
   `)
 })
+
+test('issue 37', async () => {
+  expect(
+    await utils.diffOnly({
+      content: [utils.content()],
+      darkMode: 'class',
+      theme: {
+        variables: {
+          DEFAULT: {
+            ONE: 'red',
+            TWO: {
+              DEFAULT: 'black',
+              FOObar: 'green',
+              THREE: {
+                FOUR: 'white',
+                five: 'blue',
+              },
+            },
+          },
+        },
+      },
+
+      plugins: [tailwindcssVariables()],
+    })
+  ).toMatchInlineSnapshot(`
+    "
+
+      
+      + :root {
+      +   --ONE: red;
+      +   --TWO: black;
+      +   --TWO-FOObar: green;
+      +   --TWO-THREE-FOUR: white;
+      +   --TWO-THREE-five: blue
+      + }
+
+    "
+  `)
+})
diff --git a/examples/color-variable-helper/package.json b/examples/color-variable-helper/package.json
@@ -9,7 +9,7 @@
     "@mertasan/tailwindcss-variables": "latest",
     "autoprefixer": "^10.4.0",
     "postcss": "^8.4.4",
-    "tailwindcss": "^3.0.0"
+    "tailwindcss": "^3.0.11"
   },
   "license": "MIT"
 }
diff --git a/examples/dark-custom-selector/package.json b/examples/dark-custom-selector/package.json
@@ -9,7 +9,7 @@
     "@mertasan/tailwindcss-variables": "latest",
     "autoprefixer": "^10.4.0",
     "postcss": "^8.4.4",
-    "tailwindcss": "^3.0.0"
+    "tailwindcss": "^3.0.11"
   },
   "license": "MIT"
 }
diff --git a/examples/dark-with-class-to-root/package.json b/examples/dark-with-class-to-root/package.json
@@ -9,7 +9,7 @@
     "@mertasan/tailwindcss-variables": "latest",
     "autoprefixer": "^10.4.0",
     "postcss": "^8.4.4",
-    "tailwindcss": "^3.0.0"
+    "tailwindcss": "^3.0.11"
   },
   "license": "MIT"
 }
diff --git a/examples/dark-with-class/package.json b/examples/dark-with-class/package.json
@@ -9,7 +9,7 @@
     "@mertasan/tailwindcss-variables": "latest",
     "autoprefixer": "^10.4.0",
     "postcss": "^8.4.4",
-    "tailwindcss": "^3.0.0"
+    "tailwindcss": "^3.0.11"
   },
   "license": "MIT"
 }
diff --git a/examples/dark-with-media/package.json b/examples/dark-with-media/package.json
@@ -9,7 +9,7 @@
     "@mertasan/tailwindcss-variables": "latest",
     "autoprefixer": "^10.4.0",
     "postcss": "^8.4.4",
-    "tailwindcss": "^3.0.0"
+    "tailwindcss": "^3.0.11"
   },
   "license": "MIT"
 }
diff --git a/examples/prefix/package.json b/examples/prefix/package.json
@@ -9,7 +9,7 @@
     "@mertasan/tailwindcss-variables": "latest",
     "autoprefixer": "^10.4.0",
     "postcss": "^8.4.4",
-    "tailwindcss": "^3.0.0"
+    "tailwindcss": "^3.0.11"
   },
   "license": "MIT"
 }
diff --git a/examples/simple/package.json b/examples/simple/package.json
@@ -9,7 +9,7 @@
     "@mertasan/tailwindcss-variables": "latest",
     "autoprefixer": "^10.4.0",
     "postcss": "^8.4.4",
-    "tailwindcss": "^3.0.0"
+    "tailwindcss": "^3.0.11"
   },
   "license": "MIT"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mertasan/tailwindcss-variables",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Easily create css variables without the need for a css file!",
   "main": "src/index.js",
   "license": "GPL-3.0-or-later",
@@ -48,7 +48,7 @@
     "postcss-import": "^14.1.0",
     "prettier": "^2.5.0",
     "snapshot-diff": "^0.9.0",
-    "tailwindcss": "^3.0.0"
+    "tailwindcss": "^3.0.11"
   },
   "peerDependencies": {
     "autoprefixer": "^10.0.2",
diff --git a/src/utils.js b/src/utils.js
@@ -42,10 +42,10 @@ const formatVariableKey = (key) => {
   if (key === 'DEFAULT') {
     return ''
   }
-  key = key.toLowerCase()
+  key = key.toString()
   return key
     .replace(/_/g, '-')
-    .replace(/[^a-z0-9\-]+/gi, '')
+    .replace(/[^a-zA-Z0-9\-]+/gi, '')
     .replace('---', '--')
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"@mertasan/tailwindcss-variables": "latest",`
`10`	`10`	`"autoprefixer": "^10.4.0",`
`11`	`11`	`"postcss": "^8.4.4",`
`12`		`- "tailwindcss": "^3.0.0"`
	`12`	`+ "tailwindcss": "^3.0.11"`
`13`	`13`	`},`
`14`	`14`	`"license": "MIT"`
`15`	`15`	`}`