From patchwork Fri Oct 6 13:05:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Wurmus X-Patchwork-Id: 54526 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 63C1C27BBEA; Fri, 6 Oct 2023 14:07:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7272A27BBE2 for ; Fri, 6 Oct 2023 14:07:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qokXW-0006k1-3s; Fri, 06 Oct 2023 09:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qokXT-0006jJ-GR for guix-patches@gnu.org; Fri, 06 Oct 2023 09:06:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qokXT-00076z-7M for guix-patches@gnu.org; Fri, 06 Oct 2023 09:06:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qokXl-0000ut-VS; Fri, 06 Oct 2023 09:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66371] [PATCH] build-system/minify: Use esbuild. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Fri, 06 Oct 2023 13:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66371@debbugs.gnu.org Cc: Ricardo Wurmus , Ricardo Wurmus X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Ricardo Wurmus Received: via spool by submit@debbugs.gnu.org id=B.16965975693450 (code B ref -1); Fri, 06 Oct 2023 13:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Oct 2023 13:06:09 +0000 Received: from localhost ([127.0.0.1]:49405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qokWu-0000tZ-DU for submit@debbugs.gnu.org; Fri, 06 Oct 2023 09:06:08 -0400 Received: from lists.gnu.org ([2001:470:142::17]:50560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qokWr-0000t4-Qw for submit@debbugs.gnu.org; Fri, 06 Oct 2023 09:06:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qokWE-0004tT-Fg for guix-patches@gnu.org; Fri, 06 Oct 2023 09:05:32 -0400 Received: from sender4-of-o51.zoho.com ([136.143.188.51]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qokWB-0006t1-2w for guix-patches@gnu.org; Fri, 06 Oct 2023 09:05:25 -0400 Delivered-To: rekado@elephly.net ARC-Seal: i=1; a=rsa-sha256; t=1696597517; cv=none; d=zohomail.com; s=zohoarc; b=BCGZPMeLLgUtw/HdcXV7/FkTX7nePeYp8n7qOUyAwy4/kIFtpR/HujWhGvjZfpK9giAPv9se6sCSLiJ05ulQf/FtrUs0Qh7rT7fXDQLKXFU+qafzhMuMKbDqnHx74ld3lJwol+dze9nZDES4Q8npgvoQwJBBgW9scDeFmWZtJmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696597517; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=E0l3+F/FwpQeIf14TCW++HerW3EsZAQeWYNQtaV9+00=; b=YmH2RnP434rZEv3yQsP2LZMP4T07Ch/NIHBTaInXlWEzL9f3uUL9O3DFWJmCXPZ5+iynW3rBKFQ0FnyVLaYBwLHVoAA8kmlC6UFBHk4xbKC368rIKSfNJh3p5Ontp84XReonVsUQQRNrf1YIKlNKxTImVvjB1RzJX1hg7SgPjIs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1696597517; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=E0l3+F/FwpQeIf14TCW++HerW3EsZAQeWYNQtaV9+00=; b=aRBR9UvAQ+T+zaWPQe0YQPN6lPV+5sqH+OOCNw9Vf4Eb2GKjlvBMRsEfPldSlj56 Bj5xl/7n/x+C1wywfbH9lbQmpsuffmvLhgBViK0tQY7m8E7bc2aoIODl5e17aI9dC5n K7wz+QgmvpBc1leOy3r0AWvUjAL7w947/LcOvIVo= Received: from localhost (141.80.247.39 [141.80.247.39]) by mx.zohomail.com with SMTPS id 1696597515689523.6608758732273; Fri, 6 Oct 2023 06:05:15 -0700 (PDT) From: Ricardo Wurmus Message-ID: <156392b64d9bf2457592970daedf1d92db4e36a1.1696597510.git.rekado@elephly.net> Date: Fri, 6 Oct 2023 15:05:10 +0200 X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.51; envelope-from=rekado@elephly.net; helo=sender4-of-o51.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/minify.scm (default-uglify-js): Replace this procedure... (default-esbuild): ...with this new procedure. (lower): Use it, and add "esbuild" to build inputs. * guix/build/minify-build-system.scm (minify): Invoke esbuild instead of setting up a pipe to uglifyjs. * gnu/packages/cran.scm (r-shiny)[native-inputs]: Replace node-uglify-js with esbuild. * gnu/packages/statistics.scm (r-dt)[native-inputs]: Same. --- gnu/packages/cran.scm | 2 +- gnu/packages/statistics.scm | 2 +- guix/build-system/minify.scm | 12 ++++++------ guix/build/minify-build-system.scm | 14 ++++---------- 4 files changed, 12 insertions(+), 18 deletions(-) base-commit: 8d27ef1ed34a0a7fe14fd76f31541b62d0125498 prerequisite-patch-id: c5d3a52f7522a8f71a15b1d8c0a63c0d24fde78f diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3e72a082ec..af5749b0d0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4591,7 +4591,7 @@ (define-public r-shiny (inputs (list js-datatables js-selectize js-strftime js-highlight)) (native-inputs - `(("uglifyjs" ,node-uglify-js) + `(("esbuild" ,esbuild) ("gfortran" ,gfortran) ("js-bootstrap-accessibility" ,(origin diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 61eec5ecd9..aa2094ecdb 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4069,7 +4069,7 @@ (define-public r-dt (list js-selectize)) (native-inputs `(("r-knitr" ,r-knitr) - ("uglifyjs" ,node-uglify-js) + ("esbuild" ,esbuild) ("datatables-plugins" ,(let ((version "1.13.4")) (origin diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index 787235deeb..b377b506b5 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2023 Ricardo Wurmus ;;; Copyright © 2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. @@ -41,15 +41,15 @@ (define %minify-build-system-modules `((guix build minify-build-system) ,@%gnu-build-system-modules)) -(define (default-uglify-js) +(define (default-esbuild) "Return the default package to minify JavaScript source files." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((mod (resolve-interface '(gnu packages uglifyjs)))) - (module-ref mod 'uglifyjs))) + (let ((mod (resolve-interface '(gnu packages web)))) + (module-ref mod 'esbuild))) (define* (lower name #:key source inputs native-inputs outputs system - (uglify-js (default-uglify-js)) + (esbuild (default-esbuild)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." @@ -64,7 +64,7 @@ (define* (lower name '()) ,@inputs ,@(standard-packages))) - (build-inputs `(("uglify-js" ,uglify-js) + (build-inputs `(("esbuild" ,esbuild) ,@native-inputs)) (outputs outputs) (build minify-build) diff --git a/guix/build/minify-build-system.scm b/guix/build/minify-build-system.scm index 5789ca3f0f..ea2428fa76 100644 --- a/guix/build/minify-build-system.scm +++ b/guix/build/minify-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2023 Ricardo Wurmus ;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -24,7 +24,6 @@ (define-module (guix build minify-build-system) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) - #:use-module (ice-9 popen) #:export (%standard-phases minify-build minify)) @@ -39,14 +38,9 @@ (define-module (guix build minify-build-system) (define* (minify file #:key target (directory "")) (format #t "minifying ~a\n" file) (let* ((base (basename file ".js")) - (installed (or target (string-append directory base ".min.js"))) - (minified (open-pipe* OPEN_READ "uglifyjs" file))) - (call-with-output-file installed - (cut dump-port minified <>)) - (match (close-pipe minified) - (0 #t) - (status - (error "uglify-js failed" status))))) + (installed (or target (string-append directory base ".min.js")))) + (invoke "esbuild" file "--minify" + (string-append "--outfile=" installed)))) (define* (build #:key javascript-files #:allow-other-keys)