Merge pull request #18 from semencov/dev

Update support for Tailwind v3.0

Author: semencov

.github/workflows/release.yml

@@ -4,20 +4,20 @@ on:
   workflow_dispatch:
     inputs:
       bump:
-        description: 'bump type, major or minor or patch or empty string'
-        default: ''
+        description: "bump type, major or minor or patch or empty string"
+        default: ""
         required: false
       dry_run:
-        description: 'dry run, true or false'
-        default: 'false'
+        description: "dry run, true or false"
+        default: "false"
         required: true
       draft:
-        description: 'draft, true or false'
-        default: 'false'
+        description: "draft, true or false"
+        default: "false"
         required: true
       pre_release:
-        description: 'pre release, true or false'
-        default: 'false'
+        description: "pre release, true or false"
+        default: "false"
         required: true
 
 jobs:
@@ -75,14 +75,14 @@ jobs:
 
       - uses: MeilCli/bump-release-action@v1
         with:
-          config_path: '.github/bump.yml'
+          config_path: ".github/bump.yml"
           bump: ${{ github.event.inputs.bump }}
           dry_run: ${{ github.event.inputs.dry_run }}
           draft: ${{ github.event.inputs.draft }}
           pre_release: ${{ github.event.inputs.pre_release }}
 
-      - name: 'Publish to NPM'
+      - name: "Publish to NPM"
         if: github.event.inputs.dry_run != 'true'
-        run: npm publish --access public
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ secrets.NPM_AUTH_TOKEN }}

README.md

