Skip to content

Commit 325a5f2

Browse files
arpowersarpowers
committed
chore: deps and lint -d
1 parent 552554d commit 325a5f2

File tree

30 files changed

+1054
-1104
lines changed

30 files changed

+1054
-1104
lines changed

‎@fiction/analytics/endpointTrack.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { EventParams, SessionEvent } from './plugin-beacon'
1+
import type { EventParams } from './plugin-beacon'
22
import { dayjs, type EndpointMeta, type EndpointResponse, objectId, WriteBuffer } from '@fiction/core'
33
import { AnalyticsEndpoint } from './endpoints'
44

‎@fiction/analytics/endpoints.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import type { EndpointMeta, EndpointResponse } from '@fiction/core'
22
import type { Knex } from 'knex'
33
import type { EventParams } from './plugin-beacon/index.js'
44
import type { FictionClickHouse, FictionClickHouseSettings } from './plugin-clickhouse/index.js'
5-
import type { AggregationRow, DataCompared, DataPointChart, QueryParams, QueryParamsRefined } from './types.js'
6-
import { abort, dayjs, Query, vue, waitFor } from '@fiction/core'
5+
import type { AggregationRow, DataCompared, DataPointChart, QueryParams } from './types.js'
6+
import { abort, dayjs, Query, vue } from '@fiction/core'
77
import { refineParams } from './utils/refine.js'
88

99
export type AnalyticsEndpointSettings = FictionClickHouseSettings & {

‎@fiction/analytics/plugin-beacon/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import type { FictionClickHouse } from '../plugin-clickhouse/index.js'
66
import type { FictionEvent } from '../typesTracking.js'
77
import { createExpressApp, dayjs, deepMerge, FictionPlugin, getRequestIpAddress, vue, WriteBuffer } from '@fiction/core'
88
import { addExpressHealthCheck } from '@fiction/core/utils/serverHealth.js'
9-
import { allTables } from '../tables.js'
109
import { SessionManager } from './session.js'
1110

1211
export * from '../tables.js'

‎@fiction/analytics/test/endpoint.metrics.unit.test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { FictionAnalytics } from '../index.js'
22
import { dayjs, shortId, waitFor } from '@fiction/core'
3-
import { snap } from '@fiction/core/test-utils'
43
import { describe, expect, it } from 'vitest'
54
import { createAnalyticsTestUtils } from './helpers.js'
65

‎@fiction/core/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
"chart.js": "^4.4.7",
5252
"chokidar": "^4.0.3",
5353
"cjs-module-lexer": "^1.4.1",
54-
"commander": "^12.1.0",
54+
"commander": "^13.0.0",
5555
"compression": "^1.7.5",
5656
"consola": "^3.3.3",
5757
"cors": "^2.8.5",
58-
"cron": "^3.3.1",
58+
"cron": "^3.3.2",
5959
"cronstrue": "^2.52.0",
6060
"crypto-browserify": "^3.12.1",
6161
"dayjs": "^1.11.13",
@@ -82,10 +82,10 @@
8282
"google-auth-library": "^9.15.0",
8383
"google-one-tap": "^1.0.6",
8484
"handlebars": "^4.7.8",
85-
"happy-dom": "^15.11.7",
85+
"happy-dom": "^16.2.3",
8686
"helmet": "^8.0.0",
8787
"html-minifier": "^4.0.0",
88-
"htmlparser2": "^9.1.0",
88+
"htmlparser2": "^10.0.0",
8989
"ioredis": "^5.4.2",
9090
"ipaddr.js": "^2.2.0",
9191
"js-cookie": "^3.0.5",
@@ -121,7 +121,7 @@
121121
"querystring-browser": "^1.0.4",
122122
"querystring-es3": "^0.2.1",
123123
"react": "^19.0.0",
124-
"remove-markdown": "^0.5.5",
124+
"remove-markdown": "^0.6.0",
125125
"request-ip": "^3.3.0",
126126
"semver": "^7.6.3",
127127
"serve-favicon": "^2.5.0",
@@ -136,7 +136,7 @@
136136
"ts-node": "^10.9.2",
137137
"tsup": "^8.3.5",
138138
"turndown": "^7.2.0",
139-
"typescript": "5.6.3",
139+
"typescript": "^5.7.2",
140140
"unhead": "^1.11.14",
141141
"uuid-apikey": "^1.5.3",
142142
"validator": "^13.12.0",
@@ -182,7 +182,7 @@
182182
"playwright": "^1.49.1",
183183
"react-dom": "^19.0.0",
184184
"rollup": "^4.29.1",
185-
"rollup-plugin-visualizer": "^5.12.0",
185+
"rollup-plugin-visualizer": "^5.13.1",
186186
"util": "^0.12.5",
187187
"websocket-polyfill": "^1.0.0"
188188
},

