Include colors and theme when sharing timetable

export/package.json

@@ -18,34 +18,32 @@
   },
   "dependencies": {
     "@sentry/node": "5.30.0",
+    "@sparticuz/chromium": "92.0.0",
     "axios": "0.21.2",
     "bunyan": "1.8.15",
-    "chrome-aws-lambda": "~6.0.0",
     "fs-extra": "9.1.0",
     "http-graceful-shutdown": "2.3.2",
     "koa": "2.13.1",
     "koa-router": "10.0.0",
     "koa-views": "6.3.1",
     "lodash": "4.17.21",
-    "nodemon": "2.0.9",
+    "nodemon": "2.0.22",
     "pug": "3.0.2",
-    "puppeteer-core": "5.5.0"
+    "puppeteer-core": "10.4.0"
   },
   "devDependencies": {
-    "@types/fs-extra": "9.0.6",
+    "@types/fs-extra": "9.0.13",
     "@types/koa": "2.13.8",
-    "@types/koa-router": "7.4.1",
+    "@types/koa-router": "7.4.4",
     "@types/koa-views": "2.0.4",
-    "@types/lodash": "4.14.170",
-    "@types/node": "18.16.19",
-    "@types/pug": "2.0.4",
-    "@types/puppeteer": "^5.4.7",
-    "@vercel/node": "1.9.0",
+    "@types/lodash": "4.14.196",
+    "@types/node": "18.17.3",
+    "@types/pug": "2.0.6",
+    "@vercel/node": "1.15.4",
     "cross-env": "7.0.3",
-    "dotenv": "8.2.0",
+    "dotenv": "8.6.0",
     "npm-run-all": "4.1.5",
     "prettier": "2.8.8",
-    "puppeteer": "~6.0.0",
     "typescript": "5.1.6"
   }
 }

export/src/handler.ts

@@ -1,6 +1,6 @@
 import * as Sentry from '@sentry/node';
 import type { NowApiHandler, NowRequest, NowResponse } from '@vercel/node';
-import type { Page } from 'puppeteer';
+import type { Page } from 'puppeteer-core';
 
 import * as render from './render-serverless';
 import config from './config';

export/src/render-serverless.ts

@@ -1,5 +1,5 @@
-import chromium from 'chrome-aws-lambda';
-import type { Page } from 'puppeteer';
+import chromium from '@sparticuz/chromium';
+import puppeteer, { Page } from 'puppeteer-core';
 
 import { getModules } from './data';
 import config from './config';
@@ -23,7 +23,7 @@ async function setViewport(page: Page, options: ViewportOptions = {}) {
 }
 
 export async function open(url: string) {
-  const browser = await chromium.puppeteer.launch({
+  const browser = await puppeteer.launch({
     // devtools: !!process.env.DEVTOOLS, // TODO: Query string && NODE_ENV === 'development'?
     args: chromium.args,
     defaultViewport: chromium.defaultViewport,
@@ -72,7 +72,7 @@ export async function pdf(page: Page, data: PageData) {
 
   return await page.pdf({
     printBackground: true,
-    format: 'A4',
+    format: 'a4',
     landscape: data.theme.timetableOrientation === 'HORIZONTAL',
   });
 }

export/src/render.ts

@@ -1,5 +1,5 @@
 import fs from 'fs-extra';
-import puppeteer, { Page } from 'puppeteer';
+import puppeteer, { Page } from 'puppeteer-core';
 import type { Middleware } from 'koa';
 
 import { getModules } from './data';
@@ -106,7 +106,7 @@ export async function pdf(page: Page, data: PageData) {
 
   return await page.pdf({
     printBackground: true,
-    format: 'A4',
+    format: 'a4',
     landscape: data.theme.timetableOrientation === 'HORIZONTAL',
   });
 }

export/src/types.ts

@@ -1,4 +1,4 @@
-import type { Page } from 'puppeteer';
+import type { Page } from 'puppeteer-core';
 
 export type TimetableOrientation = 'HORIZONTAL' | 'VERTICAL';