From d85f09cbed5f3d2501f791e689011ae127df1cbb Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 9 Jan 2022 20:33:53 +0100 Subject: build: Add prettier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit eslint will also enforce prettier rules, so there is no need to call prettier separately in CI. Signed-off-by: Kristóf Marussy --- scripts/watch.js | 101 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 44 deletions(-) (limited to 'scripts/watch.js') diff --git a/scripts/watch.js b/scripts/watch.js index 1345a0f..cf5dbfd 100644 --- a/scripts/watch.js +++ b/scripts/watch.js @@ -15,7 +15,10 @@ const thisDir = fileURLToDirname(import.meta.url); const sharedModule = join(thisDir, '../packages/shared/dist/index.mjs'); /** @type {string} */ -const serviceSharedModule = join(thisDir, '../packages/service-shared/dist/index.mjs'); +const serviceSharedModule = join( + thisDir, + '../packages/service-shared/dist/index.mjs', +); /** @type {RegExp[]} */ const stderrIgnorePatterns = [ @@ -37,7 +40,9 @@ const stderrIgnorePatterns = [ async function setupEsbuildWatcher(packageName, extraPaths, callback) { /** @type {{ default: import('esbuild').BuildOptions }} */ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- Read untyped config file. - const { default: config } = await import(`../packages/${packageName}/esbuild.config.js`); + const { default: config } = await import( + `../packages/${packageName}/esbuild.config.js` + ); config.logLevel = 'info'; config.incremental = true; @@ -55,34 +60,37 @@ async function setupEsbuildWatcher(packageName, extraPaths, callback) { callback(); } watcher.on('change', () => { - incrementalBuild.rebuild?.().then(() => { - if (callback) { - console.log(`\u26a1 Reloading package ${packageName}`); - callback(); - } - }).catch((err) => { - if (typeof err === 'object' && 'errors' in err) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- We just checked. - const { errors } = err; - if (Array.isArray(errors)) { - const errCount = errors.length; - console.error( - '\ud83d\udd25', - errCount, - errCount > 1 ? 'errors' : 'error', - 'while rebuilding package', - packageName, - ); - return; + incrementalBuild + .rebuild?.() + .then(() => { + if (callback) { + console.log(`\u26a1 Reloading package ${packageName}`); + callback(); } - } - console.error( - '\ud83d\udd25', - 'error while rebuilding package', - packageName, - err, - ); - }); + }) + .catch((err) => { + if (typeof err === 'object' && 'errors' in err) { + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- We just checked. + const { errors } = err; + if (Array.isArray(errors)) { + const errCount = errors.length; + console.error( + '\ud83d\udd25', + errCount, + errCount > 1 ? 'errors' : 'error', + 'while rebuilding package', + packageName, + ); + return; + } + } + console.error( + '\ud83d\udd25', + 'error while rebuilding package', + packageName, + err, + ); + }); }); } @@ -136,7 +144,11 @@ function setupServicePackageWatcher(packageName, sendEvent) { */ function setupMainPackageWatcher(viteDevServer) { // Write a value to an environment variable to pass it to the main process. - const { config: { server: { port, https, host } } } = viteDevServer; + const { + config: { + server: { port, https, host }, + }, + } = viteDevServer; const protocol = `http${https ? 's' : ''}:`; const hostOrDefault = typeof host === 'string' ? host : 'localhost'; const portOrDefault = port || 3000; @@ -148,10 +160,7 @@ function setupMainPackageWatcher(viteDevServer) { return setupEsbuildWatcher( 'main', - [ - serviceSharedModule, - sharedModule, - ], + [serviceSharedModule, sharedModule], () => { if (spawnProcess !== null) { spawnProcess.kill('SIGINT'); @@ -191,16 +200,20 @@ async function setupDevEnvironment() { const sharedWatcher = setupEsbuildWatcher('shared'); const serviceSharedWatcher = setupEsbuildWatcher('service-shared'); await Promise.all([ - sharedWatcher.then(() => Promise.all([ - setupPreloadPackageWatcher(sendEvent), - setupDevServer('renderer').then((devServer) => { - viteDevServer = devServer; - }), - ])), - serviceSharedWatcher.then(() => Promise.all([ - setupServicePackageWatcher('service-inject', sendEvent), - setupServicePackageWatcher('service-preload', sendEvent), - ])), + sharedWatcher.then(() => + Promise.all([ + setupPreloadPackageWatcher(sendEvent), + setupDevServer('renderer').then((devServer) => { + viteDevServer = devServer; + }), + ]), + ), + serviceSharedWatcher.then(() => + Promise.all([ + setupServicePackageWatcher('service-inject', sendEvent), + setupServicePackageWatcher('service-preload', sendEvent), + ]), + ), ]); if (viteDevServer === null) { -- cgit v1.2.3-54-g00ecf