Skip to content

Update dependencies and fix module build #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bryantgillespie merged 3 commits into from
Mar 26, 2025
Merged

Update dependencies and fix module build #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f093fde
- Upgraded `@nuxtjs/seo` to version 3.0.1 and `nuxt` to version 3.16.1.
bryantgillespie Mar 26, 2025
d9ffd53
fix module loading
bryantgillespie Mar 26, 2025
8f60808
update other deps
bryantgillespie Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ dist
.netlify
.directus/data
.directus/uploads
directus
48 changes: 25 additions & 23 deletions modules/directus/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default defineNuxtModule({

defaults: {
rest: {
baseUrl: 'http://localhost:8055',
baseUrl: '',
nuxtBaseUrl: 'http://localhost:3000',
},
auth: {
Expand All @@ -47,7 +47,7 @@ export default defineNuxtModule({
log.start('Loading Directus Module');

if (!moduleOptions.rest.baseUrl) {
log.warn(`Please make sure to set Directus baseUrl`);
log.warn('Please make sure to set Directus baseUrl');
}

// ** Runtime Logic **
Expand Down Expand Up @@ -133,13 +133,13 @@ export default defineNuxtModule({
// Utils
];

commands.forEach((name) => {
for (const name of commands) {
addImports({
name,
as: name,
from: '@directus/sdk',
});
});
}

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

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

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

for (const redirect of redirects) {
let responseCode = redirect.response_code ? parseInt(redirect.response_code as any) : 301;

if (responseCode !== 301 && responseCode !== 302) {
responseCode = 301;
if (redirects.length > 0) {
for (const redirect of redirects) {
let responseCode = redirect.response_code ? parseInt(redirect.response_code as any) : 301;

if (responseCode !== 301 && responseCode !== 302) {
responseCode = 301;
}

// Add the redirect to the route rules
// https://nuxt.com/docs/guide/concepts/rendering#route-rules
extendRouteRules(redirect.url_old as string, {
redirect: {
to: redirect.url_new,
statusCode: responseCode as 301 | 302,
},
});
}

// Add the redirect to the route rules
// https://nuxt.com/docs/guide/concepts/rendering#route-rules
extendRouteRules(redirect.url_old as string, {
redirect: {
to: redirect.url_new,
statusCode: responseCode as 301 | 302,
},
});
}
log.success(`${redirects.length} Redirects loaded`);

log.success(`${redirects.length} Redirects loaded`);

for (const redirect of redirects) {
log.info(` • ${redirect.response_code}`, `From: ${redirect.url_old}`, `To: ${redirect.url_new}`);
for (const redirect of redirects) {
log.info(` • ${redirect.response_code}`, `From: ${redirect.url_old}`, `To: ${redirect.url_new}`);
}
}
} catch (error) {
log.warn('Unable to load redirects due to the following error');
Expand Down
17 changes: 1 addition & 16 deletions nuxt.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@ export default defineNuxtConfig({
download: true,
},

site: {
url: process.env.SITE_URL || 'http://localhost:3000',
name: 'AgencyOS',
},

// OG Image Configuration - https://nuxtseo.com/og-image/getting-started/installation
ogImage: {
defaults: {
Expand All @@ -108,17 +103,7 @@ export default defineNuxtConfig({

// Sitemap Configuration - https://nuxtseo.com/sitemap/getting-started/how-it-works
sitemap: {
sitemaps: {
pages: {
exclude: ['/posts/**', '/help/**'],
},
posts: {
include: ['/posts/**'],
},
help: {
include: ['/help/**'],
},
},
sources: ['/api/_sitemap-urls'],
},

postcss: {
Expand Down
55 changes: 27 additions & 28 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,43 @@
"format": "prettier --write \"**/*.{md,y?(a)ml,json,vue}\""
},
"devDependencies": {
"@iconify-json/material-symbols": "^1.1.85",
"@iconify-json/mdi": "^1.1.67",
"@iconify-json/material-symbols": "^1.2.17",
"@iconify-json/mdi": "^1.2.3",
"@nuxtjs/eslint-config-typescript": "^12.1.0",
"@nuxtjs/eslint-module": "^4.1.0",
"@nuxtjs/tailwindcss": "^6.12.1",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.13",
"@nuxtjs/tailwindcss": "^6.13.2",
"@tailwindcss/forms": "^0.5.10",
"@tailwindcss/typography": "^0.5.16",
"@types/uuid": "^10.0.0",
"@vueuse/core": "^10.11.0",
"@vueuse/nuxt": "^10.11.0",
"eslint": "8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-vue": "^9.27.0",
"prettier": "^3.3.3",
"typescript": "^5.5.4",
"vue-tsc": "^2.0.29"
"@vueuse/core": "^13.0.0",
"@vueuse/nuxt": "^13.0.0",
"eslint": "9.23.0",
"eslint-config-prettier": "^10.1.1",
"eslint-plugin-prettier": "^5.2.5",
"eslint-plugin-vue": "^10.0.0",
"prettier": "^3.5.3",
"typescript": "^5.8.2",
"vue-tsc": "^2.2.8"
},
"dependencies": {
"@directus/sdk": "^16.1.1",
"@directus/sdk": "^19.1.0",
"@formkit/auto-animate": "^0.8.2",
"@headlessui/vue": "^1.7.22",
"@nuxt/icon": "^1.3.1",
"@nuxt/image": "^1.7.0",
"@headlessui/vue": "^1.7.23",
"@nuxt/icon": "^1.11.0",
"@nuxt/image": "^1.10.0",
"@nuxt/ui": "^2.18.2",
"@nuxtjs/color-mode": "^3.4.2",
"@nuxtjs/color-mode": "^3.5.2",
"@nuxtjs/google-fonts": "^3.2.0",
"@nuxtjs/seo": "^2.0.0-rc.16",
"@stripe/stripe-js": "^4.1.0",
"@vueuse/motion": "^2.2.3",
"micromark": "^4.0.0",
"@nuxtjs/seo": "^3.0.1",
"@stripe/stripe-js": "^6.1.0",
"@vueuse/motion": "^3.0.3",
"micromark": "^4.0.2",
"micromark-extension-gfm": "^3.0.0",
"nuxt": "^3.12.4",
"stripe": "^16.5.0",
"uuid": "^10.0.0",
"nuxt": "^3.16.1",
"stripe": "^17.7.0",
"uuid": "^11.1.0",
"v-perfect-signature": "^1.4.0",
"vue": "^3.4.34",
"vue-dompurify-html": "^5.1.0"
"vue-dompurify-html": "^5.2.0"
},
"packageManager": "[email protected]",
"engines": {
Expand Down
Loading
Loading