From 62d168fdc99ceca8e88b29518cfebeca0ad2bbdf Mon Sep 17 00:00:00 2001 From: Andre Wiggins Date: Thu, 27 Oct 2022 01:06:41 -0700 Subject: [PATCH] Reuse preinstall script for preact hooks --- benches/proxy-packages/preact-hooks-proxy/scripts.mjs | 10 ++++++++++ benches/proxy-packages/preact-local-proxy/scripts.mjs | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 benches/proxy-packages/preact-hooks-proxy/scripts.mjs diff --git a/benches/proxy-packages/preact-hooks-proxy/scripts.mjs b/benches/proxy-packages/preact-hooks-proxy/scripts.mjs new file mode 100644 index 00000000000..ecedcff3952 --- /dev/null +++ b/benches/proxy-packages/preact-hooks-proxy/scripts.mjs @@ -0,0 +1,10 @@ +import path from 'path'; +import { fileURLToPath } from 'url'; +import { preinstall as localPreinstall } from '../preact-local-proxy/scripts.mjs'; + +export const preinstall = () => + localPreinstall( + (...args) => + path.join(path.dirname(fileURLToPath(import.meta.url)), ...args), + `[preact-hooks-proxy preinstall] ` + ); diff --git a/benches/proxy-packages/preact-local-proxy/scripts.mjs b/benches/proxy-packages/preact-local-proxy/scripts.mjs index 1202fbba88f..7f454f0445b 100644 --- a/benches/proxy-packages/preact-local-proxy/scripts.mjs +++ b/benches/proxy-packages/preact-local-proxy/scripts.mjs @@ -6,9 +6,6 @@ import { repoRoot } from '../../scripts/utils.js'; // @ts-ignore const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const pkgRoot = (...args) => path.join(__dirname, ...args); -const prefix = `[preact-local preinstall] `; -const preactLocalTgz = repoRoot('preact-local.tgz'); /** * Support installing a local build from either a tarball (preact-local.tgz) or @@ -21,8 +18,12 @@ const preactLocalTgz = repoRoot('preact-local.tgz'); * the repo in every benchmark, we copy the prebuilt .tgz file to each job and * use that to avoid rebuilding. See preactjs/preact#3777 for the motivation. */ -export async function preinstall() { - console.log(`${prefix}Searching for preact-local.tgz at ${preactLocalTgz}`) +export async function preinstall( + pkgRoot = (...args) => path.join(__dirname, ...args), + prefix = `[preact-local preinstall] `, + preactLocalTgz = repoRoot('preact-local.tgz') +) { + console.log(`${prefix}Searching for preact-local.tgz at ${preactLocalTgz}`); if (existsSync(preactLocalTgz)) { console.log( `${prefix}preact-local.tgz found! Updating preact-local-proxy/package.json to install that tarball`