diff --git a/src/client/default.nix b/src/client/default.nix index 67d07cd..38a7030 100644 --- a/src/client/default.nix +++ b/src/client/default.nix @@ -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 diff --git a/src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.10.3/dependencies-cache/30ef1c2c9e2d5aa5423f86020cb45ba2.json b/src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.10.3/dependencies-cache/30ef1c2c9e2d5aa5423f86020cb45ba2.json deleted file mode 100644 index 3be874f..0000000 --- a/src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.10.3/dependencies-cache/30ef1c2c9e2d5aa5423f86020cb45ba2.json +++ /dev/null @@ -1 +0,0 @@ -{"direct":{"MartinSStewart/elm-serialize":"1.3.0","elm/core":"1.0.5","elm/json":"1.1.3","elm/project-metadata-utils":"1.0.2","jfmengels/elm-review":"2.13.0","jfmengels/elm-review-common":"1.3.2","jfmengels/elm-review-the-elm-architecture":"1.0.3","jfmengels/elm-review-unused":"1.1.29","sparksp/elm-review-ports":"1.3.1","stil4m/elm-syntax":"7.2.9"},"indirect":{"bburdette/toop":"1.2.0","danfishgold/base64-bytes":"1.1.0","elm/bytes":"1.0.8","elm/html":"1.0.0","elm/parser":"1.1.0","elm/random":"1.0.0","elm/regex":"1.0.0","elm/time":"1.0.0","elm/virtual-dom":"1.0.3","elm-community/list-extra":"8.7.0","elm-explorations/test":"2.1.0","miniBill/elm-unicode":"1.0.3","rtfeldman/elm-hex":"1.0.0","stil4m/structured-writer":"1.0.3"}} diff --git a/src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.10.3/elm-parser/elm-syntax-v7.2.9.js b/src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.11.1/elm-parser/elm-syntax-v7.2.9.js similarity index 100% rename from src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.10.3/elm-parser/elm-syntax-v7.2.9.js rename to src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.11.1/elm-parser/elm-syntax-v7.2.9.js diff --git a/src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.10.3/review-applications/5414ad42e17f20394d190496f60dc260.js b/src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.11.1/review-applications/5414ad42e17f20394d190496f60dc260.js similarity index 100% rename from src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.10.3/review-applications/5414ad42e17f20394d190496f60dc260.js rename to src/client/nix/elm-stuff/generated-code/jfmengels/elm-review/cli/2.11.1/review-applications/5414ad42e17f20394d190496f60dc260.js diff --git a/src/client/nix/node-packages.nix b/src/client/nix/node-packages.nix index 5dec06a..2a2156c 100644 --- a/src/client/nix/node-packages.nix +++ b/src/client/nix/node-packages.nix @@ -400,13 +400,13 @@ let sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="; }; }; - "elm-review-2.10.3" = { + "elm-review-2.11.1" = { name = "elm-review"; packageName = "elm-review"; - version = "2.10.3"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.10.3.tgz"; - sha512 = "9gBqLc5Xm3v9Ncpf8y2haEaBZZyMX25vmwQkrNqSIaNYQ2vdGOIx1eyqRtt1xwX5O8pZdqU8IWC/ENyTrOTKbw=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.11.1.tgz"; + sha512 = "mJJN7QmqlV7HcaLigsiap6X3/7o9idA3bg3h7228iokUmBccpBquakPaShM8BZ/wDYtWg53sevSaFpGniEujFA=="; }; }; "elm-solve-deps-wasm-1.0.2" = { @@ -427,15 +427,6 @@ let sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; }; }; - "elm-tooling-1.14.1" = { - name = "elm-tooling"; - packageName = "elm-tooling"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.14.1.tgz"; - sha512 = "3LjMe2WXdH/0swZsWT6R9RS73NhsqqLjbwS2PF0QmFauCII/9nomOtFFv/DIPOJ3oxbKFltBgvDELMCMdV+Bww=="; - }; - }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -1318,13 +1309,13 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "wrap-ansi-6.2.0" = { + "wrap-ansi-7.0.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "6.2.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; }; "wrap-ansi-8.1.0" = { @@ -1428,7 +1419,7 @@ let sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."eastasianwidth-0.2.0" - sources."elm-review-2.10.3" + sources."elm-review-2.11.1" sources."elm-solve-deps-wasm-1.0.2" (sources."elm-test-0.19.1-revision12" // { dependencies = [ @@ -1437,7 +1428,6 @@ let sources."minimatch-5.1.0" ]; }) - sources."elm-tooling-1.14.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."fastest-levenshtein-1.0.16" @@ -1539,7 +1529,7 @@ let sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" - sources."wrap-ansi-6.2.0" + sources."wrap-ansi-7.0.0" sources."wrap-ansi-cjs-npm:wrap-ansi@7.0.0" sources."wrappy-1.0.2" sources."xmlbuilder-15.1.1" diff --git a/src/client/package-lock.json b/src/client/package-lock.json index 4535e53..3922094 100644 --- a/src/client/package-lock.json +++ b/src/client/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "GNU General Public License, version 3", "devDependencies": { - "elm-review": "^2.10.3", + "elm-review": "^2.11.1", "elm-test": "^0.19.1-revision12" } }, @@ -597,15 +597,15 @@ "dev": true }, "node_modules/elm-review": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/elm-review/-/elm-review-2.10.3.tgz", - "integrity": "sha512-9gBqLc5Xm3v9Ncpf8y2haEaBZZyMX25vmwQkrNqSIaNYQ2vdGOIx1eyqRtt1xwX5O8pZdqU8IWC/ENyTrOTKbw==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/elm-review/-/elm-review-2.11.1.tgz", + "integrity": "sha512-mJJN7QmqlV7HcaLigsiap6X3/7o9idA3bg3h7228iokUmBccpBquakPaShM8BZ/wDYtWg53sevSaFpGniEujFA==", "dev": true, "dependencies": { "chalk": "^4.0.0", "chokidar": "^3.5.2", "cross-spawn": "^7.0.3", - "elm-tooling": "^1.14.1", + "elm-solve-deps-wasm": "^1.0.2", "fastest-levenshtein": "^1.0.16", "find-up": "^4.1.0", "folder-hash": "^3.3.0", @@ -621,7 +621,7 @@ "strip-ansi": "^6.0.0", "terminal-link": "^2.1.1", "which": "^2.0.2", - "wrap-ansi": "^6.2.0" + "wrap-ansi": "^7.0.0" }, "bin": { "elm-review": "bin/elm-review" @@ -703,15 +703,6 @@ "node": ">=10" } }, - "node_modules/elm-tooling": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.14.1.tgz", - "integrity": "sha512-3LjMe2WXdH/0swZsWT6R9RS73NhsqqLjbwS2PF0QmFauCII/9nomOtFFv/DIPOJ3oxbKFltBgvDELMCMdV+Bww==", - "dev": true, - "bin": { - "elm-tooling": "index.js" - } - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1776,9 +1767,9 @@ } }, "node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "dependencies": { "ansi-styles": "^4.0.0", @@ -1786,7 +1777,10 @@ "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/wrap-ansi-cjs": { @@ -2238,15 +2232,15 @@ "dev": true }, "elm-review": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/elm-review/-/elm-review-2.10.3.tgz", - "integrity": "sha512-9gBqLc5Xm3v9Ncpf8y2haEaBZZyMX25vmwQkrNqSIaNYQ2vdGOIx1eyqRtt1xwX5O8pZdqU8IWC/ENyTrOTKbw==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/elm-review/-/elm-review-2.11.1.tgz", + "integrity": "sha512-mJJN7QmqlV7HcaLigsiap6X3/7o9idA3bg3h7228iokUmBccpBquakPaShM8BZ/wDYtWg53sevSaFpGniEujFA==", "dev": true, "requires": { "chalk": "^4.0.0", "chokidar": "^3.5.2", "cross-spawn": "^7.0.3", - "elm-tooling": "^1.14.1", + "elm-solve-deps-wasm": "^1.0.2", "fastest-levenshtein": "^1.0.16", "find-up": "^4.1.0", "folder-hash": "^3.3.0", @@ -2262,7 +2256,7 @@ "strip-ansi": "^6.0.0", "terminal-link": "^2.1.1", "which": "^2.0.2", - "wrap-ansi": "^6.2.0" + "wrap-ansi": "^7.0.0" } }, "elm-solve-deps-wasm": { @@ -2322,12 +2316,6 @@ } } }, - "elm-tooling": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.14.1.tgz", - "integrity": "sha512-3LjMe2WXdH/0swZsWT6R9RS73NhsqqLjbwS2PF0QmFauCII/9nomOtFFv/DIPOJ3oxbKFltBgvDELMCMdV+Bww==", - "dev": true - }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -3090,9 +3078,9 @@ } }, "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { "ansi-styles": "^4.0.0", diff --git a/src/client/package.json b/src/client/package.json index 9f23a7b..810c7df 100644 --- a/src/client/package.json +++ b/src/client/package.json @@ -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": {