@@ -14,7 +14,7 @@ The plugin is inspired with [tailwind-plugin-inter-font](https://github.com/imsu
 npm install --save-dev tailwindcss-font-inter
 
 # or with yarn
-yarn add --dev tailwindcss-font-inter
+yarn add -D tailwindcss-font-inter
 ```
 
 ## Usage

inter.json

@@ -1 +1 @@
-{"version":"3.018;git-588b23468","availableFeatures":["aalt","calt","case","ccmp","cpsp","cv01","cv02","cv03","cv04","cv05","cv06","cv07","cv08","cv09","cv10","cv11","dlig","dnom","frac","kern","mark","numr","ordn","pnum","salt","sinf","ss01","ss02","ss03","ss04","subs","sups","tnum","zero"],"base":{"@font-face":[{"font-family":"'Inter'","font-style":"normal","font-weight":"100","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Thin.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Thin.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"100","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ThinItalic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ThinItalic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"200","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ExtraLight.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ExtraLight.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"200","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ExtraLightItalic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ExtraLightItalic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"300","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Light.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Light.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"300","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-LightItalic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-LightItalic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"400","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Regular.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Regular.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"400","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Italic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Italic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"500","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Medium.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Medium.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"500","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-MediumItalic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-MediumItalic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"600","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-SemiBold.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-SemiBold.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"600","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-SemiBoldItalic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-SemiBoldItalic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"700","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Bold.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Bold.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"700","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-BoldItalic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-BoldItalic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"800","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ExtraBold.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ExtraBold.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"800","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ExtraBoldItalic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ExtraBoldItalic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"900","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Black.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Black.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"900","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-BlackItalic.woff2?v=3.18\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-BlackItalic.woff?v=3.18\") format(\"woff\")"},{"font-family":"'Inter var'","font-style":"normal","font-weight":"100 900","font-display":"swap","src":"url('https://rsms.me/inter/font-files/Inter-roman.var.woff2?v=3.18') format('woff2')","font-named-instance":"'Regular'"},{"font-family":"'Inter var'","font-style":"italic","font-weight":"100 900","font-display":"swap","src":"url('https://rsms.me/inter/font-files/Inter-italic.var.woff2?v=3.18') format('woff2')","font-named-instance":"'Italic'"}]},"utilities":{".font-inter":{"font-family":"'Inter', system-ui, sans-serif"},"@supports(font-variation-settings: normal)":{".font-inter":{"font-family":"'Inter var', system-ui, sans-serif"}}}}
+{"version":"3.019;git-0a5106e0b","availableFeatures":["aalt","calt","case","ccmp","cpsp","cv01","cv02","cv03","cv04","cv05","cv06","cv07","cv08","cv09","cv10","cv11","dlig","dnom","frac","kern","mark","numr","ordn","pnum","salt","sinf","ss01","ss02","ss03","ss04","subs","sups","tnum","zero"],"base":{"@font-face":[{"font-family":"'Inter'","font-style":"normal","font-weight":"100","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Thin.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Thin.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"100","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ThinItalic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ThinItalic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"200","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ExtraLight.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ExtraLight.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"200","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ExtraLightItalic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ExtraLightItalic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"300","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Light.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Light.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"300","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-LightItalic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-LightItalic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"400","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Regular.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Regular.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"400","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Italic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Italic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"500","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Medium.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Medium.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"500","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-MediumItalic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-MediumItalic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"600","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-SemiBold.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-SemiBold.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"600","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-SemiBoldItalic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-SemiBoldItalic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"700","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Bold.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Bold.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"700","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-BoldItalic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-BoldItalic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"800","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ExtraBold.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ExtraBold.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"800","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-ExtraBoldItalic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-ExtraBoldItalic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"normal","font-weight":"900","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-Black.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-Black.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter'","font-style":"italic","font-weight":"900","font-display":"swap","src":"url(\"https://rsms.me/inter/font-files/Inter-BlackItalic.woff2?v=3.19\") format(\"woff2\"), url(\"https://rsms.me/inter/font-files/Inter-BlackItalic.woff?v=3.19\") format(\"woff\")"},{"font-family":"'Inter var'","font-style":"normal","font-weight":"100 900","font-display":"swap","src":"url('https://rsms.me/inter/font-files/Inter-roman.var.woff2?v=3.19') format('woff2')","font-named-instance":"'Regular'"},{"font-family":"'Inter var'","font-style":"italic","font-weight":"100 900","font-display":"swap","src":"url('https://rsms.me/inter/font-files/Inter-italic.var.woff2?v=3.19') format('woff2')","font-named-instance":"'Italic'"}]},"utilities":{".font-inter":{"font-family":"'Inter', system-ui, sans-serif"},"@supports(font-variation-settings: normal)":{".font-inter":{"font-family":"'Inter var', system-ui, sans-serif"}}}}

package.json

@@ -48,7 +48,7 @@
     "postcss": "^8.2.13",
     "prettier": "^1.18.2",
     "rimraf": "^3.0.2",
-    "tailwindcss": "^2.1.1"
+    "tailwindcss": "^3.0.2"
   },
   "dependencies": {
     "parse-unit": "^1.0.1"
@@ -60,31 +60,72 @@
     "env": {
       "jest": true
     },
-    "parserOptions": {
-      "ecmaVersion": 2018,
-      "sourceType": "module"
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/semencov/tailwindcss-font-inter.git"
     },
-    "extends": [
-      "eslint-config-postcss",
-      "prettier"
+    "keywords": [
+        "tailwindcss",
+        "tailwindcss-plugin",
+        "tailwind-plugin",
+        "inter ui",
+        "inter",
+        "font",
+        "font-feature-settings"
     ],
-    "plugins": [
-      "prettier"
-    ],
-    "rules": {
-      "prettier/prettier": [
-        "error",
-        {
-          "semi": false,
-          "singleQuote": true,
-          "printWidth": 100,
-          "tabWidth": 2,
-          "useTabs": false,
-          "trailingComma": "es5",
-          "bracketSpacing": true,
-          "parser": "flow"
+    "bugs": {
+        "email": "hello@smcv.dev",
+        "url": "https://github.com/semencov/tailwindcss-font-inter/issues"
+    },
+    "homepage": "https://github.com/semencov/tailwindcss-font-inter",
+    "peerDependencies": {
+        "tailwindcss": "^2.0.0 || ^3.0.0"
+    },
+    "devDependencies": {
+        "cssjson": "^2.1.3",
+        "eslint": "^6.0.1",
+        "eslint-config-postcss": "^2.0.2",
+        "eslint-config-prettier": "^6.0.0",
+        "eslint-plugin-prettier": "^3.0.1",
+        "fontkit": "^1.8.1",
+        "jest": "^26.6.3",
+        "mkdirp": "^1.0.4",
+        "node-fetch": "^2.6.1",
+        "postcss": "^8.2.13",
+        "prettier": "^1.18.2",
+        "rimraf": "^3.0.2",
+        "tailwindcss": "^3.0.2"
+    },
+    "dependencies": {
+        "parse-unit": "^1.0.1"
+    },
+    "engines": {
+        "node": ">=12.0.0"
+    },
+    "eslintConfig": {
+        "env": {
+            "jest": true
+        },
+        "parserOptions": {
+            "ecmaVersion": 2018,
+            "sourceType": "module"
+        },
+        "extends": ["eslint-config-postcss", "prettier"],
+        "plugins": ["prettier"],
+        "rules": {
+            "prettier/prettier": [
+                "error",
+                {
+                    "semi": false,
+                    "singleQuote": true,
+                    "printWidth": 100,
+                    "tabWidth": 2,
+                    "useTabs": false,
+                    "trailingComma": "es5",
+                    "bracketSpacing": true,
+                    "parser": "flow"
+                }
+            ]
         }
-      ]
     }
-  }
 }

test.js

@@ -54,6 +54,12 @@ expect.extend({
 function generateCss(type, overrides) {
   const config = {
     theme: { fontSize, letterSpacing },
+    safelist: [
+      'font-inter',
+      {
+        pattern: /font-feature-(normal|default|numeric|case)/,
+      },
+    ],
     corePlugins: false,
     plugins: [plugin],
   }