Skip to content

Commit

Permalink
Bump elm-review from 2.10.3 to 2.11.1 in /src/client
Browse files Browse the repository at this point in the history
* generate a new elm-stuff cache with the new 'elm-review
  prepare-offline' command

* use the new '--offline' switch in default.nix, and drop all the
  hackery that had been used to accomplish the same thing.

* regenerate node-packages.nix with:
  node2nix node2nix -o nix/node-packages.nix -c nix/package.nix -e nix/node-env.nix -l package-lock.json --nodejs-18 --development

original dependabot commit message:

Bumps [elm-review](https://github.com/jfmengels/node-elm-review) from 2.10.3 to 2.11.1.
- [Release notes](https://github.com/jfmengels/node-elm-review/releases)
- [Changelog](https://github.com/jfmengels/node-elm-review/blob/main/CHANGELOG.md)
- [Commits](jfmengels/node-elm-review@v2.10.3...v2.11.1)

---
updated-dependencies:
- dependency-name: elm-review
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
jerith666 committed Mar 25, 2024
1 parent 3ce3ab7 commit beda283
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 79 deletions.
28 changes: 4 additions & 24 deletions src/client/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,39 +56,19 @@ let
cp -iv .htaccess $out;
'';

# running the elm-review check is tricky. elm-review uses
# elm-tooling to install elm-json. then it uses elm-json to
# inject its dependencies alongside those of the project.
# finally it runs elm to compile a review-application. all of
# this of course expects to download various things from
# package.elm-lang.org and other places.
doCheck = true;
checkPhase = ''
ln -vs ${nodeDependencies}/lib/node_modules ./node_modules
# do elm-tooling's work for it by pre-populating an elm-json binary in the location it wants
# note: we fib about its version
export NO_ELM_TOOLING_INSTALL=true;
mkdir -p $ELM_HOME/elm-tooling/elm-json/0.2.10
ln -s ${elmPackages.elm-json}/bin/elm-json $ELM_HOME/elm-tooling/elm-json/0.2.10/elm-json
mkdir -p $ELM_HOME/elm-tooling/elm-json/0.2.13
ln -s ${elmPackages.elm-json}/bin/elm-json $ELM_HOME/elm-tooling/elm-json/0.2.13/elm-json
# do some of elm-json's work for it by pre-populating its versions.dat file
cp -R $ELM_HOME/0.19.1 $ELM_HOME/elm-json
cp -R ${versionsDat} $ELM_HOME/elm-json/versions.dat
chmod ugo+w $ELM_HOME/elm-json/versions.dat
# pre-populate some more elm-review -> elm-json caches,
# including the generated review application. if any *.elm or
# elm.json file changes, new versions of this stuff will need
# to be copied into nix/elm-stuff.
# pre-populate the generated elm-review application.
# use 'elm-review prepare-offline' to generate new versions
# of these caches
mkdir -p elm-stuff/generated-code/jfmengels/;
cp -R ${elmStuffElmReview} elm-stuff/generated-code/jfmengels/elm-review/;
chmod -R ugo+w elm-stuff/generated-code/;
echo; echo running elm-review ...
./node_modules/.bin/elm-review
./node_modules/.bin/elm-review --offline
echo; echo running elm-test ...
./node_modules/.bin/elm-test --seed 20221126
Expand Down

This file was deleted.

30 changes: 10 additions & 20 deletions src/client/nix/node-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 21 additions & 33 deletions src/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "",
"main": "elbum.js",
"devDependencies": {
"elm-review": "^2.10.3",
"elm-review": "^2.11.1",
"elm-test": "^0.19.1-revision12"
},
"scripts": {
Expand Down

0 comments on commit beda283

Please sign in to comment.