Skip to content

Commit 4965bb5

Browse files
authored
Merge pull request #136 from jordanopensource/development
Merge development into main
2 parents 88c259b + aad93ed commit 4965bb5

File tree

7 files changed

+2717
-3633
lines changed

7 files changed

+2717
-3633
lines changed

.sample.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ NUXT_LIST_MONK_USER=monkusername
2828
NUXT_LIST_MONK_PASSWORD=somepass
2929
NUXT_LIST_MONK_EN_TEMPLATE_ID="13"
3030
NUXT_LIST_MONK_AR_TEMPLATE_ID="14"
31+
NUXT_PUBLIC_MATOMO_HOST=""
32+
NUXT_PUBLIC_MATOMO_SITE_ID=""

Dockerfile.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18.14.0 AS builder
1+
FROM node:18 AS builder
22

33

44
# copy build context and install dependencinpm res

components/Hero/Waitlist.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<script lang="ts" setup>
6868
import { ref } from 'vue'
6969
import { set } from '@vueuse/core'
70-
import { emit } from 'process'
7170
7271
const emit = defineEmits(['hideIntro'])
7372
const showWaitlist = ref(false)

nuxt.config.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import type { NuxtConfig } from '@nuxt/types'
2-
3-
const config: NuxtConfig = {
1+
export default defineNuxtConfig({
42
app: {
53
head: {
64
meta: [
@@ -26,6 +24,7 @@ const config: NuxtConfig = {
2624
'@element-plus/nuxt',
2725
'@sidebase/nuxt-auth',
2826
'@nuxt/content',
27+
'@nuxtjs/robots',
2928
],
3029

3130
auth: { globalAppMiddleware: true },
@@ -34,7 +33,6 @@ const config: NuxtConfig = {
3433
'/**': { prerender: false },
3534
},
3635

37-
buildModules: ['@nuxt/typescript-build'],
3836
typescript: {
3937
shim: false,
4038
tsConfig: {
@@ -111,6 +109,4 @@ const config: NuxtConfig = {
111109
listId: '',
112110
},
113111
},
114-
}
115-
116-
export default config
112+
})

package.json

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,27 @@
1010
"start": "node .output/server/index.mjs"
1111
},
1212
"devDependencies": {
13-
"@nuxt/types": "^2.17.2",
14-
"@nuxt/typescript-build": "^3.0.2",
15-
"@nuxtjs/i18n": "^8.0.0-beta.12",
16-
"@nuxtjs/tailwindcss": "^6.10.1",
17-
"@sidebase/nuxt-auth": "^0.6.2",
13+
"@nuxtjs/i18n": "^8.3.0",
14+
"@nuxtjs/tailwindcss": "^6.12.0",
15+
"@sidebase/nuxt-auth": "^0.6.7",
1816
"@types/d3": "^7.4.3",
19-
"@types/node": "^20",
20-
"autoprefixer": "^10.4.16",
21-
"nuxt": "^3.8.2",
22-
"postcss": "^8.4.31",
23-
"tailwindcss": "^3.3.5",
24-
"typescript": "^5.3.2"
17+
"nuxt": "^3.11.2"
2518
},
2619
"dependencies": {
27-
"@auth/mongodb-adapter": "^2.0.6",
28-
"@element-plus/nuxt": "^1.0.7",
20+
"@auth/mongodb-adapter": "^3.0.0",
21+
"@element-plus/nuxt": "^1.0.9",
2922
"@josango/nuxt3-build-banner": "^3.0.2",
30-
"@nuxt/content": "^2.9.0",
23+
"@nuxt/content": "^2.12.1",
24+
"@nuxtjs/robots": "^3.0.0",
3125
"@types/nodemailer": "^6.4.14",
32-
"@vueuse/core": "^10.6.1",
33-
"csv-parse": "^5.5.2",
34-
"d3": "^7.8.5",
35-
"element-plus": "^2.4.3",
36-
"mongodb": "^6.3.0",
26+
"@vueuse/core": "^10.9.0",
27+
"csv-parse": "^5.5.5",
28+
"d3": "^7.9.0",
29+
"element-plus": "^2.7.1",
30+
"mongodb": "^6.5.0",
3731
"next-auth": "4.21.1",
38-
"node-xlsx": "^0.23.0",
39-
"nodemailer": "^6.9.7",
32+
"node-xlsx": "^0.24.0",
33+
"nodemailer": "^6.9.13",
4034
"vue-matomo": "^4.2.0"
4135
}
4236
}

tsconfig.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
{
22
// https://nuxt.com/docs/guide/concepts/typescript
3-
"extends": "./.nuxt/tsconfig.json",
4-
"compilerOptions": {
5-
"types": [
6-
"@nuxt/types",
7-
"@nuxtjs/i18n",
8-
]
9-
}
3+
"extends": "./.nuxt/tsconfig.json"
104
}

0 commit comments

Comments
 (0)