From e523eca5c0c05066b0898effc613bcf24f99fd8f Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 10 May 2018 14:50:43 +0100
Subject: [PATCH] Use rjsx-mode for ReactJS instead of web-mode

---
 modules/siren-jsx.el         | 19 +++++++++++++++++--
 modules/siren-prettier-js.el | 16 ++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 modules/siren-prettier-js.el

diff --git a/modules/siren-jsx.el b/modules/siren-jsx.el
index 26599ec..548ad1c 100644
--- a/modules/siren-jsx.el
+++ b/modules/siren-jsx.el
@@ -6,8 +6,23 @@
 
 ;;; Code:
 
-(require 'siren-web-mode)
-(add-to-list 'auto-mode-alist '("\\.jsx\\'" . web-mode))
+(require 'siren-prettier-js)
+
+(use-package rjsx-mode
+  :mode "components\\/.*\\.js\\'"
+
+  :hook (rjsx-mode . siren-rjsx-mode-setup)
+
+  :init
+  (defun siren-rjsx-mode-setup ()
+    (siren-prog-mode-setup)
+
+    (prettier-js-mode)
+    (company-mode +1)
+    (subword-mode +1)
+    (hs-minor-mode 1)
+    (highlight-indentation-current-column-mode)
+    (hideshowvis-enable)))
 
 (provide 'siren-jsx)
 ;;; siren-jsx.el ends here
diff --git a/modules/siren-prettier-js.el b/modules/siren-prettier-js.el
new file mode 100644
index 0000000..453062a
--- /dev/null
+++ b/modules/siren-prettier-js.el
@@ -0,0 +1,16 @@
+;;; siren-prettier-js.el --- jimeh's Emacs Siren: prettier-js configuration.
+
+;;; Commentary:
+
+;; Basic configuration for prettier-js package
+
+;;; Code:
+
+(use-package prettier-js
+  :hook (prettier-js-mode . siren-prettier-js-mode-setup)
+
+  :init
+  (defun siren-prettier-js-mode-setup ()))
+
+(provide 'siren-prettier-js)
+;;; siren-prettier-js.el ends here