From a1a66f54453c71dff5f101c5948c74f93df6e811 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 31 Aug 2018 02:51:40 +0200 Subject: [PATCH] lang/javascript: improve project file detection +javascript-npm-mode now uses a better search for package.json, making extra sure that your local node_modules folder is added to exec-path. --- modules/lang/javascript/config.el | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index dbcb6d1b1..9333aa94d 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -253,17 +253,16 @@ ;; Projects ;; +(def-project-mode! +javascript-npm-mode + :modes (html-mode css-mode web-mode js2-mode rjsx-mode json-mode markdown-mode) + :when (locate-dominating-file default-directory "package.json") + :add-hooks (+javascript|add-node-modules-path)) + +(def-project-mode! +javascript-gulp-mode + :when (locate-dominating-file default-directory "gulpfile.js")) + (def-project-mode! +javascript-screeps-mode :match "/screeps\\(?:-ai\\)?/.+$" :modes (+javascript-npm-mode) :add-hooks (+javascript|init-screeps-mode) :on-load (load! "+screeps")) - -(def-project-mode! +javascript-gulp-mode - :files ("gulpfile.js")) - -(def-project-mode! +javascript-npm-mode - :modes (html-mode css-mode web-mode js2-mode rjsx-mode json-mode markdown-mode) - :files ("package.json") - :add-hooks (+javascript|add-node-modules-path)) -