Merge pull request #97 from Sparticuz/feature/chromium113

Sparticuz · May 4, 2023 · 2c2eeba · 2c2eeba
2 parents 96f0556 + ccf85f2
commit 2c2eeba
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 51 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -12,10 +12,11 @@ For Playwright-specific bugs, please refer to: https://github.com/microsoft/play
 -->
 
 ## Environment
-* `chromium` Version:
-* `puppeteer` / `puppeteer-core` Version:
-* Node.js Version: <!-- 14.x | 16.x -->
-* Lambda / GCF Runtime: <!-- `nodejs8.10` | `nodejs10.x` | `nodejs12.x` -->
+
+- `chromium` Version:
+- `puppeteer` / `puppeteer-core` Version:
+- Node.js Version: <!-- 16.x | 18.x -->
+- Lambda / GCF Runtime: <!-- `nodejs16` | `nodejs18.x` -->
 
 ## Expected Behavior
 

diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml
@@ -43,7 +43,6 @@ jobs:
         event:
           - example.com
         version:
-          - 14
           - 16
           - 18
     steps:

diff --git a/_/amazon/template.yml b/_/amazon/template.yml
@@ -12,21 +12,9 @@ Resources:
         LayerName: sparticuz-chromium
         ContentUri: code/
         CompatibleRuntimes:
-          - nodejs14.x
           - nodejs16.x
           - nodejs18.x
 
-  node14:
-    Type: AWS::Serverless::Function
-    Properties:
-      Layers:
-        - !Ref layer
-      Handler: handlers/index.handler
-      Runtime: nodejs14.x
-      Policies:
-        - AWSLambdaBasicExecutionRole
-        - AWSXRayDaemonWriteAccess
-      Tracing: Active
   node16:
     Type: AWS::Serverless::Function
     Properties:

diff --git a/_/ansible/inventory.ini b/_/ansible/inventory.ini
@@ -14,4 +14,4 @@ instance_size=c6i.12xlarge
 ansible_connection=ssh
 ansible_python_interpreter=auto_silent
 ansible_ssh_private_key_file=ansible.pem
-chromium_revision=1108766
+chromium_revision=1121455
diff --git a/bin/aws.tar.br b/bin/aws.tar.br
diff --git a/bin/chromium.br b/bin/chromium.br
diff --git a/bin/swiftshader.tar.br b/bin/swiftshader.tar.br
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,14 +40,15 @@
     "tar-fs": "^2.1.1"
   },
   "devDependencies": {
-    "@tsconfig/node14": "^1.0.3",
+    "@tsconfig/node16": "^1.0.3",
+    "@tsconfig/strictest": "^2.0.1",
     "@types/follow-redirects": "^1.14.1",
-    "@types/node": "^18.15.7",
+    "@types/node": "^18.16.3",
     "@types/tar-fs": "^2.0.1",
     "clean-modules": "^2.0.6",
-    "typescript": "^5.0.2"
+    "typescript": "^5.0.4"
   },
   "engines": {
-    "node": ">= 14.18.0"
+    "node": ">= 16"
   }
 }
diff --git a/source/helper.ts b/source/helper.ts
@@ -23,8 +23,8 @@ export const isValidUrl = (input: string) => {
  */
 export const isRunningInAwsLambda = () => {
   if (
-    process.env.AWS_EXECUTION_ENV &&
-    /^AWS_Lambda_nodejs/.test(process.env.AWS_EXECUTION_ENV) === true
+    process.env["AWS_EXECUTION_ENV"] &&
+    /^AWS_Lambda_nodejs/.test(process.env["AWS_EXECUTION_ENV"]) === true
   ) {
     return true;
   }

diff --git a/source/index.ts b/source/index.ts
@@ -45,15 +45,20 @@ interface Viewport {
 }
 
 if (isRunningInAwsLambda()) {
-  if (process.env.FONTCONFIG_PATH === undefined) {
-    process.env.FONTCONFIG_PATH = "/tmp/aws";
+  if (process.env["FONTCONFIG_PATH"] === undefined) {
+    process.env["FONTCONFIG_PATH"] = "/tmp/aws";
   }
 
-  if (process.env.LD_LIBRARY_PATH === undefined) {
-    process.env.LD_LIBRARY_PATH = "/tmp/aws/lib";
-  } else if (process.env.LD_LIBRARY_PATH.startsWith("/tmp/aws/lib") !== true) {
-    process.env.LD_LIBRARY_PATH = [
-      ...new Set(["/tmp/aws/lib", ...process.env.LD_LIBRARY_PATH.split(":")]),
+  if (process.env["LD_LIBRARY_PATH"] === undefined) {
+    process.env["LD_LIBRARY_PATH"] = "/tmp/aws/lib";
+  } else if (
+    process.env["LD_LIBRARY_PATH"].startsWith("/tmp/aws/lib") !== true
+  ) {
+    process.env["LD_LIBRARY_PATH"] = [
+      ...new Set([
+        "/tmp/aws/lib",
+        ...process.env["LD_LIBRARY_PATH"].split(":"),
+      ]),
     ].join(":");
   }
 }
@@ -77,12 +82,12 @@ class Chromium {
    * Downloads or symlinks a custom font and returns its basename, patching the environment so that Chromium can find it.
    */
   static font(input: string): Promise<string> {
-    if (process.env.HOME === undefined) {
-      process.env.HOME = "/tmp";
+    if (process.env["HOME"] === undefined) {
+      process.env["HOME"] = "/tmp";
     }
 
-    if (existsSync(`${process.env.HOME}/.fonts`) !== true) {
-      mkdirSync(`${process.env.HOME}/.fonts`);
+    if (existsSync(`${process.env["HOME"]}/.fonts`) !== true) {
+      mkdirSync(`${process.env["HOME"]}/.fonts`);
     }
 
     return new Promise((resolve, reject) => {
@@ -91,7 +96,7 @@ class Chromium {
       }
 
       const url = new URL(input);
-      const output = `${process.env.HOME}/.fonts/${url.pathname
+      const output = `${process.env["HOME"]}/.fonts/${url.pathname
         .split("/")
         .pop()}`;
 
@@ -143,7 +148,7 @@ class Chromium {
    */
   static get args(): string[] {
     /**
-     * These are the default ares in puppeteer.
+     * These are the default args in puppeteer.
      * https://github.com/puppeteer/puppeteer/blob/3a31070d054fa3cd8116ca31c578807ed8d6f987/packages/puppeteer-core/src/node/ChromeLauncher.ts#L185
      */
     const puppeteerFlags = [

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,8 @@
 {
-  "extends": "@tsconfig/node14/tsconfig.json",
+  "extends": [
+    "@tsconfig/node16/tsconfig",
+    "@tsconfig/strictest"
+  ],
   "compilerOptions": {
     "declaration": true,
     "lib": [
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,6 @@ jobs: @@
             event:
               - example.com
             version:
-              - 14
               - 16
               - 18
         steps:
@@ Expand Down @@