added CI back

fulcrologic · Sep 20, 2019 · f59db3c · f59db3c
1 parent 0418688
commit f59db3c
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 35 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,36 @@
+version: 2
+jobs:
+  cljs:
+    docker:
+      - image: circleci/clojure:openjdk-8-tools-deps-node-browsers
+    steps:
+      - checkout
+      - restore_cache:
+          key: cljs-{{ checksum "deps.edn" }}-{{ checksum "package.json" }}
+      - run: npm install
+      - run: npx shadow-cljs -v compile ci-tests
+      - run: ls -l target
+      - run: npx karma start --single-run
+      - save_cache:
+                paths:
+                  - node_modules
+                  - ~/.m2
+                key: cljs-{{ checksum "deps.edn" }}-{{ checksum "package.json" }}
+  clj:
+    docker: 
+      - image: circleci/clojure:tools-deps-1.9.0.394
+    steps:
+      - checkout
+      - restore_cache:
+          key: clj-{{ checksum "deps.edn" }}
+      - run: clojure -A:dev:test:clj-tests
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: clj-{{ checksum "deps.edn" }}
+workflows:
+  version: 2
+  fullstack:
+    jobs:
+      - clj
+      - cljs
diff --git a/package.json b/package.json
@@ -15,5 +15,11 @@
     "shadow-cljs": "2.8.54"
   },
   "author": "Tony Kay",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "highlight.js": "9.15.10",
+    "react-grid-layout": "0.16.6",
+    "react-icons": "2.2.7",
+    "reakit": "0.11.2"
+  }
 }
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -1,36 +1,24 @@
-{:deps     {:aliases [:test :dev :provided :book :workspaces]}
- :nrepl    {:port 9000}
- :jvm-opts ["-Xmx2G"]
- :builds   {:book       {:target     :browser
-                         :output-dir "docs/js/book"
-                         :asset-path "/js/book"
-                         :modules    {:book {:entries [book.main]}
-                                      ; For the dynamic code splitting demo
-                                      :main {:entries    [book.demos.dynamic-ui-main]
-                                             :depends-on #{:book}}}
-                         :devtools   {:preloads  [fulcro.inspect.preload]
-                                      :http-root "resources/public"
-                                      :http-port 9001}}
+{:deps   {:aliases [:test :dev :workspaces]}
+ :nrepl  {:port 9000}
+ :builds {:test       {:target           :browser-test
+                       :test-dir         "resources/public/js/test"
+                       :ns-regexp        "-spec$"
+                       :compiler-options {:static-fns false} ; required for mocking to work
+                       :devtools         {:http-port          9002
+                                          :http-resource-root "public"
+                                          :http-root          "resources/public/js/test"}}
 
-            :test       {:target           :browser-test
-                         :test-dir         "resources/public/js/test"
-                         :ns-regexp        "-spec$"
-                         :compiler-options {:static-fns false} ; required for mocking to work
-                         :devtools         {:http-port          9002
-                                            :http-resource-root "public"
-                                            :http-root          "resources/public/js/test"}}
+          :ci-tests   {:target           :karma
+                       :js-options       {:js-provider :shadow}
+                       :compiler-options {:static-fns false} ; required for mocking to work
+                       :output-to        "target/ci.js"
+                       :ns-regexp        "-spec$"}
 
-            :ci-tests   {:target           :karma
-                         :js-options       {:js-provider :shadow}
-                         :compiler-options {:static-fns false} ; required for mocking to work
-                         :output-to        "target/ci.js"
-                         :ns-regexp        "-spec$"}
-
-            :workspaces {:target           nubank.workspaces.shadow-cljs.target
-                         :ns-regexp        "-ws$"
-                         :output-dir       "resources/public/js/workspaces"
-                         :asset-path       "js/workspaces"
-                         :devtools         {:http-port          9003
-                                            :http-resource-root "public"
-                                            :http-root          "resources/public"}}}}
+          :workspaces {:target     nubank.workspaces.shadow-cljs.target
+                       :ns-regexp  "-ws$"
+                       :output-dir "resources/public/js/workspaces"
+                       :asset-path "js/workspaces"
+                       :devtools   {:http-port          9003
+                                    :http-resource-root "public"
+                                    :http-root          "resources/public"}}}}
 
diff --git a/src/main/com/fulcrologic/fulcro_i18n/i18n.cljc b/src/main/com/fulcrologic/fulcro_i18n/i18n.cljc
@@ -14,7 +14,7 @@
   6. Have translators generate PO files for each locale you desire, and place those where your server can serve them.
 
   See the Developer's Guide for more details."
-  #?(:cljs (:require-macros fulcro.i18n))
+  #?(:cljs (:require-macros com.fulcrologic.fulcro-i18n.i18n))
   (:require
     [com.fulcrologic.fulcro.application :as app]
     [com.fulcrologic.fulcro.mutations :refer [defmutation]]