From 4073540ebc75a9d97d2a96ba3d85a92701d87776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Meireles?= Date: Thu, 15 Dec 2022 21:22:55 +0000 Subject: [PATCH] drop workaround for the now fixed github.com/evanw/esbuild/issues/1958 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: António Meireles --- esbuild.config.cjs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/esbuild.config.cjs b/esbuild.config.cjs index 4e252dd..5e10e58 100644 --- a/esbuild.config.cjs +++ b/esbuild.config.cjs @@ -1,19 +1,7 @@ -const fs = require('fs') +const fs = require('node:fs') const esbuild = require('esbuild') -// XXX taken from https://github.com/evanw/esbuild/issues/619#issuecomment-751995294 -// XXX `plugins: [makeAllPackagesExternalPlugin]` were supposed to be superceeded by -// XXX `external: ['./node_modules/*']` but... -// XXX ... we're blocked by what seems to be https://github.com/evanw/esbuild/issues/1958 -const makeAllPackagesExternalPlugin = { - name: 'make-all-packages-external', - setup: (build) => { - const filter = /^[^./]|^\.[^./]|^\.\.[^/]/ // Must not start with "/" or "./" or "../" - build.onResolve({ filter }, (arguments_) => ({ external: true, path: arguments_.path })) - } -} - const catcher = (error) => { console.error(error) // eslint-disable-next-line unicorn/no-process-exit @@ -34,7 +22,7 @@ const builder = (entryPoints, outdir = 'dist', platform = targets.Node) => sourcemap: true, sourcesContent: false, ...(platform === targets.Node - ? { plugins: [makeAllPackagesExternalPlugin], target: 'node14' } + ? { packages: 'external', target: 'node14' } : { inject: ['src/ui/react-shim.ts'], jsxFactory: 'h',