Support :optimizations :simple

Author: moea

plugin/project.clj

@@ -1,4 +1,4 @@
-(defproject io.nervous/lein-cljs-lambda "0.6.4"
+(defproject io.nervous/lein-cljs-lambda "0.6.5-SNAPSHOT"
   :description "Deploying Clojurescript functions to AWS Lambda"
   :url "https://github.com/nervous-systems/cljs-lambda"
   :license {:name "Unlicense" :url "http://unlicense.org/UNLICENSE"}

plugin/resources/index.mustache renamed to plugin/resources/index-none.mustache

@@ -0,0 +1,18 @@
+{{#source-map}}
+try {
+    require("source-map-support").install();
+} catch(err) {
+}
+{{/source-map}}
+
+{{#env}}
+process.env.{{key}} = "{{value}}";
+{{/#env}}
+
+var __CLJS_LAMBDA_NS_ROOT = require("./{{output-to}}");
+
+{{#module}}
+{{#function}}
+exports.{{export}} = __CLJS_LAMBDA_NS_ROOT.{{js-name}};
+{{/function}}
+{{/module}}

plugin/resources/index-simple.mustache

@@ -27,9 +27,7 @@
 
 (defn- generate-index [env {:keys [optimizations source-map] :as compiler-opts} fns]
   (let [template (slurp (io/resource
-                         (if (= optimizations :advanced)
-                           "index-advanced.mustache"
-                           "index.mustache")))]
+                         (str "index-" (name optimizations) ".mustache")))]
     (clostache.parser/render
      template
      (assoc compiler-opts

plugin/src/leiningen/cljs_lambda.clj

@@ -4,8 +4,9 @@
   (:import [java.io File]
            [java.nio.file Files LinkOption]
            [java.nio.file.attribute PosixFilePermission]
-           [org.apache.commons.compress.archivers.zip ZipArchiveEntry
-                                                      ZipArchiveOutputStream]))
+           [org.apache.commons.compress.archivers.zip
+            ZipArchiveEntry
+            ZipArchiveOutputStream]))
 
 ;; I don't have time to explain
 (def ^:dynamic *print-files* false)
@@ -55,17 +56,20 @@
           (zip-entry zip-stream file path))))))
 
 (defmulti  stuff-zip (fn [_ {:keys [optimizations]} _] optimizations))
+
+(derive ::advanced ::single-file)
+(derive ::simple   ::single-file)
+
 (defmethod stuff-zip :default [zip-stream {:keys [output-dir]} {:keys [index-path]}]
   (zip-entry zip-stream (io/file index-path) "index.js")
   (zip-below zip-stream (io/file output-dir))
   (zip-below zip-stream (io/file "node_modules")))
 
-(defmethod stuff-zip :advanced [zip-stream {:keys [output-to source-map]} {:keys [index-path]}]
+(defmethod stuff-zip ::single-file [zip-stream {:keys [output-to source-map]} {:keys [index-path]}]
   (zip-entry zip-stream (io/file index-path) "index.js")
   (zip-entry zip-stream (io/file output-to))
   (when (string? source-map)
-    (zip-entry zip-stream (io/file source-map)))
-  (zip-below zip-stream (io/file "node_modules")))
+    (zip-entry zip-stream (io/file source-map))))
 
 (defn write-zip [{:keys [output-dir] :as compiler-opts}
                  {:keys [project-name zip-name resource-dirs] :as spec}]