cb79db4 · obelisk · git.iko.soy

git.iko.soy/obelisk

asset-manifest: Provide access to the deprecated version as a user setting

commitcb79db42273dd551eef20301e0f976f56f87f6bd authorAli Abrar <aliabrar@gmail.com> dateFri 18 Dec 2020, 00:32 (6 years ago) parent549ce6a

2 files changed+11−5

compare with master

unifiedsplit

ChangeLog.md+1−1 default.nix+10−4

ChangeLog.md+1−1

@@ -6,7 +6,7 @@ This project's release branch is `master`. This log is written from the perspect

77* Use TemplateHaskell to determine asset file paths

88 * Migration: All uses of `static @"some/path"` become `$(static "some/path")`. Instead of requiring `TypeApplications` and `DataKinds`, modules calling `static` must now enable `TemplateHaskell`.

9− * Deprecation: Deprecate static asset modules generated via 'obelisk-asset-manifest-generate' in favor of modules generated via 'obelisk-asset-th-generate'. The new executable takes the same arguments as the old and should be a drop-in replacement.

9+ * Deprecation: Deprecate static asset modules generated via 'obelisk-asset-manifest-generate' in favor of modules generated via 'obelisk-asset-th-generate'. The new executable takes the same arguments as the old and should be a drop-in replacement. To preserve the old behavior, set `__deprecated.useObeliskAssetManifestGenerate = true;` in your obelisk project configuration.

1010 * Feature: Files added to the static directory while `ob run` is active no longer require `ob run` to be restarted

1111

1212## v0.9.1.0

default.nix+10−4

@@ -65,7 +65,7 @@ in rec {

6565 '';

6666 nullIfAbsent = p: if lib.pathExists p then p else null;

6767 #TODO: Avoid copying files within the nix store. Right now, obelisk-asset-manifest-generate copies files into a big blob so that the android/ios static assets can be imported from there; instead, we should get everything lined up right before turning it into an APK, so that copies, if necessary, only exist temporarily.

68− processAssets = { src, packageName ? "obelisk-generated-static", moduleName ? "Obelisk.Generated.Static" }: pkgs.runCommand "asset-manifest" {

68+ processAssets = { src, packageName ? "obelisk-generated-static", moduleName ? "Obelisk.Generated.Static", exe ? "obelisk-asset-th-generate" }: pkgs.runCommand "asset-manifest" {

6969 inherit src;

7070 outputs = [ "out" "haskellManifest" "symlinked" ];

7171 nativeBuildInputs = [ ghcObelisk.obelisk-asset-manifest ];

@@ -73,7 +73,7 @@ in rec {

7373 set -euo pipefail

7474 touch "$out"

7575 mkdir -p "$symlinked"

76− obelisk-asset-th-generate "$src" "$haskellManifest" ${packageName} ${moduleName} "$symlinked"

76+ ${exe} "$src" "$haskellManifest" ${packageName} ${moduleName} "$symlinked"

7777 '';

7878

7979 compressedJs = frontend: optimizationLevel: pkgs.runCommand "compressedJs" {} ''

@@ -237,13 +237,14 @@ in rec {

237237 , withHoogle ? false # Setting this to `true` makes shell reloading far slower

238238 , __closureCompilerOptimizationLevel ? "ADVANCED" # Set this to `null` to skip the closure-compiler step

239239 , __withGhcide ? false

240+ , __deprecated ? {}

240241 }:

241242 let

242243 allConfig = nixpkgs.lib.makeExtensible (self: {

243244 base = base';

244245 inherit args;

245246 userSettings = {

246− inherit android ios packages overrides tools shellToolOverrides withHoogle __closureCompilerOptimizationLevel __withGhcide;

247+ inherit android ios packages overrides tools shellToolOverrides withHoogle __closureCompilerOptimizationLevel __withGhcide __deprecated;

247248 staticFiles = if staticFiles == null then self.base + /static else staticFiles;

248249 };

249250 frontendName = "frontend";

@@ -251,7 +252,12 @@ in rec {

251252 commonName = "common";

252253 staticName = "obelisk-generated-static";

253254 staticFilesImpure = let fs = self.userSettings.staticFiles; in if lib.isDerivation fs then fs else toString fs;

254− processedStatic = processAssets { src = self.userSettings.staticFiles; };

255+ processedStatic = processAssets {

256+ src = self.userSettings.staticFiles;

257+ exe = if lib.attrByPath ["userSettings" "__deprecated" "useObeliskAssetManifestGenerate"] false self

258+ then builtins.trace "obelisk-asset-manifest-generate is deprecated. Use obelisk-asset-th-generate instead." "obelisk-asset-manifest-generate"

259+ else "obelisk-asset-th-generate";

260+ };

255261 # The packages whose names and roles are defined by this package

256262 predefinedPackages = lib.filterAttrs (_: x: x != null) {

257263 ${self.frontendName} = nullIfAbsent (self.base + "/frontend");