Skip to content

Commit 6b9ce5f

Browse files
Merge branch 'main' of github.com:nuxt-modules/google-fonts into update-module-builder
2 parents f5d0cbd + c28f623 commit 6b9ce5f

File tree

20 files changed

+5493
-2088
lines changed

20 files changed

+5493
-2088
lines changed

.eslintignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ jobs:
3838
run: pnpm test
3939

4040
- name: 🟩 Coverage
41-
uses: codecov/codecov-action@v4
41+
uses: codecov/codecov-action@v5
4242
env:
4343
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

docs/app.config.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ export default defineAppConfig({
55
image: '/social-card.png',
66
socials: {
77
twitter: 'nuxt_js',
8-
github: 'nuxt-modules/google-fonts'
8+
github: 'nuxt-modules/google-fonts',
99
},
1010
header: {
11-
logo: true
12-
}
13-
}
11+
logo: true,
12+
},
13+
},
1414
})

docs/components/Logo.vue

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<template>
2-
<svg width="288" height="36" viewBox="0 0 288 36" fill="none" xmlns="http://www.w3.org/2000/svg">
2+
<svg
3+
width="288"
4+
height="36"
5+
viewBox="0 0 288 36"
6+
fill="none"
7+
xmlns="http://www.w3.org/2000/svg"
8+
>
39
<path
410
d="M43.82 28V14.112h3.164l.28 2.352a4.91 4.91 0 011.848-1.96c.821-.485 1.783-.728 2.884-.728 1.717 0 3.052.541 4.004 1.624.952 1.083 1.428 2.67 1.428 4.76V28h-3.584v-7.504c0-1.195-.243-2.11-.728-2.744-.485-.635-1.241-.952-2.268-.952-1.008 0-1.839.355-2.492 1.064-.635.71-.952 1.699-.952 2.968V28H43.82zm22.243.336c-1.736 0-3.08-.541-4.032-1.624-.933-1.083-1.4-2.67-1.4-4.76v-7.84h3.556v7.504c0 1.195.243 2.11.728 2.744.485.635 1.25.952 2.296.952.99 0 1.802-.355 2.436-1.064.653-.71.98-1.699.98-2.968v-7.168h3.584V28h-3.164l-.28-2.352a4.857 4.857 0 01-1.876 1.96c-.803.485-1.745.728-2.828.728zM76.574 28l5.04-6.944-5.04-6.944h3.836l3.528 4.928 3.5-4.928h3.864l-5.068 6.944L91.302 28h-3.864l-3.5-4.928L80.41 28h-3.836zm23.2 0c-1.456 0-2.623-.355-3.5-1.064-.878-.71-1.316-1.97-1.316-3.78v-6.048h-2.38v-2.996h2.38l.42-3.724h3.164v3.724h3.752v2.996h-3.752v6.076c0 .672.14 1.139.42 1.4.298.243.802.364 1.512.364h1.736V28h-2.436zm4.421 3.108l7-24.864h3.5l-7.028 24.864h-3.472z"
511
fill="currentColor"
@@ -8,8 +14,20 @@
814
d="M123.036 23.856a7.494 7.494 0 01-1.876-.224l-1.036 1.036c.317.168.747.308 1.288.42.541.112 1.419.224 2.632.336 1.848.168 3.192.607 4.032 1.316.84.71 1.26 1.69 1.26 2.94a4.36 4.36 0 01-.672 2.324c-.448.747-1.139 1.344-2.072 1.792-.933.467-2.128.7-3.584.7-1.979 0-3.575-.373-4.788-1.12-1.213-.728-1.82-1.83-1.82-3.304 0-1.25.607-2.333 1.82-3.248a6.812 6.812 0 01-.98-.532 5.549 5.549 0 01-.7-.588v-.644l2.436-2.576c-1.083-.952-1.624-2.175-1.624-3.668 0-.933.224-1.783.672-2.548.467-.765 1.12-1.372 1.96-1.82.84-.448 1.857-.672 3.052-.672.784 0 1.512.112 2.184.336h5.264v2.184l-2.38.168c.373.71.56 1.493.56 2.352a4.95 4.95 0 01-.672 2.548c-.448.765-1.101 1.372-1.96 1.82-.84.448-1.839.672-2.996.672zm0-2.744c.728 0 1.325-.196 1.792-.588.485-.392.728-.952.728-1.68s-.243-1.288-.728-1.68c-.467-.392-1.064-.588-1.792-.588-.765 0-1.381.196-1.848.588-.467.392-.7.952-.7 1.68s.233 1.288.7 1.68c.467.392 1.083.588 1.848.588zm-3.36 8.596c0 .69.317 1.204.952 1.54.653.355 1.447.532 2.38.532.896 0 1.624-.187 2.184-.56.56-.355.84-.84.84-1.456 0-.504-.187-.924-.56-1.26-.355-.336-1.073-.541-2.156-.616a22.236 22.236 0 01-2.128-.252c-.541.299-.933.625-1.176.98a2.021 2.021 0 00-.336 1.092zm19.538-1.372c-1.344 0-2.557-.308-3.64-.924a6.952 6.952 0 01-2.548-2.548c-.616-1.101-.924-2.37-.924-3.808 0-1.437.318-2.697.952-3.78a6.892 6.892 0 012.548-2.576c1.083-.616 2.296-.924 3.64-.924 1.326 0 2.52.308 3.584.924a6.626 6.626 0 012.548 2.576c.635 1.083.952 2.343.952 3.78 0 1.437-.317 2.707-.952 3.808a6.68 6.68 0 01-2.548 2.548c-1.082.616-2.286.924-3.612.924zm0-3.108c.934 0 1.746-.345 2.436-1.036.691-.71 1.036-1.755 1.036-3.136 0-1.381-.345-2.417-1.036-3.108-.69-.71-1.493-1.064-2.408-1.064-.952 0-1.773.355-2.464 1.064-.672.69-1.008 1.727-1.008 3.108s.336 2.427 1.008 3.136c.691.69 1.503 1.036 2.436 1.036zm16.981 3.108c-1.344 0-2.557-.308-3.64-.924a6.952 6.952 0 01-2.548-2.548c-.616-1.101-.924-2.37-.924-3.808 0-1.437.317-2.697.952-3.78a6.892 6.892 0 012.548-2.576c1.083-.616 2.296-.924 3.64-.924 1.325 0 2.52.308 3.584.924a6.626 6.626 0 012.548 2.576c.635 1.083.952 2.343.952 3.78 0 1.437-.317 2.707-.952 3.808a6.68 6.68 0 01-2.548 2.548c-1.083.616-2.287.924-3.612.924zm0-3.108c.933 0 1.745-.345 2.436-1.036.691-.71 1.036-1.755 1.036-3.136 0-1.381-.345-2.417-1.036-3.108-.691-.71-1.493-1.064-2.408-1.064-.952 0-1.773.355-2.464 1.064-.672.69-1.008 1.727-1.008 3.108s.336 2.427 1.008 3.136c.691.69 1.503 1.036 2.436 1.036zm15.321-1.372a7.494 7.494 0 01-1.876-.224l-1.036 1.036c.318.168.747.308 1.288.42.542.112 1.419.224 2.632.336 1.848.168 3.192.607 4.032 1.316.84.71 1.26 1.69 1.26 2.94a4.36 4.36 0 01-.672 2.324c-.448.747-1.138 1.344-2.072 1.792-.933.467-2.128.7-3.584.7-1.978 0-3.574-.373-4.788-1.12-1.213-.728-1.82-1.83-1.82-3.304 0-1.25.607-2.333 1.82-3.248a6.812 6.812 0 01-.98-.532 5.62 5.62 0 01-.7-.588v-.644l2.436-2.576c-1.082-.952-1.624-2.175-1.624-3.668 0-.933.224-1.783.672-2.548.467-.765 1.12-1.372 1.96-1.82.84-.448 1.858-.672 3.052-.672.784 0 1.512.112 2.184.336h5.264v2.184l-2.38.168c.374.71.56 1.493.56 2.352a4.95 4.95 0 01-.672 2.548c-.448.765-1.101 1.372-1.96 1.82-.84.448-1.838.672-2.996.672zm0-2.744c.728 0 1.326-.196 1.792-.588.486-.392.728-.952.728-1.68s-.242-1.288-.728-1.68c-.466-.392-1.064-.588-1.792-.588-.765 0-1.381.196-1.848.588-.466.392-.7.952-.7 1.68s.234 1.288.7 1.68c.467.392 1.083.588 1.848.588zm-3.36 8.596c0 .69.318 1.204.952 1.54.654.355 1.447.532 2.38.532.896 0 1.624-.187 2.184-.56.56-.355.84-.84.84-1.456 0-.504-.186-.924-.56-1.26-.354-.336-1.073-.541-2.156-.616a22.275 22.275 0 01-2.128-.252c-.541.299-.933.625-1.176.98a2.021 2.021 0 00-.336 1.092zM181.578 28V7.84h3.584V28h-3.584zm13.994.336c-1.4 0-2.641-.299-3.724-.896a6.482 6.482 0 01-2.548-2.52c-.616-1.083-.924-2.333-.924-3.752 0-1.437.299-2.716.896-3.836.616-1.12 1.456-1.988 2.52-2.604 1.083-.635 2.352-.952 3.808-.952 1.363 0 2.567.299 3.612.896a6.312 6.312 0 012.436 2.464c.597 1.027.896 2.175.896 3.444 0 .205-.009.42-.028.644 0 .224-.009.457-.028.7h-10.556c.075 1.083.448 1.932 1.12 2.548.691.616 1.521.924 2.492.924.728 0 1.335-.159 1.82-.476a3.1 3.1 0 001.12-1.288h3.64c-.261.877-.7 1.68-1.316 2.408a6.325 6.325 0 01-2.24 1.68c-.877.41-1.876.616-2.996.616zm.028-11.648c-.877 0-1.652.252-2.324.756-.672.485-1.101 1.232-1.288 2.24h6.916c-.056-.915-.392-1.643-1.008-2.184-.616-.541-1.381-.812-2.296-.812zm9.65 4.704v-2.996h11.732v2.996H205.25zM220.968 28V17.108h-1.904v-2.996h1.904v-1.624c0-1.68.42-2.875 1.26-3.584.859-.71 2.016-1.064 3.472-1.064h1.54v3.052h-.98c-.616 0-1.055.121-1.316.364-.261.243-.392.653-.392 1.232v1.624h2.996v2.996h-2.996V28h-3.584zm15.536.336c-1.344 0-2.558-.308-3.64-.924a6.945 6.945 0 01-2.548-2.548c-.616-1.101-.924-2.37-.924-3.808 0-1.437.317-2.697.952-3.78a6.884 6.884 0 012.548-2.576c1.082-.616 2.296-.924 3.64-.924 1.325 0 2.52.308 3.584.924a6.632 6.632 0 012.548 2.576c.634 1.083.952 2.343.952 3.78 0 1.437-.318 2.707-.952 3.808a6.686 6.686 0 01-2.548 2.548c-1.083.616-2.287.924-3.612.924zm0-3.108c.933 0 1.745-.345 2.436-1.036.69-.71 1.036-1.755 1.036-3.136 0-1.381-.346-2.417-1.036-3.108-.691-.71-1.494-1.064-2.408-1.064-.952 0-1.774.355-2.464 1.064-.672.69-1.008 1.727-1.008 3.108s.336 2.427 1.008 3.136c.69.69 1.502 1.036 2.436 1.036zM246.82 28V14.112h3.164l.28 2.352a4.907 4.907 0 011.848-1.96c.821-.485 1.783-.728 2.884-.728 1.717 0 3.052.541 4.004 1.624.952 1.083 1.428 2.67 1.428 4.76V28h-3.584v-7.504c0-1.195-.243-2.11-.728-2.744-.485-.635-1.241-.952-2.268-.952-1.008 0-1.839.355-2.492 1.064-.635.71-.952 1.699-.952 2.968V28h-3.584zm23.223 0c-1.456 0-2.623-.355-3.5-1.064-.877-.71-1.316-1.97-1.316-3.78v-6.048h-2.38v-2.996h2.38l.42-3.724h3.164v3.724h3.752v2.996h-3.752v6.076c0 .672.14 1.139.42 1.4.299.243.803.364 1.512.364h1.736V28h-2.436zm11.337.336c-1.232 0-2.314-.196-3.248-.588-.933-.41-1.68-.97-2.24-1.68a4.823 4.823 0 01-1.008-2.464h3.612c.112.541.411 1.008.896 1.4.504.373 1.148.56 1.932.56s1.354-.159 1.708-.476c.374-.317.56-.681.56-1.092 0-.597-.261-.999-.784-1.204-.522-.224-1.25-.439-2.184-.644a23.9 23.9 0 01-1.82-.476 9.359 9.359 0 01-1.708-.7 3.965 3.965 0 01-1.232-1.12c-.317-.467-.476-1.036-.476-1.708 0-1.232.486-2.268 1.456-3.108.99-.84 2.371-1.26 4.144-1.26 1.643 0 2.95.383 3.92 1.148.99.765 1.578 1.82 1.764 3.164h-3.388c-.205-1.027-.98-1.54-2.324-1.54-.672 0-1.194.13-1.568.392-.354.261-.532.588-.532.98 0 .41.271.737.812.98.542.243 1.26.467 2.156.672.971.224 1.858.476 2.66.756.822.261 1.475.663 1.96 1.204.486.523.728 1.279.728 2.268a3.895 3.895 0 01-.672 2.324c-.466.69-1.138 1.232-2.016 1.624-.877.392-1.913.588-3.108.588z"
915
fill="#1A73E8"
1016
/>
11-
<rect y="2" width="32" height="32" rx="3.84" fill="#1A73E8" />
12-
<path d="M11.467 10.267h2.115v15.466h-2.115V10.267z" fill="#fff" />
13-
<path d="M11.467 12.238v-1.971h9.066v1.97h-9.066zM13.582 19.213v-1.971h6.196v1.971h-6.196z" fill="#fff" />
17+
<rect
18+
y="2"
19+
width="32"
20+
height="32"
21+
rx="3.84"
22+
fill="#1A73E8"
23+
/>
24+
<path
25+
d="M11.467 10.267h2.115v15.466h-2.115V10.267z"
26+
fill="#fff"
27+
/>
28+
<path
29+
d="M11.467 12.238v-1.971h9.066v1.97h-9.066zM13.582 19.213v-1.971h6.196v1.971h-6.196z"
30+
fill="#fff"
31+
/>
1432
</svg>
1533
</template>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export default defineNuxtConfig({
22
extends: '@nuxt-themes/docus',
3-
modules: ['@nuxtjs/plausible']
3+
modules: ['@nuxtjs/plausible'],
44
})

docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"preview": "nuxi preview"
88
},
99
"devDependencies": {
10-
"@nuxt-themes/docus": "^1.15.0",
10+
"@nuxt-themes/docus": "^1.15.1",
1111
"@nuxtjs/plausible": "^0.2.4",
12-
"nuxt": "3.11.1"
12+
"nuxt": "3.16.1"
1313
}
1414
}

docs/tokens.config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default defineTheme({
1212
600: '#1b73e8',
1313
700: '#1f64d6',
1414
800: '#1f52ae',
15-
900: '#1f4689'
16-
}
17-
}
15+
900: '#1f4689',
16+
},
17+
},
1818
})

eslint.config.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// @ts-check
2+
import { createConfigForNuxt } from '@nuxt/eslint-config/flat'
3+
4+
export default createConfigForNuxt({
5+
features: {
6+
tooling: true,
7+
stylistic: true,
8+
},
9+
dirs: {
10+
src: [
11+
'./playground',
12+
'./docs',
13+
],
14+
},
15+
}).append({
16+
files: ['docs/**'],
17+
rules: {
18+
'vue/multi-word-component-names': 'off',
19+
},
20+
})

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,29 @@
2525
"dev": "nuxi dev playground",
2626
"dev:build": "nuxi build playground",
2727
"dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
28-
"lint": "eslint --ext .js,.ts,.vue",
28+
"lint": "eslint",
2929
"prepack": "pnpm build",
3030
"release": "pnpm test && pnpm prepack && pnpm changelogen --release --push && pnpm publish",
3131
"test": "pnpm lint && vitest run --coverage"
3232
},
3333
"dependencies": {
34-
"@nuxt/kit": "^3.11.1",
35-
"google-fonts-helper": "^3.5.0",
34+
"@nuxt/kit": "^3.16.1",
35+
"google-fonts-helper": "^3.7.3",
3636
"pathe": "^1.1.2"
3737
},
3838
"devDependencies": {
3939
"@nuxt/module-builder": "0.8.3",
4040
"@nuxt/test-utils": "latest",
41-
"@nuxtjs/eslint-config-typescript": "latest",
4241
"@vitest/coverage-v8": "latest",
4342
"changelogen": "latest",
4443
"del": "latest",
45-
"eslint": "latest",
44+
"eslint": "9.1.1",
4645
"nuxt": "latest",
47-
"vitest": "latest"
46+
"vitest": "latest",
47+
"@nuxt/eslint-config": "0.3.9"
4848
},
4949
"publishConfig": {
5050
"access": "public"
5151
},
52-
"packageManager": "pnpm@9.1.1"
52+
"packageManager": "pnpm@10.6.5"
5353
}

0 commit comments

Comments
 (0)