Skip to content

Commit dd00d38

Browse files
Update dependencies and fix module build (#135)
* - Upgraded `@nuxtjs/seo` to version 3.0.1 and `nuxt` to version 3.16.1. * fix module loading * update other deps
1 parent cd48f50 commit dd00d38

File tree

6 files changed

+4215
-3324
lines changed

6 files changed

+4215
-3324
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ dist
1212
.netlify
1313
.directus/data
1414
.directus/uploads
15+
directus

modules/directus/index.ts

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default defineNuxtModule({
2626

2727
defaults: {
2828
rest: {
29-
baseUrl: 'http://localhost:8055',
29+
baseUrl: '',
3030
nuxtBaseUrl: 'http://localhost:3000',
3131
},
3232
auth: {
@@ -47,7 +47,7 @@ export default defineNuxtModule({
4747
log.start('Loading Directus Module');
4848

4949
if (!moduleOptions.rest.baseUrl) {
50-
log.warn(`Please make sure to set Directus baseUrl`);
50+
log.warn('Please make sure to set Directus baseUrl');
5151
}
5252

5353
// ** Runtime Logic **
@@ -133,13 +133,13 @@ export default defineNuxtModule({
133133
// Utils
134134
];
135135

136-
commands.forEach((name) => {
136+
for (const name of commands) {
137137
addImports({
138138
name,
139139
as: name,
140140
from: '@directus/sdk',
141141
});
142-
});
142+
}
143143

144144
// Transpile the runtime directory
145145
nuxt.options.build.transpile.push(runtimeDir);
@@ -158,35 +158,37 @@ export default defineNuxtModule({
158158
addImportsDir(composables);
159159

160160
// ** Build Logic **
161-
const directus = createDirectus<Schema>(joinURL(nuxt.options.runtimeConfig.public.siteUrl, '/api/proxy')).with(
161+
const directus = createDirectus<Schema>(joinURL(nuxt.options.runtimeConfig.public.directus.rest.baseUrl)).with(
162162
rest(),
163163
);
164164

165165
// Handle Redirects
166166
try {
167167
const redirects = await directus.request(readItems('redirects'));
168168

169-
for (const redirect of redirects) {
170-
let responseCode = redirect.response_code ? parseInt(redirect.response_code as any) : 301;
171-
172-
if (responseCode !== 301 && responseCode !== 302) {
173-
responseCode = 301;
169+
if (redirects.length > 0) {
170+
for (const redirect of redirects) {
171+
let responseCode = redirect.response_code ? parseInt(redirect.response_code as any) : 301;
172+
173+
if (responseCode !== 301 && responseCode !== 302) {
174+
responseCode = 301;
175+
}
176+
177+
// Add the redirect to the route rules
178+
// https://nuxt.com/docs/guide/concepts/rendering#route-rules
179+
extendRouteRules(redirect.url_old as string, {
180+
redirect: {
181+
to: redirect.url_new,
182+
statusCode: responseCode as 301 | 302,
183+
},
184+
});
174185
}
175186

176-
// Add the redirect to the route rules
177-
// https://nuxt.com/docs/guide/concepts/rendering#route-rules
178-
extendRouteRules(redirect.url_old as string, {
179-
redirect: {
180-
to: redirect.url_new,
181-
statusCode: responseCode as 301 | 302,
182-
},
183-
});
184-
}
187+
log.success(`${redirects.length} Redirects loaded`);
185188

186-
log.success(`${redirects.length} Redirects loaded`);
187-
188-
for (const redirect of redirects) {
189-
log.info(` • ${redirect.response_code}`, `From: ${redirect.url_old}`, `To: ${redirect.url_new}`);
189+
for (const redirect of redirects) {
190+
log.info(` • ${redirect.response_code}`, `From: ${redirect.url_old}`, `To: ${redirect.url_new}`);
191+
}
190192
}
191193
} catch (error) {
192194
log.warn('Unable to load redirects due to the following error');

nuxt.config.ts

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ export default defineNuxtConfig({
9090
download: true,
9191
},
9292

93-
site: {
94-
url: process.env.SITE_URL || 'http://localhost:3000',
95-
name: 'AgencyOS',
96-
},
97-
9893
// OG Image Configuration - https://nuxtseo.com/og-image/getting-started/installation
9994
ogImage: {
10095
defaults: {
@@ -108,17 +103,7 @@ export default defineNuxtConfig({
108103

109104
// Sitemap Configuration - https://nuxtseo.com/sitemap/getting-started/how-it-works
110105
sitemap: {
111-
sitemaps: {
112-
pages: {
113-
exclude: ['/posts/**', '/help/**'],
114-
},
115-
posts: {
116-
include: ['/posts/**'],
117-
},
118-
help: {
119-
include: ['/help/**'],
120-
},
121-
},
106+
sources: ['/api/_sitemap-urls'],
122107
},
123108

124109
postcss: {

package.json

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,43 @@
1212
"format": "prettier --write \"**/*.{md,y?(a)ml,json,vue}\""
1313
},
1414
"devDependencies": {
15-
"@iconify-json/material-symbols": "^1.1.85",
16-
"@iconify-json/mdi": "^1.1.67",
15+
"@iconify-json/material-symbols": "^1.2.17",
16+
"@iconify-json/mdi": "^1.2.3",
1717
"@nuxtjs/eslint-config-typescript": "^12.1.0",
1818
"@nuxtjs/eslint-module": "^4.1.0",
19-
"@nuxtjs/tailwindcss": "^6.12.1",
20-
"@tailwindcss/forms": "^0.5.7",
21-
"@tailwindcss/typography": "^0.5.13",
19+
"@nuxtjs/tailwindcss": "^6.13.2",
20+
"@tailwindcss/forms": "^0.5.10",
21+
"@tailwindcss/typography": "^0.5.16",
2222
"@types/uuid": "^10.0.0",
23-
"@vueuse/core": "^10.11.0",
24-
"@vueuse/nuxt": "^10.11.0",
25-
"eslint": "8.56.0",
26-
"eslint-config-prettier": "^9.1.0",
27-
"eslint-plugin-prettier": "^5.2.1",
28-
"eslint-plugin-vue": "^9.27.0",
29-
"prettier": "^3.3.3",
30-
"typescript": "^5.5.4",
31-
"vue-tsc": "^2.0.29"
23+
"@vueuse/core": "^13.0.0",
24+
"@vueuse/nuxt": "^13.0.0",
25+
"eslint": "9.23.0",
26+
"eslint-config-prettier": "^10.1.1",
27+
"eslint-plugin-prettier": "^5.2.5",
28+
"eslint-plugin-vue": "^10.0.0",
29+
"prettier": "^3.5.3",
30+
"typescript": "^5.8.2",
31+
"vue-tsc": "^2.2.8"
3232
},
3333
"dependencies": {
34-
"@directus/sdk": "^16.1.1",
34+
"@directus/sdk": "^19.1.0",
3535
"@formkit/auto-animate": "^0.8.2",
36-
"@headlessui/vue": "^1.7.22",
37-
"@nuxt/icon": "^1.3.1",
38-
"@nuxt/image": "^1.7.0",
36+
"@headlessui/vue": "^1.7.23",
37+
"@nuxt/icon": "^1.11.0",
38+
"@nuxt/image": "^1.10.0",
3939
"@nuxt/ui": "^2.18.2",
40-
"@nuxtjs/color-mode": "^3.4.2",
40+
"@nuxtjs/color-mode": "^3.5.2",
4141
"@nuxtjs/google-fonts": "^3.2.0",
42-
"@nuxtjs/seo": "^2.0.0-rc.16",
43-
"@stripe/stripe-js": "^4.1.0",
44-
"@vueuse/motion": "^2.2.3",
45-
"micromark": "^4.0.0",
42+
"@nuxtjs/seo": "^3.0.1",
43+
"@stripe/stripe-js": "^6.1.0",
44+
"@vueuse/motion": "^3.0.3",
45+
"micromark": "^4.0.2",
4646
"micromark-extension-gfm": "^3.0.0",
47-
"nuxt": "^3.12.4",
48-
"stripe": "^16.5.0",
49-
"uuid": "^10.0.0",
47+
"nuxt": "^3.16.1",
48+
"stripe": "^17.7.0",
49+
"uuid": "^11.1.0",
5050
"v-perfect-signature": "^1.4.0",
51-
"vue": "^3.4.34",
52-
"vue-dompurify-html": "^5.1.0"
51+
"vue-dompurify-html": "^5.2.0"
5352
},
5453
"packageManager": "[email protected]",
5554
"engines": {

0 commit comments

Comments
 (0)