Changeset 50612

Timestamp:

03/29/2021 06:05:47 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Remove explicit puppeteer dependency.

This was added in [48177] to fix an issue where Puppeteer was not being installed correctly as a dependency of @wordpress/wp-scripts. This has been fixed, so this explicit dependency can be removed.

Props isabel_brison, desrosj, SergeyBiryukov.
Fixes #52843.

Location:

trunk

Files:

• package-lock.json (modified) (5 diffs)
• package.json (modified) (1 diff)
• tests/e2e/run-tests.js (modified) (2 diffs)

trunk/package-lock.json

@@ -2316 +2316 @@
             }
         },
-        "@types/mime-types": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
-            "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=",
-            "dev": true
-        },
         "@types/minimatch": {
             "version": "3.0.3",
@@ -3913 +3907 @@
                     "dev": true
                 },
-                "puppeteer": {
-                    "version": "npm:puppeteer-core@5.5.0",
-                    "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-5.5.0.tgz",
-                    "integrity": "sha512-tlA+1n+ziW/Db03hVV+bAecDKse8ihFRXYiEypBe9IlLRvOCzYFG6qrCMBYK34HO/Q/Ecjc+tvkHRAfLVH+NgQ==",
-                    "dev": true,
-                    "requires": {
-                        "debug": "^4.1.0",
-                        "devtools-protocol": "0.0.818844",
-                        "extract-zip": "^2.0.0",
-                        "https-proxy-agent": "^4.0.0",
-                        "node-fetch": "^2.6.1",
-                        "pkg-dir": "^4.2.0",
-                        "progress": "^2.0.1",
-                        "proxy-from-env": "^1.0.0",
-                        "rimraf": "^3.0.2",
-                        "tar-fs": "^2.0.0",
-                        "unbzip2-stream": "^1.3.3",
-                        "ws": "^7.2.3"
-                    },
-                    "dependencies": {
-                        "devtools-protocol": {
-                            "version": "0.0.818844",
-                            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
-                            "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
-                            "dev": true
-                        }
-                    }
-                },
                 "rimraf": {
                     "version": "3.0.2",
@@ -8064 +8030 @@
             "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
             "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+            "dev": true
+        },
+        "devtools-protocol": {
+            "version": "0.0.818844",
+            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
+            "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
             "dev": true
         },
@@ -18646 +18618 @@
         },
         "puppeteer": {
-            "version": "npm:puppeteer-core@3.0.0",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-3.0.0.tgz",
-            "integrity": "sha512-oWjZFGMc0q2ak+8OxdmMffS79LIT0UEtmpV4h1/AARvESIqqKljf8mrfP+dQ2kas7XttsAZIxRBuWu7Y5JH8KQ==",
-            "dev": true,
-            "requires": {
-                "@types/mime-types": "^2.1.0",
+            "version": "npm:puppeteer-core@5.5.0",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-5.5.0.tgz",
+            "integrity": "sha512-tlA+1n+ziW/Db03hVV+bAecDKse8ihFRXYiEypBe9IlLRvOCzYFG6qrCMBYK34HO/Q/Ecjc+tvkHRAfLVH+NgQ==",
+            "dev": true,
+            "requires": {
                 "debug": "^4.1.0",
+                "devtools-protocol": "0.0.818844",
                 "extract-zip": "^2.0.0",
                 "https-proxy-agent": "^4.0.0",
-                "mime": "^2.0.3",
-                "mime-types": "^2.1.25",
+                "node-fetch": "^2.6.1",
+                "pkg-dir": "^4.2.0",
                 "progress": "^2.0.1",
                 "proxy-from-env": "^1.0.0",
@@ -18665 +18637 @@
             },
             "dependencies": {
+                "find-up": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+                    "dev": true,
+                    "requires": {
+                        "locate-path": "^5.0.0",
+                        "path-exists": "^4.0.0"
+                    }
+                },
+                "locate-path": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+                    "dev": true,
+                    "requires": {
+                        "p-locate": "^4.1.0"
+                    }
+                },
+                "p-locate": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+                    "dev": true,
+                    "requires": {
+                        "p-limit": "^2.2.0"
+                    }
+                },
+                "path-exists": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+                    "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+                    "dev": true
+                },
+                "pkg-dir": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+                    "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+                    "dev": true,
+                    "requires": {
+                        "find-up": "^4.0.0"
+                    }
+                },
                 "rimraf": {
                     "version": "3.0.2",

trunk/package.json

@@ -64 +64 @@
         "matchdep": "~2.0.0",
         "prettier": "npm:wp-prettier@2.0.5",
-        "puppeteer": "npm:puppeteer-core@3.0.0",
         "qunit": "~2.14.1",
         "sass": "^1.32.8",

trunk/tests/e2e/run-tests.js

@@ -1 +1 @@
 const dotenv = require( 'dotenv' );
 const dotenv_expand = require( 'dotenv-expand' );
-const { sync: spawn } = require( 'cross-spawn' );
 const { execSync } = require( 'child_process' );
 
@@ -7 +6 @@
 dotenv_expand( dotenv.config() );
 
-const result = spawn( 'node', [ require.resolve( 'puppeteer/install' ) ], {
-    stdio: 'inherit',
-} );
-if ( result.status > 0 ) {
-    process.exit( result.status );
-}
-
 // Run the tests, passing additional arguments through to the test script.
-execSync( 'wp-scripts test-e2e --config tests/e2e/jest.config.js ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
+execSync(
+    'wp-scripts test-e2e --config tests/e2e/jest.config.js ' +
+        process.argv.slice( 2 ).join( ' ' ),
+    { stdio: 'inherit' }
+);