diff mbox series

[bug#67019,v2,13/16] gnu: js-commander: Install as a node module.

Message ID 2dbd50a275174556a071bc7047823c80fa20ee67.1700161584.git.philip@philipmcgrath.com
State New
Headers show
Series gnu: Add KaTeX, lessc, and flow-remove-types. | expand

Commit Message

Philip McGrath Nov. 16, 2023, 7:15 p.m. UTC 
Previously, NPM would not find 'commander' when resolving dependencies.

In case anyone is using it, keep building the bundled version at
'share/javascript/commander/index.min.js', too.

* gnu/packages/javascript.scm (js-commander)[build-system]: Use
'node-build-system'.
[arguments]: Delete unpackaged 'devDependencies'.  Build bundle for
compatibility.
---
 gnu/packages/javascript.scm | 52 ++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 15 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index c62b23a4c4..97cb3b6270 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -7,6 +7,7 @@ 
 ;;; Copyright © 2021 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Frank Pursel <frank.pursel@gmail.com>
+;;; Copyright © 2023 Philip McGrath <philip@philipmcgrath.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -42,6 +43,7 @@  (define-module (gnu packages javascript)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system minify)
+  #:use-module (guix build-system node)
   #:use-module (guix build-system trivial)
   #:use-module (guix utils))
 
@@ -384,22 +386,42 @@  (define-public js-commander
        (sha256
         (base32
          "1xwh85kbxj76ni41r2h0apl8mjbfcnmxzzp3vlspq30w8kwfckni"))))
-    (build-system trivial-build-system)
+    (build-system node-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (chdir (assoc-ref %build-inputs "source"))
-         (let ((esbuild (search-input-file %build-inputs "/bin/esbuild"))
-               (target (string-append %output "/share/javascript/commander")))
-           (invoke esbuild
-                   "--bundle"
-                   "--minify"
-                   "--tsconfig=tsconfig.json"
-                   "--platform=node"
-                   (string-append "--outfile=" target "/index.min.js")
-                   "index.js")))))
+     (list
+      #:tests? #f ; many more dependencies
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'patch-dependencies 'delete-dependencies
+            (lambda args
+              (delete-dependencies `(;; devDependencies
+                                     "@types/jest"
+                                     "@types/node"
+                                     "@typescript-eslint/eslint-plugin"
+                                     "@typescript-eslint/parser"
+                                     "eslint"
+                                     "eslint-config-standard"
+                                     "eslint-config-standard-with-typescript"
+                                     "eslint-plugin-import"
+                                     "eslint-plugin-jest"
+                                     "eslint-plugin-n"
+                                     "eslint-plugin-promise"
+                                     "jest"
+                                     "ts-jest"
+                                     "tsd"
+                                     "typescript"))))
+          (add-after 'install 'install-compat
+            (lambda args
+              ;; This is what this package built before adopting
+              ;; node-build-system.  Does anything use it?
+              (invoke "esbuild"
+                      "--bundle"
+                      "--minify"
+                      "--platform=node"
+                      (string-append "--outfile="
+                                     #$output
+                                     "/share/javascript/commander/index.min.js")
+                      "index.js"))))))
     (native-inputs
      (list esbuild))
     (home-page "https://github.com/tj/commander.js")