‎@fiction/core/plugin-db/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { FictionDb, FictionDbTable } from '.'
1+
import type { FictionDb } from '.'
22
import { z } from 'zod'
33
import { type EndpointMeta, removeUndefined } from '../utils'
44

‎@fiction/core/plugin-email/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { MediaObject } from '@fiction/core'
22
import type { FictionMedia } from '../plugin-media'
3-
import type EmailStandard from './templates/EmailStandard.vue'
43
import type { EmailSendConfig } from './util'
54
import { EnvVar, vars } from '../plugin-env/index.js'
65
import { FictionPlugin, type FictionPluginSettings } from '../plugin.js'

‎@fiction/core/plugin-env/restart.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Nodemon, NodemonSettings } from 'nodemon'
1+
import type { NodemonSettings } from 'nodemon'
22
import type { FictionPluginSettings } from '../plugin.js'
33
import process from 'node:process'
44
import { FictionPlugin } from '../plugin.js'

‎@fiction/core/plugin-team/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import type { FictionDb } from '../plugin-db/index.js'
33
import type { FictionEmail } from '../plugin-email/index.js'
44
import type { FictionRouter } from '../plugin-router/index.js'
55
import type { FictionServer } from '../plugin-server/index.js'
6-
import type { FictionUser, Organization, User } from '../plugin-user/index.js'
6+
import type { FictionUser } from '../plugin-user/index.js'
77
import type { FictionPluginSettings } from '../plugin.js'
88
import { FictionPlugin } from '../plugin.js'
9-
import { abort, safeDirname } from '../utils/index.js'
9+
import { safeDirname } from '../utils/index.js'
1010
import { QueryOrgMembers, QuerySeekInviteFromUser, QueryTeamInvite } from './endpoint.js'
1111

1212
type FictionTeamSettings = {

‎@fiction/core/test-utils/util.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { ServiceList } from '../plugin-env/index.js'
33
import path from 'node:path'
44
import { expect, vi } from 'vitest'
55
import { createApp, nextTick } from 'vue'
6-
import { isPlainObject, safeDirname, stringify, waitFor } from '../utils/index.js'
6+
import { safeDirname, waitFor } from '../utils/index.js'
77
import { vue } from '../utils/libraries.js'
88

99
const toolUtilsRoot = safeDirname(import.meta.url)

‎@fiction/plugins/plugin-newsletter/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@fiction/posts": "workspace:*",
88
"@fiction/site": "workspace:*",
99
"@fiction/ui": "workspace:*",
10-
"cron": "^3.3.1",
10+
"cron": "^3.3.2",
1111
"cronstrue": "^2.52.0",
1212
"vue": "^3.5.13"
1313
},

‎@fiction/plugins/plugin-onboard/widgets/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { DataCompared, DataPointChart, QueryParamsRefined, TimeLineInterval } from '@fiction/analytics/types'
1+
import type { DataCompared, DataPointChart, TimeLineInterval } from '@fiction/analytics/types'
22
import { refineParams } from '@fiction/analytics/utils/refine'
33
import dayjs from 'dayjs'
44

