diff --git a/CHANGELOG.develop b/CHANGELOG.develop index 12baf6cc2652..64f1b616e299 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -1739,7 +1739,6 @@ Benner and Paweł Siudak): (thanks to Sylvain Benner) - Open =.jsx= files with =rjsx-mode= (thanks to Thomas de Beauchêne) - Fixes React imports when using web beautify. (thanks to Ismael) -- Prefer eslint_d to eslint (thanks to Seong Yong-ju) **** Ruby - Add support for =org-babel= (thanks to Muneeb Shaikh) - Highlight debugger keywords (thanks to Alexander Berezovsky and Eivind Fonn) diff --git a/layers/+frameworks/react/packages.el b/layers/+frameworks/react/packages.el index 0b93e4f48afc..6ed09a751245 100644 --- a/layers/+frameworks/react/packages.el +++ b/layers/+frameworks/react/packages.el @@ -45,8 +45,7 @@ (with-eval-after-load 'flycheck (dolist (checker '(javascript-eslint javascript-standard)) (flycheck-add-mode checker 'rjsx-mode))) - (spacemacs/enable-flycheck 'rjsx-mode) - (add-hook 'rjsx-mode-hook #'spacemacs//javascript-setup-eslint t)) + (spacemacs/enable-flycheck 'rjsx-mode)) (defun react/post-init-js-doc () (add-hook 'rjsx-mode-hook 'spacemacs/js-doc-require) diff --git a/layers/+lang/javascript/funcs.el b/layers/+lang/javascript/funcs.el index 18412d214241..d49925284313 100644 --- a/layers/+lang/javascript/funcs.el +++ b/layers/+lang/javascript/funcs.el @@ -65,13 +65,6 @@ (message (concat "Tern was configured as the javascript backend but " "the `tern' layer is not present in your `.spacemacs'!")))) - -;; flycheck - -(defun spacemacs//javascript-setup-eslint () - (when-let ((found (executable-find "eslint_d"))) - (set (make-local-variable 'flycheck-javascript-eslint-executable) found))) - ;; js-doc diff --git a/layers/+lang/javascript/packages.el b/layers/+lang/javascript/packages.el index 6aad3db33262..595a62614e3d 100644 --- a/layers/+lang/javascript/packages.el +++ b/layers/+lang/javascript/packages.el @@ -45,8 +45,7 @@ (add-hook 'js2-mode-local-vars-hook #'spacemacs//javascript-setup-company)) (defun javascript/post-init-flycheck () - (spacemacs/enable-flycheck 'js2-mode) - (add-hook 'js2-mode-hook #'spacemacs//javascript-setup-eslint t)) + (spacemacs/enable-flycheck 'js2-mode)) (defun javascript/post-init-ggtags () (add-hook 'js2-mode-local-vars-hook #'spacemacs/ggtags-mode-enable))