Merge branch 'pagedjs_0.4.0' into 'main'

Update to pagedjs@0.4.0

See merge request !37

Dockerfile

@@ -7,10 +7,13 @@ ENV DIRECTORY /home/node/pagedjs-cli
 
 # Configuration for Chrome
 ENV CONNECTION_TIMEOUT=60000
-# ENV CHROME_PATH=/usr/bin/google-chrome
+
+# Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
+    PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
 
 # Configuration for GS4JS
-ENV GS4JS_HOME=/usr/lib/x86_64-linux-gnu
+ENV GS4JS_HOME="/usr/lib/$(gcc -dumpmachine)"
 
 # Install ghostscript
 RUN apt-get update && \
@@ -46,7 +49,7 @@ RUN apt-get update \
     && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
     && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
     && apt-get update \
-    && apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
+    && apt-get install -y chromium fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
       --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
@@ -58,8 +61,8 @@ RUN apt-get update && \
 		apt-get install -y vim && \
 		rm -rf /var/lib/apt/lists/*
 
-RUN npm install npm@latest -g
-RUN npm install -g node-gyp
+# RUN npm install npm@latest --location=global
+RUN npm install node-gyp --location=global
 
 RUN mkdir -p $DIRECTORY
 
@@ -77,14 +80,12 @@ USER node
 
 WORKDIR $DIRECTORY
 
-COPY --chown=node:node package.json $DIRECTORY
-RUN npm install
-RUN npm install ghostscript4js
-
 COPY --chown=node:node . $DIRECTORY
+RUN npm install
+RUN GS4JS_HOME="/usr/lib/$(gcc -dumpmachine)" npm install ghostscript4js
 
 EXPOSE $PORT
 
 ENTRYPOINT ["dumb-init", "--"]
 
-CMD ["./bin/paged"]
+CMD ["./src/cli.js"]

README.md

@@ -39,7 +39,7 @@ pagedjs-cli ./path/to/index.html -o result.pdf
 --browserEndpoint <browserEndpoint>  Use a remote Chrome server with browserWSEndpoint
 --browserArgs <browserArgs>          Launch Chrome with comma separated args
 --media [media]                      Emulate "print" or "screen" media, defaults to print.
---style <script>                     Path to CSS stylesheets to be added before rendering (default: [])
+--style <style>                     Path to CSS stylesheets to be added before rendering (default: [])
 --help                               display help for command
 ```
 

package.json

@@ -32,9 +32,9 @@
     "mathjax": "^3.2.1",
     "node-fetch": "^3.2.5",
     "ora": "^6.1.0",
-    "pagedjs": "^0.3.5",
+    "pagedjs": "^0.4.0",
     "pdf-lib": "1.17.1",
-    "puppeteer": "^14.3.0",
+    "puppeteer": "^19.2.2",
     "replace-ext": "^2.0.0"
   },
   "devDependencies": {