From 17dd1c652774300b422fbaf9918b8067050ca73a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 23 Apr 2020 17:04:31 -0400
Subject: [PATCH] Add add-node-modules-path package to lang/javascript

And use it on json-mode.
---
 modules/lang/javascript/autoload.el | 12 ------------
 modules/lang/javascript/config.el   |  3 ++-
 modules/lang/javascript/packages.el |  1 +
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/modules/lang/javascript/autoload.el b/modules/lang/javascript/autoload.el
index a570be4ff..d4633f6b6 100644
--- a/modules/lang/javascript/autoload.el
+++ b/modules/lang/javascript/autoload.el
@@ -83,18 +83,6 @@ Run this for any buffer you want to skewer."
 ;;
 ;; Hooks
 
-;;;###autoload
-(defun +javascript-add-node-modules-path-h ()
-  "Add current project's `node_modules/.bin` to `exec-path', so js tools
-prioritize project-local packages over global ones."
-  (make-local-variable 'exec-path)
-  (cl-pushnew (expand-file-name "node_modules/.bin/"
-                                (or (locate-dominating-file
-                                     (or (buffer-file-name) default-directory)
-                                     "node_modules")
-                                    (doom-project-root)))
-              exec-path :test #'string=))
-
 ;;;###autoload
 (defun +javascript-cleanup-tide-processes-h ()
   "Clean up dangling tsserver processes if there are no more buffers with
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index c2fddb09b..489418de8 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -292,10 +292,11 @@ to tide."
            web-mode
            markdown-mode
            js-mode
+           json-mode
            typescript-mode
            solidity-mode)
   :when (locate-dominating-file default-directory "package.json")
-  :add-hooks '(+javascript-add-node-modules-path-h npm-mode))
+  :add-hooks '(add-node-modules-path npm-mode))
 
 (def-project-mode! +javascript-gulp-mode
   :when (locate-dominating-file default-directory "gulpfile.js"))
diff --git a/modules/lang/javascript/packages.el b/modules/lang/javascript/packages.el
index 5c3f1f9ad..8d4d99010 100644
--- a/modules/lang/javascript/packages.el
+++ b/modules/lang/javascript/packages.el
@@ -11,6 +11,7 @@
 (package! eslintd-fix :pin "0c431141be")
 (package! js2-refactor :pin "d4c40b5fc8")
 (package! npm-mode :pin "3ee7c0bad5")
+(package! add-node-modules-path :pin "f31e69ccb6")
 
 ;; Eval
 (package! nodejs-repl :pin "6fad7d764f")