‎@fiction/plugins/plugin-subscribe/endpoint.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { FictionSubscribe } from '.'
33
import type { FictionSubscribeSettings } from './index'
44
import type { Subscriber, TableSubscribeConfig } from './schema'
55
import { refineParams, refineTimelineData } from '@fiction/analytics/utils/refine'
6-
import { abort, applyComplexFilters, type ComplexDataFilter, type EndpointMeta, type EndpointResponse, type FictionDb, type FictionEmail, type FictionEnv, type FictionUser, type IndexQuery, type SyndicateStatus, type User, vue } from '@fiction/core'
6+
import { abort, applyComplexFilters, type ComplexDataFilter, type EndpointMeta, type EndpointResponse, type FictionDb, type IndexQuery, type SyndicateStatus, type User, vue } from '@fiction/core'
77
import { dayjs, deepMerge, Query } from '@fiction/core'
88
import { t } from './schema'
99
import { trackSubscriberMetrics } from './utils/analytics'

‎@fiction/posts/admin/ElPostIndex.vue

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<script lang="ts" setup>
2-
import type { IndexItem, NavListItem } from '@fiction/core'
2+
import type { NavListItem } from '@fiction/core'
33
import type { Card } from '@fiction/site/card'
4-
import type { as } from 'vitest/dist/chunks/reporters.D7Jzd9GS.js'
54
import type { FictionPosts, TablePostConfig } from '..'
65
import type { Post } from '../post'
76
import { useService, vue } from '@fiction/core'

‎@fiction/posts/endpoint.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import type { EndpointMeta, EndpointResponse, FictionDb, FictionPluginSettings, FictionUser, IndexMeta, IndexQuery } from '@fiction/core'
1+
import type { EndpointMeta, EndpointResponse, IndexMeta, IndexQuery } from '@fiction/core'
22
import type { FictionPosts } from '.'
33
import type { FictionPostsSettings } from './index'
44
import type { TablePostConfig } from './schema'
55
import { abort, applyComplexFilters, deepMerge, incrementSlugId, objectId, Query, standardTable, toSlug } from '@fiction/core'
6-
import { getObjectWordCount } from '@fiction/core/utils/wordCount'
76
import { t } from './schema'
8-
import { trackPostMetrics, updatePostWordCount } from './utils/analytics'
7+
import { trackPostMetrics } from './utils/analytics'
98

109
export type PostsQuerySettings = FictionPostsSettings & { fictionPosts: FictionPosts }
1110
export abstract class PostsQuery extends Query<PostsQuerySettings> {

‎@fiction/posts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@fiction/plugin-ai": "workspace:*",
88
"@fiction/site": "workspace:*",
99
"@fiction/ui": "workspace:*",
10-
"cron": "^3.3.1"
10+
"cron": "^3.3.2"
1111
},
1212
"gitHead": "b257411e1c6c32b52b444cc6f1518bf1bee1e480",
1313
"license": "MIT",

‎@fiction/posts/test/endpoint.unit.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { TrackEventTypes } from '@fiction/analytics'
22
import type { TablePostConfig } from '../schema'
3-
import { type ComplexDataFilter, type DataFilter, dayjs, type EndpointMeta, type Organization } from '@fiction/core'
3+
import { type ComplexDataFilter, type DataFilter, dayjs, type EndpointMeta } from '@fiction/core'
44
import { snap } from '@fiction/core/test-utils'
55
import { createSiteTestUtils } from '@fiction/site/test/testUtils'
66
import { afterAll, beforeAll, describe, expect, it } from 'vitest'

‎@fiction/site/site.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ export class Site<T extends SiteSettings = SiteSettings> extends FictionObject<T
198198
set: async v => this.siteRouter.push(v, { caller: 'currentPath' }),
199199
})
200200

