Skip to content

Commit 2439950

Browse files
Fix: deploy (#274)
* Fix: deploy * fix: rvo version pinned * fix: pdfmake 0.3 API
1 parent 24c68fc commit 2439950

File tree

5 files changed

+136
-196
lines changed

5 files changed

+136
-196
lines changed

form-app/dist/index.html

Lines changed: 112 additions & 177 deletions
Large diffs are not rendered by default.

form-app/package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

form-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
},
1515
"dependencies": {
1616
"@nl-rvo/assets": "^1.0.0-alpha.360",
17-
"@nl-rvo/component-library-css": "^4.17.0",
18-
"@nl-rvo/design-tokens": "^1.12.0",
17+
"@nl-rvo/component-library-css": "4.8.0",
18+
"@nl-rvo/design-tokens": "1.9.0",
1919
"@types/pdfmake": "^0.2.11",
2020
"fp-ts": "^2.16.11",
2121
"io-ts": "^2.2.22",

form-app/src/utils/pdfExport.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { type FlatTask, type TaskStoreType } from '@/stores/tasks'
22
import { type AnswerStoreType } from '@/stores/answers'
33
import { FormType } from '@/models/dpia.ts'
4-
import * as pdfMake from 'pdfmake/build/pdfmake'
5-
import * as pdfFonts from 'pdfmake/build/vfs_fonts'
4+
import pdfMake from 'pdfmake/build/pdfmake'
5+
import pdfFonts from 'pdfmake/build/vfs_fonts'
66
import type { StyleDictionary, TDocumentDefinitions, Content } from 'pdfmake/interfaces'
77
import FontService from '@/services/fontService.ts'
88
import { renderInstanceLabel } from '@/utils/taskUtils'
@@ -14,7 +14,8 @@ import type { CalculationStoreType } from '@/stores/calculations'
1414

1515

1616
// Initialize PDFMake
17-
(<any>pdfMake).addVirtualFileSystem(pdfFonts)
17+
// @ts-expect-error pdfmake 0.3.x types not yet in @types/pdfmake
18+
pdfMake.addVirtualFileSystem(pdfFonts)
1819

1920
const dutchDateFormatter = new Intl.DateTimeFormat('nl-NL', {
2021
weekday: 'long',
@@ -179,7 +180,12 @@ export async function exportToPdf(
179180

180181
const vfs = await FontService.getVFS()
181182

182-
pdfMake.createPdf(docDefinition, undefined, fontDefinitions, vfs).download(actualFilename)
183+
// pdfmake 0.3: register fonts and VFS on the instance before creating PDF
184+
// @ts-expect-error pdfmake 0.3.x types not yet in @types/pdfmake
185+
pdfMake.addFonts(fontDefinitions)
186+
// @ts-expect-error pdfmake 0.3.x types not yet in @types/pdfmake
187+
pdfMake.addVirtualFileSystem(vfs)
188+
pdfMake.createPdf(docDefinition).download(actualFilename)
183189

184190
return Promise.resolve()
185191
} catch (error) {

form-app/vite.config.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ import { viteSingleFile } from 'vite-plugin-singlefile'
77

88

99
// https://vite.dev/config/
10-
export default defineConfig({
10+
export default defineConfig(({ mode }) => ({
1111
plugins: [
1212
vue(),
13-
vueDevTools(),
14-
viteSingleFile(
15-
),
13+
mode === 'development' && vueDevTools(),
14+
viteSingleFile(),
1615
],
1716
resolve: {
1817
alias: {
1918
'@': fileURLToPath(new URL('./src', import.meta.url))
2019
},
2120
}
22-
})
21+
}))

0 commit comments

Comments
 (0)