git.iko.soy/obelisk
on master help sign in
Merge pull request #345 from obsidiansystems/ts-skip-closure-compiler

Allow skipping closure-compiler

commitefaeb215c50c90861b0cf13a2399d485206f0baf authorAli Abrar <aliabrar@gmail.com> dateMon 19 Aug 2019, 08:40 (7 years ago) parent2b2be130fb37f1
2 files changed+10−5
compare with master
unifiedsplit
default.nix+8−4 skeleton/default.nix+2−1
default.nix+8−4
@@ -157,12 +157,16 @@ in rec {
157157 obelisk-asset-manifest-generate "$src" "$haskellManifest" ${packageName} ${moduleName} "$symlinked"
158158 '';
159159
160− compressedJs = frontend: optimizationLevel: pkgs.runCommand "compressedJs" { buildInputs = [ pkgs.closurecompiler ]; } ''
160+ compressedJs = frontend: optimizationLevel: pkgs.runCommand "compressedJs" {} ''
161161 mkdir $out
162162 cd $out
163163 ln -s "${haskellLib.justStaticExecutables frontend}/bin/frontend.jsexe/all.js" all.unminified.js
164− closure-compiler --externs "${reflex-platform.ghcjsExternsJs}" -O ${optimizationLevel} --jscomp_warning=checkVars --create_source_map="all.js.map" --source_map_format=V3 --js_output_file="all.js" all.unminified.js
165− echo "//# sourceMappingURL=all.js.map" >> all.js
164+ ${if optimizationLevel == null then ''
165+ ln -s all.unminified.js all.js
166+ '' else ''
167+ ${pkgs.closurecompiler}/bin/closure-compiler --externs "${reflex-platform.ghcjsExternsJs}" -O ${optimizationLevel} --jscomp_warning=checkVars --create_source_map="all.js.map" --source_map_format=V3 --js_output_file="all.js" all.unminified.js
168+ echo "//# sourceMappingURL=all.js.map" >> all.js
169+ ''}
166170 '';
167171
168172 serverModules = {
@@ -269,7 +273,7 @@ in rec {
269273 , tools ? _: []
270274 , shellToolOverrides ? _: _: {}
271275 , withHoogle ? false # Setting this to `true` makes shell reloading far slower
272− , __closureCompilerOptimizationLevel ? "ADVANCED"
276+ , __closureCompilerOptimizationLevel ? "ADVANCED" # Set this to `null` to skip the closure-compiler step
273277 }:
274278 let frontendName = "frontend";
275279 backendName = "backend";
skeleton/default.nix+2−1
@@ -6,6 +6,7 @@
66 # Uncomment and set this to `true` to indicate your acceptance:
77 # config.android_sdk.accept_license = false;
88 }
9+, projectOverrides ? {}
910}:
1011with obelisk;
1112project ./. ({ ... }: {
@@ -13,4 +14,4 @@ project ./. ({ ... }: {
1314 android.displayName = "Obelisk Minimal Example";
1415 ios.bundleIdentifier = "systems.obsidian.obelisk.examples.minimal";
1516 ios.bundleName = "Obelisk Minimal Example";
16−})
17+} // projectOverrides)