From 3448a4097bed3a075efbb85ed145c60b94f88753 Mon Sep 17 00:00:00 2001 From: Alex Rudenko Date: Thu, 22 Feb 2024 15:30:58 +0100 Subject: [PATCH] build: fix windows build (#11975) --- packages/puppeteer-core/Herebyfile.mjs | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/puppeteer-core/Herebyfile.mjs b/packages/puppeteer-core/Herebyfile.mjs index 3a692f961f8e2..972a080ba0de2 100644 --- a/packages/puppeteer-core/Herebyfile.mjs +++ b/packages/puppeteer-core/Herebyfile.mjs @@ -5,7 +5,8 @@ */ import {mkdir, readFile, readdir, writeFile} from 'fs/promises'; import Module from 'node:module'; -import {join, dirname} from 'path/posix'; +import path from 'path'; +import posixPath from 'path/posix'; import esbuild from 'esbuild'; import {execa} from 'execa'; @@ -99,13 +100,13 @@ export const buildTask = task({ }); const builders = []; for (const format of formats) { - const folder = join('lib', format, 'third_party'); + const folder = posixPath.join('lib', format, 'third_party'); for (const name of packages) { - const path = join(folder, name, `${name}.js`); + const entrypoint = posixPath.join(folder, name, `${name}.js`); builders.push( await esbuild.build({ - entryPoints: [path], - outfile: path, + entryPoints: [entrypoint], + outfile: entrypoint, bundle: true, allowOverwrite: true, format, @@ -118,22 +119,27 @@ export const buildTask = task({ switch (name) { case 'rxjs': license = await readFile( - `${dirname(require.resolve('rxjs'))}/../../LICENSE.txt`, + path.join( + path.dirname(require.resolve('rxjs')), + '..', + '..', + 'LICENSE.txt' + ), 'utf-8' ); break; case 'mitt': license = await readFile( - `${dirname(require.resolve('mitt'))}/../LICENSE`, + path.join(path.dirname(require.resolve('mitt')), '..', 'LICENSE'), 'utf-8' ); break; default: throw new Error(`Add license handling for ${path}`); } - const content = await readFile(path, 'utf-8'); + const content = await readFile(entrypoint, 'utf-8'); await writeFile( - path, + entrypoint, `/** ${license} */