diff --git a/elm-tooling.json b/elm-tooling.json index cda20a32..3f827298 100644 --- a/elm-tooling.json +++ b/elm-tooling.json @@ -2,7 +2,7 @@ "tools": { "elm": "0.19.1", "elm-format": "0.8.5", - "elm-json": "0.2.10", - "elm-test-rs": "2.0.1" + "elm-json": "0.2.13", + "elm-test-rs": "3.0.0" } } diff --git a/elm.json b/elm.json index f59bc142..dff16885 100644 --- a/elm.json +++ b/elm.json @@ -76,8 +76,7 @@ "vito/elm-ansi": "10.0.1 <= v < 11.0.0" }, "test-dependencies": { - "avh4/elm-program-test": "3.1.0 <= v < 4.0.0", - "elm-explorations/test": "1.2.2 <= v < 2.0.0", - "the-sett/elm-pretty-printer": "3.0.0 <= v < 4.0.0" + "the-sett/elm-pretty-printer": "3.0.0 <= v < 4.0.0", + "elm-explorations/test": "2.0.1 <= v < 3.0.0" } } diff --git a/examples/base-path/package-lock.json b/examples/base-path/package-lock.json index b23efc3f..887d98d2 100644 --- a/examples/base-path/package-lock.json +++ b/examples/base-path/package-lock.json @@ -17,7 +17,7 @@ }, "../..": { "name": "elm-pages", - "version": "3.0.0-beta.9", + "version": "3.0.0-beta.10", "integrity": "sha512-VeCbtSNH5CW2G5m/uJcTYSRIQ2Y6bhYTZtRbNftKUBXn/oIMYrB6sqrUqV+WVTBs2hedCQQYZnaeZ/uWxqcIwQ==", "dev": true, "license": "BSD-3-Clause", @@ -58,9 +58,9 @@ "cypress": "^10.6.0", "elm-codegen": "^0.2.0", "elm-optimize-level-2": "^0.1.5", - "elm-review": "^2.7.4", - "elm-test": "^0.19.1-revision9", - "elm-tooling": "^1.8.0", + "elm-review": "^2.8.2", + "elm-test": "^0.19.1-revision10", + "elm-tooling": "^1.10.0", "elm-verify-examples": "^5.2.0", "elmi-to-json": "^1.2.0", "mocha": "^10.0.0", @@ -1571,9 +1571,9 @@ "elm-doc-preview": "^5.0.5", "elm-hot": "^1.1.6", "elm-optimize-level-2": "^0.1.5", - "elm-review": "^2.7.4", - "elm-test": "^0.19.1-revision9", - "elm-tooling": "^1.8.0", + "elm-review": "^2.8.2", + "elm-test": "^0.19.1-revision10", + "elm-tooling": "^1.10.0", "elm-verify-examples": "^5.2.0", "elmi-to-json": "^1.2.0", "esbuild": "^0.15.5", diff --git a/examples/escaping/package-lock.json b/examples/escaping/package-lock.json index cc0ef203..142ea2f5 100644 --- a/examples/escaping/package-lock.json +++ b/examples/escaping/package-lock.json @@ -15,7 +15,7 @@ }, "../..": { "name": "elm-pages", - "version": "3.0.0-beta.9", + "version": "3.0.0-beta.10", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -55,9 +55,9 @@ "cypress": "^10.6.0", "elm-codegen": "^0.2.0", "elm-optimize-level-2": "^0.1.5", - "elm-review": "^2.7.4", - "elm-test": "^0.19.1-revision9", - "elm-tooling": "^1.8.0", + "elm-review": "^2.8.2", + "elm-test": "^0.19.1-revision10", + "elm-tooling": "^1.10.0", "elm-verify-examples": "^5.2.0", "elmi-to-json": "^1.2.0", "mocha": "^10.0.0", @@ -5938,9 +5938,9 @@ "elm-doc-preview": "^5.0.5", "elm-hot": "^1.1.6", "elm-optimize-level-2": "^0.1.5", - "elm-review": "^2.7.4", - "elm-test": "^0.19.1-revision9", - "elm-tooling": "^1.8.0", + "elm-review": "^2.8.2", + "elm-test": "^0.19.1-revision10", + "elm-tooling": "^1.10.0", "elm-verify-examples": "^5.2.0", "elmi-to-json": "^1.2.0", "esbuild": "^0.15.5", diff --git a/examples/routing/elm.json b/examples/routing/elm.json index c723c739..c7bc8b89 100644 --- a/examples/routing/elm.json +++ b/examples/routing/elm.json @@ -25,9 +25,9 @@ "elm/regex": "1.0.0", "elm/time": "1.0.0", "elm/url": "1.0.0", - "elm/virtual-dom": "1.0.2", + "elm/virtual-dom": "1.0.3", "elm-community/dict-extra": "2.4.0", - "elm-community/list-extra": "8.3.0", + "elm-community/list-extra": "8.7.0", "jluckyiv/elm-utc-date-strings": "1.0.0", "justinmimbs/date": "4.0.1", "lamdera/codecs": "1.0.0", @@ -41,7 +41,7 @@ "rtfeldman/elm-iso8601-date-strings": "1.1.4", "the-sett/elm-pretty-printer": "3.0.0", "the-sett/elm-syntax-dsl": "6.0.2", - "turboMaCk/non-empty-list-alias": "1.2.0", + "turboMaCk/non-empty-list-alias": "1.3.1", "vito/elm-ansi": "10.0.1" }, "indirect": { @@ -58,7 +58,7 @@ }, "test-dependencies": { "direct": { - "elm-explorations/test": "1.2.2" + "elm-explorations/test": "2.0.1" }, "indirect": { "elm/random": "1.0.0" diff --git a/examples/routing/package-lock.json b/examples/routing/package-lock.json index e02846fa..fcc4dffc 100644 --- a/examples/routing/package-lock.json +++ b/examples/routing/package-lock.json @@ -17,7 +17,7 @@ }, "../..": { "name": "elm-pages", - "version": "3.0.0-beta.9", + "version": "3.0.0-beta.10", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -57,9 +57,9 @@ "cypress": "^10.6.0", "elm-codegen": "^0.2.0", "elm-optimize-level-2": "^0.1.5", - "elm-review": "^2.7.4", - "elm-test": "^0.19.1-revision9", - "elm-tooling": "^1.8.0", + "elm-review": "^2.8.2", + "elm-test": "^0.19.1-revision10", + "elm-tooling": "^1.10.0", "elm-verify-examples": "^5.2.0", "elmi-to-json": "^1.2.0", "mocha": "^10.0.0", @@ -1512,9 +1512,9 @@ "elm-doc-preview": "^5.0.5", "elm-hot": "^1.1.6", "elm-optimize-level-2": "^0.1.5", - "elm-review": "^2.7.4", - "elm-test": "^0.19.1-revision9", - "elm-tooling": "^1.8.0", + "elm-review": "^2.8.2", + "elm-test": "^0.19.1-revision10", + "elm-tooling": "^1.10.0", "elm-verify-examples": "^5.2.0", "elmi-to-json": "^1.2.0", "esbuild": "^0.15.5", diff --git a/generator/dead-code-review/elm.json b/generator/dead-code-review/elm.json index 11cf5544..fe96f368 100644 --- a/generator/dead-code-review/elm.json +++ b/generator/dead-code-review/elm.json @@ -9,18 +9,19 @@ "direct": { "elm/core": "1.0.5", "elm-community/result-extra": "2.4.0", - "jfmengels/elm-review": "2.4.2", - "stil4m/elm-syntax": "7.2.5" + "jfmengels/elm-review": "2.10.0", + "stil4m/elm-syntax": "7.2.9" }, "indirect": { + "elm/bytes": "1.0.8", "elm/html": "1.0.0", "elm/json": "1.1.3", "elm/parser": "1.1.0", "elm/project-metadata-utils": "1.0.2", "elm/random": "1.0.0", "elm/time": "1.0.0", - "elm/virtual-dom": "1.0.2", - "elm-community/list-extra": "8.3.0", + "elm/virtual-dom": "1.0.3", + "elm-community/list-extra": "8.7.0", "miniBill/elm-unicode": "1.0.2", "rtfeldman/elm-hex": "1.0.0", "stil4m/structured-writer": "1.0.3" @@ -28,7 +29,7 @@ }, "test-dependencies": { "direct": { - "elm-explorations/test": "1.2.2" + "elm-explorations/test": "2.0.1" }, "indirect": {} } diff --git a/generator/dead-code-review/src/Pages/Review/DeadCodeEliminateData.elm b/generator/dead-code-review/src/Pages/Review/DeadCodeEliminateData.elm index 57da46a4..d13ccf94 100644 --- a/generator/dead-code-review/src/Pages/Review/DeadCodeEliminateData.elm +++ b/generator/dead-code-review/src/Pages/Review/DeadCodeEliminateData.elm @@ -62,6 +62,7 @@ toImportContext import_ = rule : Rule rule = Rule.newModuleRuleSchemaUsingContextCreator "Pages.Review.DeadCodeEliminateData" initialContext + |> Rule.providesFixesForModuleRule |> Rule.withExpressionEnterVisitor expressionVisitor |> Rule.withDeclarationEnterVisitor declarationVisitor |> Rule.withImportVisitor importVisitor diff --git a/generator/review/elm.json b/generator/review/elm.json index 774bdd83..44df10a3 100644 --- a/generator/review/elm.json +++ b/generator/review/elm.json @@ -11,23 +11,23 @@ "elm/html": "1.0.0", "elm/regex": "1.0.0", "elm-community/result-extra": "2.4.0", - "jfmengels/elm-review": "2.4.2", + "jfmengels/elm-review": "2.10.0", "mdgriffith/elm-codegen": "2.0.0", - "stil4m/elm-syntax": "7.2.5", + "stil4m/elm-syntax": "7.2.9", "the-sett/elm-syntax-dsl": "6.0.2" }, "indirect": { "Chadtech/elm-bool-extra": "2.4.2", + "elm/bytes": "1.0.8", "elm/json": "1.1.3", "elm/parser": "1.1.0", "elm/project-metadata-utils": "1.0.2", "elm/random": "1.0.0", "elm/time": "1.0.0", - "elm/virtual-dom": "1.0.2", + "elm/virtual-dom": "1.0.3", "elm-community/basics-extra": "4.1.0", - "elm-community/list-extra": "8.3.0", + "elm-community/list-extra": "8.7.0", "elm-community/maybe-extra": "5.3.0", - "elm-explorations/test": "1.2.2", "miniBill/elm-unicode": "1.0.2", "rtfeldman/elm-hex": "1.0.0", "stil4m/structured-writer": "1.0.3", @@ -36,7 +36,7 @@ }, "test-dependencies": { "direct": { - "elm-explorations/test": "1.2.2" + "elm-explorations/test": "2.0.1" }, "indirect": {} } diff --git a/package-lock.json b/package-lock.json index 0553308f..3f3b6a1c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "elm-optimize-level-2": "^0.1.5", "elm-review": "^2.8.2", "elm-test": "^0.19.1-revision10", - "elm-tooling": "^1.8.0", + "elm-tooling": "^1.10.0", "elm-verify-examples": "^5.2.0", "elmi-to-json": "^1.2.0", "mocha": "^10.0.0", @@ -1957,9 +1957,9 @@ } }, "node_modules/elm-tooling": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.8.0.tgz", - "integrity": "sha512-IjMvW/VHqxLidlJSAocBGDBmqiZ1NS0lK/UCMRU4ULEEaTVjpSd/9Dv0mH2ok0H0egSTYx19GnrdL4Lq9h+z+A==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.10.0.tgz", + "integrity": "sha512-fMLXs7xHpr6LodtmvVJKepYC6chgSOfe5Hgv8GcFO+Id7O/CuT9+CAfrlzYxvBn91cm6ekWwHFDjPD765v5iBA==", "dev": true, "bin": { "elm-tooling": "index.js" @@ -8145,9 +8145,9 @@ } }, "elm-tooling": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.8.0.tgz", - "integrity": "sha512-IjMvW/VHqxLidlJSAocBGDBmqiZ1NS0lK/UCMRU4ULEEaTVjpSd/9Dv0mH2ok0H0egSTYx19GnrdL4Lq9h+z+A==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.10.0.tgz", + "integrity": "sha512-fMLXs7xHpr6LodtmvVJKepYC6chgSOfe5Hgv8GcFO+Id7O/CuT9+CAfrlzYxvBn91cm6ekWwHFDjPD765v5iBA==", "dev": true }, "elm-verify-examples": { diff --git a/package.json b/package.json index 5b452cdb..7950f5c6 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "elm-optimize-level-2": "^0.1.5", "elm-review": "^2.8.2", "elm-test": "^0.19.1-revision10", - "elm-tooling": "^1.8.0", + "elm-tooling": "^1.10.0", "elm-verify-examples": "^5.2.0", "elmi-to-json": "^1.2.0", "mocha": "^10.0.0", diff --git a/test.sh b/test.sh index aee712a2..ae88791c 100755 --- a/test.sh +++ b/test.sh @@ -1,10 +1,10 @@ set -ex; root=`pwd` yes | lamdera reset || true -elm-test-rs --compiler=lamdera -cd examples/routing && npm i && npm run build && elm-test-rs --compiler=lamdera && cd $root -(cd generator/dead-code-review && elm-test-rs --compiler=lamdera) -(cd generator/review && elm-test-rs --compiler=lamdera) +npx elm-test-rs --compiler=lamdera +cd examples/routing && npm i && npm run build && npx elm-test-rs --compiler=lamdera && cd $root +(cd generator/dead-code-review && npx elm-test-rs --compiler=lamdera) +(cd generator/review && npx elm-test-rs --compiler=lamdera) npm run test:snapshot npx elmi-to-json --version elm-verify-examples --run-tests --elm-test-args '--compiler=lamdera' diff --git a/tests/StaticHttpRequestsTests.elm b/tests/StaticHttpRequestsTests.elm index 0ef517a7..618f055e 100644 --- a/tests/StaticHttpRequestsTests.elm +++ b/tests/StaticHttpRequestsTests.elm @@ -68,8 +68,11 @@ all = (\actualPorts -> case actualPorts of [ ToJsPayload.PageProgress portData ] -> - portData.is404 - |> Expect.false "Expected page to be found and rendered" + if portData.is404 then + Expect.fail "Expected page to be found and rendered" + + else + Expect.pass _ -> Expect.fail <| "Expected exactly 1 port of type PageProgress. Instead, got \n" ++ Debug.toString actualPorts