emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/{web,javascript}: remove +web-bower-mode; refactor react, phaser & angular detection

Browse source
This commit is contained in:
Henrik Lissner 2017-04-01 23:54:30 -04:00
parent dd8c3d0d1e
commit 53b9e92fd7
4 changed files with 19 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/lang/javascript/autoload.el
View file

@ -14,6 +14,18 @@ ignore the cache."
(json-read-file package-file)))
(puthash project-root json +javascript-npm-conf))))))
;;;###autoload
(defun +javascript-npm-dep-p (packages &optional project-root refresh-p)
(when-let (data (and (bound-and-true-p +javascript-npm-mode)
(+javascript-npm-conf)))
(let ((deps (append (cdr (assq 'dependencies data))
(cdr (assq 'devDependencies data)))))
(funcall (if (eq (car packages) 'and)
'cl-every
'cl-some)
(lambda (pkg) (assq pkg deps))
(if (listp packages) packages (list packages))))))
;;;###autoload
(defun +javascript/repl ()
"Open a Javascript REPL. Meaning either `skewer-repl', if any of the

15
modules/lang/javascript/config.el
View file

@ -164,21 +164,6 @@
:modes (html-mode css-mode web-mode js2-mode markdown-mode)
:files "package.json")
(def-project-mode! +javascript-phaser-mode
:modes (+javascript-npm-mode)
:when
(let* ((project-root (doom-project-root))
(bower (and (bound-and-true-p +web-bower-mode)
(+web-bower-conf project-root)))
(npm (and (bound-and-true-p +javascript-npm-mode)
(+javascript-npm-conf project-root)))
(deps (append (cdr (assq 'dependencies bower))
(cdr (assq 'dependencies npm))
(cdr (assq 'devDependencies bower))
(cdr (assq 'devDependencies npm)))))
(or (assq 'phaser deps)
(assq 'phaser-ce deps))))
(def-project-mode! +javascript-lb6-mode
:modes (web-mode js2-mode nxml-mode markdown-mode)
:match "\\.lb\\(action\\|ext\\)/"

13
modules/lang/web/autoload/web.el
View file

@ -1,15 +1,2 @@
;;; lang/web/autoload/web.el
(defvar +web-bower-conf (make-hash-table :test 'equal))
;;;###autoload
(defun +web-bower-conf (&optional project-root refresh-p)
"Retrieves an alist of this project's 'bower.json'. If REFRESH-P is non-nil
ignore the cache."
(let ((project-root (or project-root (doom-project-root))))
(or (and (not refresh-p)
(gethash project-root +web-bower-conf))
(let ((package-file (expand-file-name "bower.json" project-root)))
(when-let (json (and (file-exists-p package-file)
(json-read-file package-file)))
(puthash project-root json +web-bower-conf))))))

25
modules/lang/web/config.el
View file

@ -31,21 +31,9 @@
;; Frameworks
;;
(def-project-mode! +web-bower-mode
:files "bower.json")
(def-project-mode! +web-angularjs-mode
:modes (+javascript-npm-mode +web-bower-mode)
:when
(let* ((project-root (doom-project-root))
(bower (and (bound-and-true-p +web-bower-mode)
(+web-bower-conf project-root)))
(npm (and (bound-and-true-p +javascript-npm-mode)
(+javascript-npm-conf project-root))))
(assq 'angular (append (cdr (assq 'dependencies bower))
(cdr (assq 'dependencies npm))
(cdr (assq 'devDependencies bower))
(cdr (assq 'devDependencies npm))))))
:modes (+javascript-npm-mode)
:when (+javascript-npm-dep-p 'angular))
(def-project-mode! +web-jekyll-mode
:modes (web-mode js-mode coffee-mode css-mode haml-mode pug-mode)
@ -61,7 +49,8 @@
(def-project-mode! +web-react-mode
:modes (+javascript-npm-mode)
:when
(when-let (npm (+javascript-npm-conf))
(assq 'react (append (cdr (assq 'dependencies npm))
(cdr (assq 'devDependencies npm))))))
:when (+javascript-npm-dep-p 'react))
(def-project-mode! +web-phaser-mode
:modes (+javascript-npm-mode)
:when (+javascript-npm-dep-p '(or phaser phaser-ce)))