Merge pull request #456 from miniBill/generator-cleanup

Generator cleanup
dillonkearns · Apr 25, 2024 · f27ca58 · f27ca58
2 parents 7851061 + 3ad8f74
commit f27ca58
Show file tree

Hide file tree

Showing 12 changed files with 510 additions and 822 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "examples/todos/send-grid"]
 	path = examples/todos/send-grid
 	url = https://github.com/MartinSStewart/send-grid
-[submodule "codegen/elm-codegen"]
-	path = codegen/elm-codegen
-	url = https://github.com/dillonkearns/elm-codegen
diff --git a/codegen/GenerateMain.elm b/codegen/GenerateMain.elm
diff --git a/codegen/elm-codegen b/codegen/elm-codegen
diff --git a/codegen/elm.codegen.json b/codegen/elm.codegen.json
@@ -11,7 +11,8 @@
             "elm/browser": "1.0.2"
         },
         "local": [
-            "src/"
+            "src/",
+            "generator/template/app/"
         ]
     }
 }
diff --git a/codegen/elm.json b/codegen/elm.json
@@ -2,8 +2,7 @@
     "type": "application",
     "source-directories": [
         ".",
-        "../src/",
-        "elm-codegen/src"
+        "../src/"
     ],
     "elm-version": "0.19.1",
     "dependencies": {
@@ -13,6 +12,7 @@
             "elm/html": "1.0.0",
             "elm/json": "1.1.3",
             "elm/regex": "1.0.0",
+            "mdgriffith/elm-codegen": "4.2.1",
             "rtfeldman/elm-hex": "1.0.0",
             "stil4m/elm-syntax": "7.2.9",
             "the-sett/elm-pretty-printer": "3.0.0",

diff --git a/examples/base-path/package-lock.json b/examples/base-path/package-lock.json
diff --git a/examples/escaping/package-lock.json b/examples/escaping/package-lock.json
diff --git a/examples/routing/elm.json b/examples/routing/elm.json
@@ -31,6 +31,8 @@
             "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",
+            "lamdera/core": "1.0.0",
             "matheus23/elm-default-tailwind-modules": "4.0.1",
             "mdgriffith/elm-codegen": "4.1.1",
             "miniBill/elm-codec": "2.1.0",

diff --git a/examples/routing/package-lock.json b/examples/routing/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "@types/node": "^20.10.7",
     "@types/serve-static": "^1.15.5",
     "cypress": "^13.6.2",
-    "elm-codegen": "0.3.0",
+    "elm-codegen": "^0.5.2",
     "elm-optimize-level-2": "^0.3.5",
     "elm-review": "^2.10.3",
     "elm-test": "^0.19.1-revision12",

diff --git a/test.sh b/test.sh
@@ -1,9 +1,10 @@
 set -ex;
 yes | lamdera reset || true
-npx elm-test-rs
-(cd examples/routing && yes | lamdera reset || true && npm i && npm run build && npx elm-test-rs)
-(cd generator/dead-code-review && npx elm-test-rs)
-(cd generator/review && npx elm-test-rs)
+npm run build:generator
+npx elm-test-rs --compiler lamdera
+(cd examples/routing && yes | lamdera reset || true && npm i && npm run build && npx elm-test-rs --compiler lamdera)
+(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'