Skip to content

Commit bbdadf5

Browse files
benjamincanacbenjamincanac
authored
Merge branch 'dev' into v4-compatibility
2 parents 8386b98 + c5e1cc5 commit bbdadf5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+12289
-16039
lines changed

‎.eslintignore‎

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

‎.eslintrc.cjs‎

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

‎.github/workflows/ci-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
4040
41-
- uses: actions/cache@v3
41+
- uses: actions/cache@v4
4242
name: Setup pnpm cache
4343
with:
4444
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
4040
41-
- uses: actions/cache@v3
41+
- uses: actions/cache@v4
4242
name: Setup pnpm cache
4343
with:
4444
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}

‎.husky/pre-commit‎

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

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [1.12.0](https://github.com/nuxt-modules/strapi/compare/v1.11.0...v1.12.0) (2024-04-02)
6+
7+
8+
### Bug Fixes
9+
10+
* export runtime types ([#403](https://github.com/nuxt-modules/strapi/issues/403)) ([d0f8416](https://github.com/nuxt-modules/strapi/commit/d0f8416196d4a6448899d740ec758456a2cb58b0))
11+
* **module:** import `CookieOptions` from `nuxt/app` ([95a521c](https://github.com/nuxt-modules/strapi/commit/95a521c87d7468b0481d4b5668be583323c98e52))
12+
* **module:** update compatibility to `^3.7.0` ([caec416](https://github.com/nuxt-modules/strapi/commit/caec4160b33fa158e21bc4c2e130f4fd78c37447))
13+
* opt in to `import.meta.*` properties ([#401](https://github.com/nuxt-modules/strapi/issues/401)) ([53bb585](https://github.com/nuxt-modules/strapi/commit/53bb5855c812c167a2007977c78a48c714b54d12))
14+
515
## [1.11.0](https://github.com/nuxt-modules/strapi/compare/v1.10.1...v1.11.0) (2024-01-13)
616

717

‎docs/app.config.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@ export default defineAppConfig({
1313
search: true,
1414
colorMode: true,
1515
links: [{
16-
icon: 'i-simple-icons-github',
17-
to: 'https://github.com/nuxt-modules/strapi',
18-
target: '_blank',
16+
'icon': 'i-simple-icons-github',
17+
'to': 'https://github.com/nuxt-modules/strapi',
18+
'target': '_blank',
1919
'aria-label': '@nuxtjs/strapi on GitHub'
2020
}]
2121
},
2222
footer: {
2323
colorMode: false,
2424
links: [{
25-
icon: 'i-simple-icons-discord',
26-
to: 'https://discord.com/invite/ps2h6QT',
27-
target: '_blank',
25+
'icon': 'i-simple-icons-discord',
26+
'to': 'https://discord.com/invite/ps2h6QT',
27+
'target': '_blank',
2828
'aria-label': 'Nuxt UI on Discord'
2929
}, {
30-
icon: 'i-simple-icons-x',
31-
to: 'https://x.com/nuxt_js',
32-
target: '_blank',
30+
'icon': 'i-simple-icons-x',
31+
'to': 'https://x.com/nuxt_js',
32+
'target': '_blank',
3333
'aria-label': 'Nuxt on X'
3434
}, {
35-
icon: 'i-simple-icons-github',
36-
to: 'https://github.com/nuxt-modules/strapi',
37-
target: '_blank',
35+
'icon': 'i-simple-icons-github',
36+
'to': 'https://github.com/nuxt-modules/strapi',
37+
'target': '_blank',
3838
'aria-label': '@nuxtjs/strapi on GitHub'
3939
}]
4040
},
@@ -47,17 +47,17 @@ export default defineAppConfig({
4747
icon: 'i-heroicons-star',
4848
label: 'Star on GitHub',
4949
to: 'https://github.com/nuxt-modules/strapi',
50-
target: '_blank',
50+
target: '_blank'
5151
}, {
5252
icon: 'i-simple-icons-nuxtdotjs',
5353
label: 'Nuxt docs',
5454
to: 'https://nuxt.com/docs/getting-started/introduction',
55-
target: '_blank',
55+
target: '_blank'
5656
}, {
5757
icon: 'i-simple-icons-strapi',
5858
label: 'Strapi docs',
5959
to: 'https://docs.strapi.io/dev-docs/intro',
60-
target: '_blank',
60+
target: '_blank'
6161
}]
6262
}
6363
}

‎docs/app.vue‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,21 @@ provide('navigation', navigation)
2929

3030
<template>
3131
<div>
32-
<Header />
32+
<TheHeader />
3333

3434
<UMain>
3535
<NuxtLayout>
3636
<NuxtPage />
3737
</NuxtLayout>
3838
</UMain>
3939

40-
<Footer />
40+
<TheFooter />
4141

4242
<ClientOnly>
43-
<LazyUDocsSearch :files="files" :navigation="navigation" />
43+
<LazyUContentSearch
44+
:files="files"
45+
:navigation="navigation"
46+
/>
4447
</ClientOnly>
4548

4649
<UNotifications />

docs/components/Footer.vue renamed to docs/components/TheFooter.vue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@ const { footer } = useAppConfig()
66
<UFooter>
77
<template #left>
88
<span class="text-sm text-gray-500 dark:text-gray-400">
9-
Made with <NuxtLink to="https://ui.nuxt.com/pro" target="_blank" class="text-primary font-semibold relative group hover:underline hover:underline-offset-4">
9+
Made with <NuxtLink
10+
to="https://ui.nuxt.com/pro"
11+
target="_blank"
12+
class="text-primary font-semibold relative group hover:underline hover:underline-offset-4"
13+
>
1014
Nuxt UI Pro
1115

12-
<UIcon name="i-heroicons-arrow-up-right-20-solid" class="w-3 h-3 absolute top-0 -right-3.5 text-gray-400 dark:text-gray-500 group-hover:text-gray-500 dark:group-hover:text-gray-400" />
16+
<UIcon
17+
name="i-heroicons-arrow-up-right-20-solid"
18+
class="w-3 h-3 absolute top-0 -right-3.5 text-gray-400 dark:text-gray-500 group-hover:text-gray-500 dark:group-hover:text-gray-400"
19+
/>
1320
</NuxtLink>
1421
</span>
1522
</template>

docs/components/Header.vue renamed to docs/components/TheHeader.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,19 @@ const { header } = useAppConfig()
1212
<Logo class="h-7 w-auto text-primary" />
1313
</template>
1414

15-
<template v-if="header?.search" #center>
16-
<UDocsSearchButton class="hidden lg:flex" />
15+
<template
16+
v-if="header?.search"
17+
#center
18+
>
19+
<UContentSearchButton class="hidden lg:flex" />
1720
</template>
1821

1922
<template #right>
20-
<UDocsSearchButton v-if="header?.search" :label="null" class="lg:hidden" />
23+
<UContentSearchButton
24+
v-if="header?.search"
25+
:label="null"
26+
class="lg:hidden"
27+
/>
2128

2229
<UColorModeButton v-if="header?.colorMode" />
2330

0 commit comments

Comments
 (0)