201-
editor = vue.ref<EditorState>({
201+
editor: vue.Ref<EditorState> = vue.ref({
202202
selectedCardId: '',
203203
selectedPageId: '',
204204
selectedRegionId: 'main',

‎@fiction/site/utils/test/site.unit.test.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
import type { EditorState } from '../../site.js'
66
import FSite from '@fiction/cards/CardSite.vue'
77
import { AppRoute, shortId, waitFor } from '@fiction/core'
8-
import { t } from '@fiction/site/tables.js'
98
import { describe, expect, it } from 'vitest'
109
import { requestManageSite } from '../../load.js'
1110
import { Site } from '../../site.js'
1211
import { createSiteTestUtils } from '../../test/testUtils.js'
1312
import { siteGoto, siteLink } from '../manage.js'
1413
import { setPages, updatePages } from '../page.js'
15-
import { activeSiteHostname, getSiteMetrics, saveSite, trackSiteMetrics, updateSite } from '../site.js'
14+
import { activeSiteHostname, saveSite, updateSite } from '../site.js'
1615

1716
describe('siteLink / siteGoto', async () => {
1817
const testUtils = await createSiteTestUtils()

‎@fiction/ui/inputs/FormEngineModal.vue

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import type { InputOption } from '@fiction/ui'
44
import { vue } from '@fiction/core'
55
import XButton from '@fiction/ui/buttons/XButton.vue'
66
import ElModal from '@fiction/ui/ElModal.vue'
7-
import ElForm from '@fiction/ui/inputs/ElForm.vue'
87
import FormEngine from '@fiction/ui/inputs/FormEngine.vue'
98
import { validateForm } from '@fiction/ui/inputs/utils'
109

‎@fiction/ui/lists/ElIndexGrid.vue

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<script lang="ts" setup>
22
import type { ActionArea, IndexMeta, NavListItem } from '@fiction/core'
3-
import { getNavComponentType, getPaginationInfo, vue } from '@fiction/core/index.js'
3+
import { getPaginationInfo, vue } from '@fiction/core/index.js'
44
import XButton from '../buttons/XButton.vue'
55
import ElZeroBanner from '../ElZeroBanner.vue'
66
import ElSpinner from '../loaders/ElSpinner.vue'
7-
import ElIndexItemMedia from './ElIndexItemMedia.vue'
87
import XIndexItem from './XIndexItem.vue'
98
109
const {

‎@fiction/ui/package.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55
"@tailwindcss/container-queries": "^0.1.1",
66
"@tailwindcss/forms": "^0.5.9",
77
"@tailwindcss/typography": "^0.5.15",
8-
"@tiptap/core": "^2.10.4",
9-
"@tiptap/extension-bubble-menu": "^2.10.4",
10-
"@tiptap/extension-code": "^2.10.4",
11-
"@tiptap/extension-code-block": "^2.10.4",
12-
"@tiptap/extension-color": "^2.10.4",
13-
"@tiptap/extension-focus": "^2.10.4",
14-
"@tiptap/extension-highlight": "^2.10.4",
15-
"@tiptap/extension-horizontal-rule": "^2.10.4",
16-
"@tiptap/extension-image": "^2.10.4",
17-
"@tiptap/extension-link": "^2.10.4",
18-
"@tiptap/extension-placeholder": "^2.10.4",
19-
"@tiptap/extension-subscript": "^2.10.4",
20-
"@tiptap/extension-superscript": "^2.10.4",
21-
"@tiptap/extension-task-item": "^2.10.4",
22-
"@tiptap/extension-task-list": "^2.10.4",
23-
"@tiptap/extension-text-align": "^2.10.4",
24-
"@tiptap/extension-text-style": "^2.10.4",
25-
"@tiptap/extension-typography": "^2.10.4",
26-
"@tiptap/extension-underline": "^2.10.4",
27-
"@tiptap/extension-youtube": "^2.10.4",
28-
"@tiptap/pm": "^2.10.4",
29-
"@tiptap/starter-kit": "^2.10.4",
30-
"@tiptap/suggestion": "^2.10.4",
31-
"@tiptap/vue-3": "^2.10.4",
8+
"@tiptap/core": "^2.11.0",
9+
"@tiptap/extension-bubble-menu": "^2.11.0",
10+
"@tiptap/extension-code": "^2.11.0",
11+
"@tiptap/extension-code-block": "^2.11.0",
12+
"@tiptap/extension-color": "^2.11.0",
13+
"@tiptap/extension-focus": "^2.11.0",
14+
"@tiptap/extension-highlight": "^2.11.0",
15+
"@tiptap/extension-horizontal-rule": "^2.11.0",
16+
"@tiptap/extension-image": "^2.11.0",
17+
"@tiptap/extension-link": "^2.11.0",
18+
"@tiptap/extension-placeholder": "^2.11.0",
19+
"@tiptap/extension-subscript": "^2.11.0",
20+
"@tiptap/extension-superscript": "^2.11.0",
21+
"@tiptap/extension-task-item": "^2.11.0",
22+
"@tiptap/extension-task-list": "^2.11.0",
23+
"@tiptap/extension-text-align": "^2.11.0",
24+
"@tiptap/extension-text-style": "^2.11.0",
25+
"@tiptap/extension-typography": "^2.11.0",
26+
"@tiptap/extension-underline": "^2.11.0",
27+
"@tiptap/extension-youtube": "^2.11.0",
28+
"@tiptap/pm": "^2.11.0",
29+
"@tiptap/starter-kit": "^2.11.0",
30+
"@tiptap/suggestion": "^2.11.0",
31+
"@tiptap/vue-3": "^2.11.0",
3232
"@types/canvas-confetti": "^1.9.0",
3333
"@types/flickity": "^2.2.11",
3434
"@types/imagesloaded": "^4.1.6",

‎@fiction/www/.fiction/cardStructure.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"version": "1.0",
3-
"generatedAt": "2024-12-26T19:21:26.009Z",
3+
"generatedAt": "2024-12-30T23:25:39.266Z",
44
"templates": [
55
{
66
"templateId": "cardHeroV1",

‎@fiction/www/.fiction/config.json

+8
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
"key": "GetTopValues",
2525
"path": "/api/user/GetTopValues"
2626
},
27+
{
28+
"key": "CompiledMetrics",
29+
"path": "/api/analytics/CompiledMetrics"
30+
},
2731
{
2832
"key": "EventTrack",
2933
"path": "/api/analytics/EventTrack"
@@ -144,6 +148,10 @@
144148
"key": "ManageSend",
145149
"path": "/api/send/ManageSend"
146150
},
151+
{
152+
"key": "emailTrackingEndpoint",
153+
"path": "/api/email-tracking/:action?"
154+
},
147155
{
148156
"key": "ManageBrandGuide",
149157
"path": "/api/send/ManageBrandGuide"

‎@fiction/www/.fiction/config.ts

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export interface CompiledServiceConfig {
5252
| 'AiImage'
5353
| 'CardQuery'
5454
| 'CheckUsername'
55+
| 'CompiledMetrics'
5556
| 'EmailAction'
5657
| 'EventTrack'
5758
| 'GetClientSessions'
@@ -84,6 +85,7 @@ export interface CompiledServiceConfig {
8485
| 'SeekInviteFromUser'
8586
| 'SubscriptionAnalytics'
8687
| 'TeamInvite'
88+
| 'emailTrackingEndpoint'
8789
| 'oAuthEndpoint'
8890
| 'posts'
8991
tables: {

‎@fiction/www/.fiction/projectStructure.json

+9
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@
9494
},
9595
"util.ts": null
9696
},
97+
"endpointMetrics.ts": null,
98+
"endpointTrack.ts": null,
9799
"endpoints.ts": null,
98100
"index.ts": null,
99101
"package.json": null,
@@ -137,6 +139,8 @@
137139
"test": {
138140
"beacon.stats.test.ts": null,
139141
"client.stats.test.ts": null,
142+
"endpoint.metrics.unit.test.ts": null,
143+
"endpoint.track.unit.test.ts": null,
140144
"endpoint.unit.test.ts": null,
141145
"helpers.ts": null,
142146
"tables.unit.test.ts": null
@@ -1016,6 +1020,7 @@
10161020
"test": {
10171021
"endpoints.unit.test.ts": null,
10181022
"plugin.unit.test.ts": null,
1023+
"stripeMocks.ts": null,
10191024
"utils.unit.test.ts": null
10201025
},
10211026
"types.ts": null,
@@ -1059,6 +1064,9 @@
10591064
"kit.main.ts": null,
10601065
"subscribe.uiux.test.ts": null,
10611066
"test.csv": null
1067+
},
1068+
"utils": {
1069+
"analytics.ts": null
10621070
}
10631071
},
10641072
"plugin-transactions": {
@@ -1115,6 +1123,7 @@
11151123
"utils.unit.test.ts": null
11161124
},
11171125
"utils": {
1126+
"analytics.ts": null,
11181127
"index.ts": null,
11191128
"links.ts": null
11201129
},

0 commit comments

Comments
 (0)