Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

make linux work

Browse source
This commit is contained in:
Max Schmitt 2024-10-22 12:09:41 +00:00
parent e10ce26848
commit da44179c05
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/playwright-core/src/server/registry/index.ts
View file

@ -377,8 +377,8 @@ type BrowsersJSONDescriptor = {
dir: string, dir: string,
}; };
function readDescriptors(browsersJSON: BrowsersJSON) { function readDescriptors(browsersJSON: BrowsersJSON): BrowsersJSONDescriptor[] {
return (browsersJSON['browsers']).map(obj => { const descriptors = (browsersJSON['browsers']).map(obj => {
const name = obj.name; const name = obj.name;
const revisionOverride = (obj.revisionOverrides || {})[hostPlatform]; const revisionOverride = (obj.revisionOverrides || {})[hostPlatform];
const revision = revisionOverride || obj.revision; const revision = revisionOverride || obj.revision;
@ -398,13 +398,21 @@ function readDescriptors(browsersJSON: BrowsersJSON) {
}; };
return descriptor; return descriptor;
}); });
const chromium = descriptors.find(d => d.name === 'chromium')!;
descriptors.push({
...chromium,
name: 'chromium-headless-shell',
dir: chromium.dir.replace(/(.*)(-\d+)$/, '$1-headless-shell$2'),
installByDefault: false,
});
return descriptors;
} }
export type BrowserName = 'chromium' | 'firefox' | 'webkit' | 'bidi'; export type BrowserName = 'chromium' | 'firefox' | 'webkit' | 'bidi';
type InternalTool = 'ffmpeg' | 'firefox-beta' | 'chromium-tip-of-tree' | 'chromium-headless-shell' |'android'; type InternalTool = 'ffmpeg' | 'firefox-beta' | 'chromium-tip-of-tree' | 'chromium-headless-shell' |'android';
type BidiChannel = 'bidi-firefox-stable' | 'bidi-firefox-beta' | 'bidi-firefox-nightly' | 'bidi-chrome-canary' | 'bidi-chrome-stable' | 'bidi-chromium'; type BidiChannel = 'bidi-firefox-stable' | 'bidi-firefox-beta' | 'bidi-firefox-nightly' | 'bidi-chrome-canary' | 'bidi-chrome-stable' | 'bidi-chromium';
type ChromiumChannel = 'chrome' | 'chrome-beta' | 'chrome-dev' | 'chrome-canary' | 'msedge' | 'msedge-beta' | 'msedge-dev' | 'msedge-canary'; type ChromiumChannel = 'chrome' | 'chrome-beta' | 'chrome-dev' | 'chrome-canary' | 'msedge' | 'msedge-beta' | 'msedge-dev' | 'msedge-canary';
const allDownloadable = ['chromium', 'firefox', 'webkit', 'ffmpeg', 'firefox-beta', 'chromium-tip-of-tree']; const allDownloadable = ['chromium', 'firefox', 'webkit', 'ffmpeg', 'firefox-beta', 'chromium-tip-of-tree', 'chromium-headless-shell'];
export interface Executable { export interface Executable {
type: 'browser' | 'tool' | 'channel'; type: 'browser' | 'tool' | 'channel';
@ -487,7 +495,7 @@ export class Registry {
_isHermeticInstallation: true, _isHermeticInstallation: true,
}); });
const chromiumHeadlessShell = descriptors.find(d => d.name === 'chromium')!; const chromiumHeadlessShell = descriptors.find(d => d.name === 'chromium-headless-shell')!;
const chromiumHeadlessShellExecutable = findExecutablePath(chromiumHeadlessShell.dir, 'chromium-headless-shell'); const chromiumHeadlessShellExecutable = findExecutablePath(chromiumHeadlessShell.dir, 'chromium-headless-shell');
this._executables.push({ this._executables.push({
type: 'browser', type: 'browser',
@ -496,11 +504,11 @@ export class Registry {
directory: chromiumHeadlessShell.dir, directory: chromiumHeadlessShell.dir,
executablePath: () => chromiumHeadlessShellExecutable, executablePath: () => chromiumHeadlessShellExecutable,
executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('chromium', chromiumHeadlessShellExecutable, chromium.installByDefault, sdkLanguage), executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('chromium', chromiumHeadlessShellExecutable, chromium.installByDefault, sdkLanguage),
installType: chromium.installByDefault ? 'download-by-default' : 'download-on-demand', installType: 'download-on-demand',
_validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, 'chromium', chromium.dir, ['chrome-linux'], [], ['chrome-win']), _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, 'chromium', chromiumHeadlessShell.dir, ['chrome-linux'], [], ['chrome-win']),
downloadURLs: this._downloadURLs(chromium), downloadURLs: this._downloadURLs(chromiumHeadlessShell),
browserVersion: chromium.browserVersion, browserVersion: chromium.browserVersion,
_install: () => this._downloadExecutable(chromium, chromiumHeadlessShellExecutable), _install: () => this._downloadExecutable(chromiumHeadlessShell, chromiumHeadlessShellExecutable),
_dependencyGroup: 'chromium', _dependencyGroup: 'chromium',
_isHermeticInstallation: true, _isHermeticInstallation: true,
}); });