make :manifest optional; bump 0.1.10

mvc-works · Dec 13, 2018 · 9e62b3e · 9e62b3e
1 parent 524fbf0
commit 9e62b3e
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /target
 .shadow-cljs/
 .nrepl-port
+.xml
diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ Shell Page (generator)
               :scripts ["main.js"]
               :inline-html ""
               :append-html ""
+              :app-manifest "manifest.json"
               :viewport "width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"})
 
 (shell-page.core/make-page app-html configs) ; returns string of html

diff --git a/calcit.edn b/calcit.edn
diff --git a/meyvn.edn b/meyvn.edn
@@ -1,7 +1,7 @@
 
 {:pom {:group-id "mvc-works",
        :artifact-id "shell-page",
-       :version "0.1.9",
+       :version "0.1.10",
        :name "Genetate index.html with Respo"}
  :packaging {:jar {:enabled true
                    :remote-repository {:id "clojars"

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "http-server": "^0.11.1",
-    "shadow-cljs": "^2.6.21"
+    "shadow-cljs": "^2.7.9"
   },
   "dependencies": {}
 }
diff --git a/src/shell_page/core.cljs b/src/shell_page/core.cljs
@@ -16,7 +16,7 @@
      {}
      (<> title (:title resources) nil)
      (link {:rel "icon", :type "image/png", :href (:icon resources)})
-     (link {:rel "manifest", :href "manifest.json"})
+     (when-let [manifest (:manifest resources)] (link {:rel "manifest", :href manifest}))
      (meta' {:charset "utf8"})
      (meta'
       {:name "viewport",

diff --git a/src/shell_page/main.cljs b/src/shell_page/main.cljs
@@ -13,4 +13,5 @@
      :inline-styles [".app{color:#aaa;}"],
      :scripts ["/main.js"],
      :inline-html "<script>console.log('nothing')</script>",
-     :append-html "<script>console.log('appended');</script>"})))
+     :append-html "<script>console.log('appended');</script>",
+     :manifest "manifest.json"})))
diff --git a/yarn.lock b/yarn.lock
@@ -618,10 +618,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.0.tgz#e25c4fa57c0b405096250884b164c112654a06a3"
   integrity sha512-KReNVgFVM2ZPPGCP8rsCPqtlee/+SwXyoeEqbAXBO7jlpoNnNee2x4fiRg/Pr/vXGEkV/Ez5l4qdNSU1Na+1Jg==
 
-shadow-cljs@^2.6.21:
-  version "2.6.21"
-  resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.6.21.tgz#f93f2bda89cf2561c6ec1d59c902fe9831a1ed62"
-  integrity sha512-kBQ4caEXGhSLo0AkAo46hhf5y/Kifw1ZWvM4Vw7h5SxXDT4AZkOi0xrwGhqW5H+cxBk2ReNdqMERhvvBLNuz6A==
+shadow-cljs@^2.7.9:
+  version "2.7.9"
+  resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.7.9.tgz#389e712b2a4c66cb5fbefb7c655614bef0877d14"
+  integrity sha512-3g3dijT5ztwukidXDyhda6AaPrFge5j9b69SUOzXXqgVr6JDslcCOY/l0midF1c15uT9GDx/JoprRlkRhPWgaA==
   dependencies:
     mkdirp "^0.5.1"
     node-libs-browser "^2.0.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ @@
     /target
     .shadow-cljs/
     .nrepl-port
+    .xml