Merge pull request #8 from Punie/0.19

Support Elm 0.19
NoRedInk · Aug 28, 2018 · b852160 · b852160
2 parents ae1c1bf + f6c758c
commit b852160
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 53 deletions.
diff --git a/index.js b/index.js
@@ -71,14 +71,14 @@ function findAllDependencies(file, knownDependencies, sourceDirectories, knownFi
 }
 
 // Given a source directory (containing top-level Elm modules), locate the
-// elm-package.json file that includes it and get all its source directories.
+// elm.json file that includes it and get all its source directories.
 function getElmPackageSourceDirectories(baseDir, currentDir) {
   if (typeof currentDir === "undefined") {
     baseDir = path.resolve(baseDir);
     currentDir = baseDir;
   }
 
-  var elmPackagePath = path.join(currentDir, 'elm-package.json');
+  var elmPackagePath = path.join(currentDir, 'elm.json');
   if (fs.existsSync(elmPackagePath)) {
     var sourceDirectories = getSourceDirectories(elmPackagePath);
     if (_.includes(sourceDirectories, baseDir)) {

diff --git a/test/dependencies.js b/test/dependencies.js
@@ -65,22 +65,22 @@ describe("#findAllDependencies", function() {
     });
   });
 
-  it("ignores an elm-package.json file that does not list the module's source directory", function() {
+  it("ignores an elm.json file that does not list the module's source directory", function() {
     return findAllDependencies(prependFixturesDir("other-src/OtherParent.elm")).then(function(results) {
       expect(results).to.deep.equal(
         [ "Test/ChildA.elm" ].map(prependFixturesDir)
       );
     });
   });
 
-  it("ignores an elm-package.json file missing the source-directories key", function() {
-    return findAllDependencies(prependFixturesDir("no-source-directories-elm-package-json/Main.elm")).then(function(results) {
+  it("ignores an elm.json file missing the source-directories key", function() {
+    return findAllDependencies(prependFixturesDir("no-source-directories-elm-json/Main.elm")).then(function(results) {
       expect(results).to.deep.equal([]);
     });
   });
 
-  it("gracefully ignores malformed elm-package.json files", function() {
-    return findAllDependencies(prependFixturesDir("malformed-elm-package-json/Main.elm")).then(function(results) {
+  it("gracefully ignores malformed elm.json files", function() {
+    return findAllDependencies(prependFixturesDir("malformed-elm-json/Main.elm")).then(function(results) {
       expect(results).to.deep.equal([]);
     })
   });

diff --git a/test/fixtures/elm-package.json b/test/fixtures/elm-package.json
diff --git a/test/fixtures/elm.json b/test/fixtures/elm.json
@@ -0,0 +1,25 @@
+{
+    "type": "application",
+    "source-directories": [
+        ".",
+        "other-src"
+    ],
+    "elm-version": "0.19.0",
+    "dependencies": {
+        "direct": {
+            "elm/browser": "1.0.0",
+            "elm/core": "1.0.0",
+            "elm/html": "1.0.0",
+            "elm/json": "1.0.0"
+        },
+        "indirect": {
+            "elm/time": "1.0.0",
+            "elm/url": "1.0.0",
+            "elm/virtual-dom": "1.0.0"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}
diff --git a/...tures/malformed-elm-package-json/Main.elm → test/fixtures/malformed-elm-json/Main.elm b/...tures/malformed-elm-package-json/Main.elm → test/fixtures/malformed-elm-json/Main.elm
diff --git a/...lformed-elm-package-json/elm-package.json → test/fixtures/malformed-elm-json/elm.json b/...lformed-elm-package-json/elm-package.json → test/fixtures/malformed-elm-json/elm.json
diff --git a/...rce-directories-elm-package-json/Main.elm → ...s/no-source-directories-elm-json/Main.elm b/...rce-directories-elm-package-json/Main.elm → ...s/no-source-directories-elm-json/Main.elm
diff --git a/test/fixtures/no-source-directories-elm-json/elm.json b/test/fixtures/no-source-directories-elm-json/elm.json
@@ -0,0 +1,22 @@
+{
+    "type": "application",
+    "source-directories": [],
+    "elm-version": "0.19.0",
+    "dependencies": {
+        "direct": {
+            "elm/browser": "1.0.0",
+            "elm/core": "1.0.0",
+            "elm/html": "1.0.0",
+            "elm/json": "1.0.0"
+        },
+        "indirect": {
+            "elm/time": "1.0.0",
+            "elm/url": "1.0.0",
+            "elm/virtual-dom": "1.0.0"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}
diff --git a/test/fixtures/no-source-directories-elm-package-json/elm-package.json b/test/fixtures/no-source-directories-elm-package-json/elm-package.json
diff --git a/test/fixtures/other-src/elm-package.json b/test/fixtures/other-src/elm-package.json
diff --git a/test/fixtures/other-src/elm.json b/test/fixtures/other-src/elm.json
@@ -0,0 +1,24 @@
+{
+    "type": "application",
+    "source-directories": [
+        "bad-directory-does-not-exist"
+    ],
+    "elm-version": "0.19.0",
+    "dependencies": {
+        "direct": {
+            "elm/browser": "1.0.0",
+            "elm/core": "1.0.0",
+            "elm/html": "1.0.0",
+            "elm/json": "1.0.0"
+        },
+        "indirect": {
+            "elm/time": "1.0.0",
+            "elm/url": "1.0.0",
+            "elm/virtual-dom": "1.0.0"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}