Migrate to yarn; drop bower

n2o · Dec 16, 2018 · e5c2dbb · e5c2dbb
1 parent edaa357
commit e5c2dbb
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,7 +32,8 @@ figwheel_server.log
 *.iml
 *.css
 *.css.map
-bower_components
+node_modules
 compiled
 .sass-cache
 .#*
+*.log
diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1 @@
+--modules-folder resources/public/node_modules
diff --git a/README.md b/README.md
@@ -17,6 +17,9 @@ All common JDKs should work. I used a workaround [from this
 issue](https://github.com/bhauman/lein-figwheel/issues/612) to make it
 compatible to JDK9 until Clojure and ClojureScript are fully JDK9-compatible.
 
+Also [Leiningen](https://leiningen.org/) and [yarn](https://yarnpkg.com/en/) /
+[npm](https://www.npmjs.com/) are necessary to build the project.
+
 ## Usage
 
 Set your desired options in
@@ -34,11 +37,11 @@ Then start the development server as seen in the Setup section.
 
 Download the dependency reveal.js (specified in `bower.json`) with:
 
-    bower install
+    yarn install
 
 or clone the repository:
 
-    git clone [email protected]:hakimel/reveal.js.git resources/public/bower_components/reveal.js
+    git clone [email protected]:hakimel/reveal.js.git resources/public/node_modules/reveal.js
 
 To get an interactive development environment run:
 

diff --git a/package.json b/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "reveal-cljs",
+  "version": "1.0.0",
+  "description": "A ClojureScript wrapper for reveal.js",
+  "main": "reveal.core",
+  "dependencies": {
+    "reveal.js": "hakimel/reveal.js#3.7.0"
+  },
+  "devDependencies": {},
+  "repository": {
+    "type": "git",
+    "url": "[email protected]:n2o/reveal-cljs.git"
+  },
+  "author": "Christian Meter",
+  "license": "MIT"
+}
diff --git a/resources/public/index.html b/resources/public/index.html
@@ -3,16 +3,16 @@
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="bower_components/reveal.js/css/reveal.css">
-    <link rel="stylesheet" href="bower_components/reveal.js/css/theme/white.css">
+    <link rel="stylesheet" href="node_modules/reveal.js/css/reveal.css">
+    <link rel="stylesheet" href="node_modules/reveal.js/css/theme/white.css">
   </head>
   <body>
     <div class="reveal">
       <div class="slides" id="slides"></div>
     </div>
 
-    <script src="bower_components/reveal.js/lib/js/head.min.js" type="text/javascript"></script>
-    <script src="bower_components/reveal.js/js/reveal.js" type="text/javascript"></script>
+    <script src="node_modules/reveal.js/lib/js/head.min.js" type="text/javascript"></script>
+    <script src="node_modules/reveal.js/js/reveal.js" type="text/javascript"></script>
     <script src="js/compiled/reveal_cljs.js" type="text/javascript"></script>
   </body>
 </html>
diff --git a/src/reveal/core.cljs b/src/reveal/core.cljs
@@ -11,7 +11,7 @@
                        :progress    true
                        :transition  "fade"                    ; e.g. none/fade/slide/convex/concave/zoom
                        :slideNumber false
-                       :dependencies  [{:src "bower_components/reveal.js/plugin/notes/notes.js"
+                       :dependencies  [{:src "node_modules/reveal.js/plugin/notes/notes.js"
                                         :async true}]}))
 
 

diff --git a/yarn.lock b/yarn.lock
@@ -0,0 +1,7 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+reveal.js@hakimel/reveal.js#3.7.0:
+  version "3.7.0"
+  resolved "https://codeload.github.com/hakimel/reveal.js/tar.gz/2c5396b7d347f8ee1344016f15b93d4f78401569"