Merge branch 'master' into dependabot/github_actions/peter-evans/create-or-update-comment-3

lukastaegert · web-flow · commit 90f9f9ed9c87 · 2023-04-11T21:43:42.000+02:00
diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
@@ -129,7 +129,6 @@ export default defineConfig({
 	title: 'Rollup',
 	transformPageData,
 	vite: {
-		optimizeDeps: { include: ['moment-mini', '@braintree/sanitize-url'] },
 		plugins: [
 			renderMermaidGraphsPlugin(),
 			{
diff --git a/docs/.vitepress/mermaid.ts b/docs/.vitepress/mermaid.ts
@@ -14,6 +14,7 @@ const mermaidRegExp = /^```mermaid\n([\S\s]*?)\n```/gm;
 const greaterThanRegExp = /&gt;/g;
 const styleTagRegExp = /<style>[\S\s]*?<\/style>/gm;
 const configFileURL = new URL('mermaid.config.json', import.meta.url);
+const puppeteerConfigFileURL = new URL('puppeteer-config.json', import.meta.url);
 
 export function renderMermaidGraphsPlugin(): Plugin {
 	const existingGraphFileNamesPromise = mkdir(graphsDirectory, { recursive: true })
@@ -28,7 +29,9 @@ export function renderMermaidGraphsPlugin(): Plugin {
 			const inFileURL = new URL(`${outFile}.mmd`, graphsDirectory);
 			await writeFile(inFileURL, codeBlock);
 			const { stdout, stderr } = await execPromise(
-				`npx mmdc --configFile ${fileURLToPath(configFileURL)} --input ${fileURLToPath(
+				`npx mmdc --configFile ${fileURLToPath(
+					configFileURL
+				)} --puppeteerConfigFile ${fileURLToPath(puppeteerConfigFileURL)} --input ${fileURLToPath(
 					inFileURL
 				)} --output ${fileURLToPath(outFileURL)}`
 			);
diff --git a/docs/.vitepress/puppeteer-config.json b/docs/.vitepress/puppeteer-config.json
@@ -0,0 +1,3 @@
+{
+	"args": ["--no-sandbox"]
+}

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ export default defineConfig({`
`129`	`129`	`title: 'Rollup',`
`130`	`130`	`transformPageData,`
`131`	`131`	`vite: {`
`132`		`- optimizeDeps: { include: ['moment-mini', '@braintree/sanitize-url'] },`
`133`	`132`	`plugins: [`
`134`	`133`	`renderMermaidGraphsPlugin(),`
`135`	`134`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "args": ["--no-sandbox"]`
	`3`	`+}`