chore: load env from playwright.env when running codegen (#32280)

2024-11-24 06:49:04 +03:00 · 2024-08-23 10:19:36 -07:00 · 2024-08-23 10:19:36 -07:00 · 4edc076935
commit 4edc076935
parent 8703dd4f06
9 changed files with 62 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@ -33,4 +33,5 @@ test-results
 /tests/installation/output/
 /tests/installation/.registry.json
 .cache/
-.eslintcache
+.eslintcache
+playwright.env
--- a/package-lock.json
+++ b/package-lock.json
@ -41,7 +41,7 @@
        "colors": "^1.4.0",
        "concurrently": "^6.2.1",
        "cross-env": "^7.0.3",
-        "dotenv": "^16.0.0",
+        "dotenv": "^16.4.5",
        "electron": "^30.1.2",
        "esbuild": "^0.18.11",
        "eslint": "^8.55.0",
@ -3293,15 +3293,15 @@
      }
    },
    "node_modules/dotenv": {
-      "version": "16.3.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
-      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+      "version": "16.4.5",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
      "dev": true,
      "engines": {
        "node": ">=12"
      },
      "funding": {
-        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+        "url": "https://dotenvx.com"
      }
    },
    "node_modules/electron": {
--- a/package.json
+++ b/package.json
@ -79,7 +79,7 @@
    "colors": "^1.4.0",
    "concurrently": "^6.2.1",
    "cross-env": "^7.0.3",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.4.5",
    "electron": "^30.1.2",
    "esbuild": "^0.18.11",
    "eslint": "^8.55.0",
--- a/packages/playwright-core/ThirdPartyNotices.txt
+++ b/packages/playwright-core/ThirdPartyNotices.txt
@ -16,6 +16,7 @@ This project incorporates components from the projects listed below. The origina
 -	concat-map@0.0.1 (https://github.com/substack/node-concat-map)
 -	debug@4.3.4 (https://github.com/debug-js/debug)
 -	define-lazy-prop@2.0.0 (https://github.com/sindresorhus/define-lazy-prop)
+-	dotenv@16.4.5 (https://github.com/motdotla/dotenv)
 -	end-of-stream@1.4.4 (https://github.com/mafintosh/end-of-stream)
 -	escape-string-regexp@2.0.0 (https://github.com/sindresorhus/escape-string-regexp)
 -	extract-zip@2.0.1 (https://github.com/maxogden/extract-zip)
@ -472,6 +473,34 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 =========================================
 END OF define-lazy-prop@2.0.0 AND INFORMATION

+%% dotenv@16.4.5 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (c) 2015, Scott Motte
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=========================================
+END OF dotenv@16.4.5 AND INFORMATION
+
 %% end-of-stream@1.4.4 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@ -1514,6 +1543,6 @@ END OF yazl@2.5.1 AND INFORMATION

 SUMMARY BEGIN HERE
 =========================================
-Total Packages: 45
+Total Packages: 46
 =========================================
 END OF SUMMARY
--- a/packages/playwright-core/bundles/utils/package-lock.json
+++ b/packages/playwright-core/bundles/utils/package-lock.json
@ -11,6 +11,7 @@
        "colors": "1.4.0",
        "commander": "8.3.0",
        "debug": "^4.3.4",
+        "dotenv": "^16.4.5",
        "graceful-fs": "4.2.10",
        "https-proxy-agent": "5.0.0",
        "jpeg-js": "0.4.4",
@ -198,6 +199,17 @@
        "node": ">=8"
      }
    },
+    "node_modules/dotenv": {
+      "version": "16.4.5",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
    "node_modules/escape-string-regexp": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
@ -560,6 +572,11 @@
      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
    },
+    "dotenv": {
+      "version": "16.4.5",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg=="
+    },
    "escape-string-regexp": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
--- a/packages/playwright-core/bundles/utils/package.json
+++ b/packages/playwright-core/bundles/utils/package.json
@ -12,6 +12,7 @@
    "colors": "1.4.0",
    "commander": "8.3.0",
    "debug": "^4.3.4",
+    "dotenv": "^16.4.5",
    "graceful-fs": "4.2.10",
    "https-proxy-agent": "5.0.0",
    "jpeg-js": "0.4.4",
--- a/packages/playwright-core/bundles/utils/src/utilsBundleImpl.ts
+++ b/packages/playwright-core/bundles/utils/src/utilsBundleImpl.ts
@ -20,6 +20,9 @@ export const colors = colorsLibrary;
 import debugLibrary from 'debug';
 export const debug = debugLibrary;

+import dotenvLibrary from 'dotenv';
+export const dotenv = dotenvLibrary;
+
 export { getProxyForUrl } from 'proxy-from-env';

 export { HttpsProxyAgent } from 'https-proxy-agent';
--- a/packages/playwright-core/src/cli/program.ts
+++ b/packages/playwright-core/src/cli/program.ts
@ -20,7 +20,7 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 import type { Command } from '../utilsBundle';
-import { program } from '../utilsBundle';
+import { program, dotenv } from '../utilsBundle';
 export { program } from '../utilsBundle';
 import { runDriver, runServer, printApiJson, launchBrowserServer } from './driver';
 import { runTraceInBrowser, runTraceViewerApp } from '../server/trace/viewer/traceViewer';
@ -561,6 +561,7 @@ async function open(options: Options, url: string | undefined, language: string)
 async function codegen(options: Options & { target: string, output?: string, testIdAttribute?: string }, url: string | undefined) {
  const { target: language, output: outputFile, testIdAttribute: testIdAttributeName } = options;
  const { context, launchOptions, contextOptions } = await launchContext(options, !!process.env.PWTEST_CLI_HEADLESS, process.env.PWTEST_CLI_EXECUTABLE_PATH);
+  dotenv.config({ path: 'playwright.env' });
  await context._enableRecorder({
    language,
    launchOptions,
--- a/packages/playwright-core/src/utilsBundle.ts
+++ b/packages/playwright-core/src/utilsBundle.ts
@ -19,6 +19,7 @@ import path from 'path';

 export const colors: typeof import('../bundles/utils/node_modules/colors/safe') = require('./utilsBundleImpl').colors;
 export const debug: typeof import('../bundles/utils/node_modules/@types/debug') = require('./utilsBundleImpl').debug;
+export const dotenv: typeof import('../bundles/utils/node_modules/dotenv') = require('./utilsBundleImpl').dotenv;
 export const getProxyForUrl: typeof import('../bundles/utils/node_modules/@types/proxy-from-env').getProxyForUrl = require('./utilsBundleImpl').getProxyForUrl;
 export const HttpsProxyAgent: typeof import('../bundles/utils/node_modules/https-proxy-agent').HttpsProxyAgent = require('./utilsBundleImpl').HttpsProxyAgent;
 export const jpegjs: typeof import('../bundles/utils/node_modules/jpeg-js') = require('./utilsBundleImpl').jpegjs;