Skip to content

Commit 171299c

Browse files
krausestkrausest
committed
Merge branch 'dmjio-miso-1.1.0.0'
2 parents ad2e612 + 55caecc commit 171299c

19 files changed

+2238
-2687
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@ glimmer-*/tmp
7575
.cargo/
7676
.rustup/
7777
Cargo.lock
78+
79+
# emacs
80+
*~

‎frameworks/keyed/miso/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# miso-0.18.0.0-keyed
1+
# miso-1.1.0.0-keyed
22

33
[Miso](https://haskell-miso.org) is a tasty [Haskell](https://www.haskell.org/) front-end framework.
44

55
## Installation
66

77
All needed `*.js` sources have already been generated in folder [`dist-bundle`](./dist-bundle) to avoid other dependencies of [`Haskell`](http://haskell.org/) and [`Nix`](https://nixos.org/nix/).
88

9-
However, to build everything by yourself you have to use [`Nix`](https://nixos.org/nix/) to run `nix-build` from [`root` of miso-0.18.0.0.-keyed](./).
9+
However, to build everything by yourself you have to use [`Nix`](https://nixos.org/nix/) to run `nix-build` from [`root` of miso-1.1.0.0.-keyed](./).
1010

1111
After that just run `npm run cp-js` (or `yarn cp-js`) to copy generated `*.js` sources from local Nix store to `dist-bundle` folder. This folder is used by running benchmarks.
1212

1313
Now you can start benchmarks by running
1414
```
1515
cd webdriver-ts
16-
yarn selenium --count 3 --framework miso-0.15.0.0-keyed
16+
yarn selenium --count 3 --framework miso-1.1.0.0-keyed
1717
```
1818
(^ see [Running a single framework with the automated benchmark driver](../README#4-running-a-single-framework-with-the-automated-benchmark-driver))
1919

‎frameworks/keyed/miso/default.nix

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
{ pkgs ? import ((import <nixpkgs> {}).fetchFromGitHub {
2-
owner = "NixOS";
3-
repo = "nixpkgs";
4-
rev = "a0aeb23";
5-
sha256 = "04dgg0f2839c1kvlhc45hcksmjzr8a22q1bgfnrx71935ilxl33d";
6-
}){}
7-
}:
1+
with (import (builtins.fetchTarball {
2+
url = "https://github.com/dmjio/miso/archive/5647cfd.tar.gz";
3+
sha256 = "177d99m4q4ab35xr0kdpczxncbx187bwk54z7cr3khp5w9gcq27g";
4+
}) {});
5+
with pkgs.haskell.packages;
86
let
9-
inherit (pkgs) runCommand closurecompiler;
10-
result = import (pkgs.fetchFromGitHub {
11-
owner = "dmjio";
12-
repo = "miso";
13-
rev = "5fcb57ad9fd423bd2d1b38f9e1a7121a0acf3e17";
14-
sha256 = "0vn87hrcds8nmzj358pp9bm28pfml7j1fhancmgmwhl7i91fjdcv";
15-
}) {};
16-
in pkgs.haskell.packages.ghcjs.callPackage ./miso-benchmark-keyed.nix {
17-
miso = result.miso-ghcjs;
18-
}
7+
app = ghcjs.callCabal2nix "miso-benchmark-keyed" ./. {};
8+
in
9+
pkgs.lib.overrideDerivation app (drv: {
10+
postInstall = with pkgs; ''
11+
mkdir -p $out/bin
12+
echo "(window['gc'] = window['gc']);" >> $out/bin/miso-benchmark-keyed.jsexe/all.js
13+
${closurecompiler}/bin/closure-compiler --compilation_level ADVANCED_OPTIMIZATIONS \
14+
--jscomp_off=checkVars \
15+
--externs=$out/bin/miso-benchmark-keyed.jsexe/all.js.externs \
16+
$out/bin/miso-benchmark-keyed.jsexe/all.js > temp.js
17+
mv temp.js $out/bin/all.min.js
18+
rm -r $out/bin/miso-benchmark-keyed.jsexe
19+
'';
20+
})

‎frameworks/keyed/miso/dist-bundle/all.min.js

Lines changed: 889 additions & 2642 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frameworks/keyed/miso/dist-bundle/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<title>Miso v0.18.0</title>
5+
<title>Miso v1.1.0.0</title>
66
<link href="/css/currentStyle.css" rel="stylesheet"/>
77
</head>
88
<body>

‎frameworks/keyed/miso/miso-benchmark-keyed.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ executable miso-benchmark-keyed
1313
Buildable: False
1414
else
1515
hs-source-dirs: src
16-
ghcjs-options: -DGHCJS_BROWSER -O2 -fspecialise-aggressively
16+
ghcjs-options: -DGHCJS_BROWSER -O2 -fspecialise-aggressively -dedupe
1717
build-depends: base < 5
1818
, containers
1919
, random

‎frameworks/keyed/miso/miso-benchmark-keyed.nix

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎frameworks/keyed/miso/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"David Johnson"
99
],
1010
"js-framework-benchmark": {
11-
"frameworkVersion": "0.18.0.0",
11+
"frameworkVersion": "1.1.0.0",
1212
"customURL": "/dist-bundle"
1313
},
1414
"homepage": "https://github.com/krausest/js-framework-benchmark",
@@ -21,7 +21,7 @@
2121
"note": "echo All JS sources have been already generated in folder 'dist-bundle'. && echo However, you can install and build everything by yourself. && echo Just check the README.md to get more details how to do that.",
2222
"build-prod": "npm run note",
2323
"install": "npm run note",
24-
"cp-js": "cp -f result/bin/miso-benchmark-keyed.jsexe/all.min.js ./dist-bundle"
24+
"cp-js": "cp -vf result/bin/all.min.js ./dist-bundle"
2525
},
2626
"keywords": [
2727
"miso",

‎frameworks/keyed/miso/src/Main.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ viewTable m@Model{selectedId=idx} =
210210
[ span_
211211
[class_ "glyphicon glyphicon-remove remove"
212212
, onClick (Remove i)
213+
, textProp "aria-hidden" "true"
213214
]
214215
[]
215216
]
@@ -232,7 +233,7 @@ viewJumbotron =
232233
[ class_ "col-md-6" ]
233234
[ h1_
234235
[]
235-
[ text "miso-0.18.0.0-keyed" ]
236+
[ text "miso-1.1.0.0-keyed" ]
236237
]
237238
, div_
238239
[ class_ "col-md-6" ]

‎frameworks/non-keyed/miso/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dist
2+
result
3+
4+
miso-latest.json
5+
nixpkgs-latest.json

0 commit comments

Comments
 (0)