Skip to content

Commit d5734ba

Browse files
authored
Merge pull request #18 from semencov/dev
Update support for Tailwind v3.0
2 parents d4fcdfa + 0c98551 commit d5734ba

File tree

5 files changed

+86
-39
lines changed

5 files changed

+86
-39
lines changed

.github/workflows/release.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ on:
44
workflow_dispatch:
55
inputs:
66
bump:
7-
description: 'bump type, major or minor or patch or empty string'
8-
default: ''
7+
description: "bump type, major or minor or patch or empty string"
8+
default: ""
99
required: false
1010
dry_run:
11-
description: 'dry run, true or false'
12-
default: 'false'
11+
description: "dry run, true or false"
12+
default: "false"
1313
required: true
1414
draft:
15-
description: 'draft, true or false'
16-
default: 'false'
15+
description: "draft, true or false"
16+
default: "false"
1717
required: true
1818
pre_release:
19-
description: 'pre release, true or false'
20-
default: 'false'
19+
description: "pre release, true or false"
20+
default: "false"
2121
required: true
2222

2323
jobs:
@@ -75,14 +75,14 @@ jobs:
7575

7676
- uses: MeilCli/bump-release-action@v1
7777
with:
78-
config_path: '.github/bump.yml'
78+
config_path: ".github/bump.yml"
7979
bump: ${{ github.event.inputs.bump }}
8080
dry_run: ${{ github.event.inputs.dry_run }}
8181
draft: ${{ github.event.inputs.draft }}
8282
pre_release: ${{ github.event.inputs.pre_release }}
8383

84-
- name: 'Publish to NPM'
84+
- name: "Publish to NPM"
8585
if: github.event.inputs.dry_run != 'true'
86-
run: npm publish --access public
87-
env:
88-
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
86+
uses: JS-DevTools/npm-publish@v1
87+
with:
88+
token: ${{ secrets.NPM_AUTH_TOKEN }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The plugin is inspired with [tailwind-plugin-inter-font](https://github.com/imsu
1414
npm install --save-dev tailwindcss-font-inter
1515

1616
# or with yarn
17-
yarn add --dev tailwindcss-font-inter
17+
yarn add -D tailwindcss-font-inter
1818
```
1919

2020
## Usage

inter.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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"}}}}
1+
{"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

Lines changed: 65 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"postcss": "^8.2.13",
4949
"prettier": "^1.18.2",
5050
"rimraf": "^3.0.2",
51-
"tailwindcss": "^2.1.1"
51+
"tailwindcss": "^3.0.2"
5252
},
5353
"dependencies": {
5454
"parse-unit": "^1.0.1"
@@ -60,31 +60,72 @@
6060
"env": {
6161
"jest": true
6262
},
63-
"parserOptions": {
64-
"ecmaVersion": 2018,
65-
"sourceType": "module"
63+
"repository": {
64+
"type": "git",
65+
"url": "https://github.com/semencov/tailwindcss-font-inter.git"
6666
},
67-
"extends": [
68-
"eslint-config-postcss",
69-
"prettier"
67+
"keywords": [
68+
"tailwindcss",
69+
"tailwindcss-plugin",
70+
"tailwind-plugin",
71+
"inter ui",
72+
"inter",
73+
"font",
74+
"font-feature-settings"
7075
],
71-
"plugins": [
72-
"prettier"
73-
],
74-
"rules": {
75-
"prettier/prettier": [
76-
"error",
77-
{
78-
"semi": false,
79-
"singleQuote": true,
80-
"printWidth": 100,
81-
"tabWidth": 2,
82-
"useTabs": false,
83-
"trailingComma": "es5",
84-
"bracketSpacing": true,
85-
"parser": "flow"
76+
"bugs": {
77+
"email": "hello@smcv.dev",
78+
"url": "https://github.com/semencov/tailwindcss-font-inter/issues"
79+
},
80+
"homepage": "https://github.com/semencov/tailwindcss-font-inter",
81+
"peerDependencies": {
82+
"tailwindcss": "^2.0.0 || ^3.0.0"
83+
},
84+
"devDependencies": {
85+
"cssjson": "^2.1.3",
86+
"eslint": "^6.0.1",
87+
"eslint-config-postcss": "^2.0.2",
88+
"eslint-config-prettier": "^6.0.0",
89+
"eslint-plugin-prettier": "^3.0.1",
90+
"fontkit": "^1.8.1",
91+
"jest": "^26.6.3",
92+
"mkdirp": "^1.0.4",
93+
"node-fetch": "^2.6.1",
94+
"postcss": "^8.2.13",
95+
"prettier": "^1.18.2",
96+
"rimraf": "^3.0.2",
97+
"tailwindcss": "^3.0.2"
98+
},
99+
"dependencies": {
100+
"parse-unit": "^1.0.1"
101+
},
102+
"engines": {
103+
"node": ">=12.0.0"
104+
},
105+
"eslintConfig": {
106+
"env": {
107+
"jest": true
108+
},
109+
"parserOptions": {
110+
"ecmaVersion": 2018,
111+
"sourceType": "module"
112+
},
113+
"extends": ["eslint-config-postcss", "prettier"],
114+
"plugins": ["prettier"],
115+
"rules": {
116+
"prettier/prettier": [
117+
"error",
118+
{
119+
"semi": false,
120+
"singleQuote": true,
121+
"printWidth": 100,
122+
"tabWidth": 2,
123+
"useTabs": false,
124+
"trailingComma": "es5",
125+
"bracketSpacing": true,
126+
"parser": "flow"
127+
}
128+
]
86129
}
87-
]
88130
}
89-
}
90131
}

test.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ expect.extend({
5454
function generateCss(type, overrides) {
5555
const config = {
5656
theme: { fontSize, letterSpacing },
57+
safelist: [
58+
'font-inter',
59+
{
60+
pattern: /font-feature-(normal|default|numeric|case)/,
61+
},
62+
],
5763
corePlugins: false,
5864
plugins: [plugin],
5965
}

0 commit comments

Comments
 (0)