Increases test coverage for prev sourcemaps & error handling

metalsmith · Dec 27, 2022 · 66c72c4 · 66c72c4
1 parent 7068ba1
commit 66c72c4
Show file tree

Hide file tree

Showing 7 changed files with 172 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,8 +49,10 @@
     "build": "microbundle --target node --no-sourcemap -f cjs,esm --strict --generateTypes=false"
   },
   "devDependencies": {
-    "assert-dir-equal": "^1.0.1",
+    "@metalsmith/sass": "^1.2.0",
+    "assert-dir-equal": "github:webketje/assert-dir-equal#v2.0.0",
     "auto-changelog": "^2.4.0",
+    "autoprefixer": "^10.4.13",
     "eslint": "^8.30.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",

diff --git a/test/fixtures/prev-sourcemaps/expected/index.html b/test/fixtures/prev-sourcemaps/expected/index.html
@@ -0,0 +1,6 @@
+<head>
+  <link rel="stylesheet" href="styles.css">
+</head>
+<body>
+  <p>I am peachpuff!</p>
+</body>
diff --git a/test/fixtures/prev-sourcemaps/expected/styles.css b/test/fixtures/prev-sourcemaps/expected/styles.css
diff --git a/test/fixtures/prev-sourcemaps/src/index.html b/test/fixtures/prev-sourcemaps/src/index.html
@@ -0,0 +1,6 @@
+<head>
+  <link rel="stylesheet" href="styles.css">
+</head>
+<body>
+  <p>I am peachpuff!</p>
+</body>
diff --git a/test/fixtures/prev-sourcemaps/src/styles.scss b/test/fixtures/prev-sourcemaps/src/styles.scss
@@ -0,0 +1,18 @@
+@mixin userSelectNone {
+  user-select: none;
+}
+
+body {
+  color: peachpuff;
+
+  p {
+    box-shadow: 0 0 5px black;
+  }
+
+  .example {
+    display: grid;
+    transition: all .5s;
+    @include userSelectNone();
+    background: linear-gradient(to bottom, white, black);
+  }
+}
diff --git a/test/index.cjs b/test/index.cjs
@@ -1,5 +1,6 @@
 /* eslint-env node, mocha */
 
+const sass = require("@metalsmith/sass");
 const path = require("path");
 const assert = require("assert");
 const fixture = path.resolve.bind(path, __dirname, "fixtures");
@@ -54,6 +55,25 @@ describe("@metalsmith/postcss", function () {
       });
   });
 
+  it("should handle errors appropriately", function (done) {
+    const ms = Metalsmith(fixture("no-sourcemaps"))
+    const files = {
+      'first.css': {
+        contents: Buffer.from('invalid-css')
+      }
+    }
+    postcss({
+      plugins: ['autoprefixer']
+    })(files, ms, (err) => {
+      if (err) {
+       assert.strictEqual(err.name, 'CssSyntaxError')
+       done()
+      } else {
+        done(new Error('should throw'))
+      }
+    })
+  });
+
   describe("sourcemaps", function () {
     it("should not add sourcemaps at all", function (done) {
       const metalsmith = Metalsmith(fixture("no-sourcemaps"));
@@ -159,6 +179,26 @@ describe("@metalsmith/postcss", function () {
         });
     })
 
+    it('should take into account previous source maps', function(done) {
+      const ms = Metalsmith(fixture("prev-sourcemaps"))
+
+      ms
+        .use(sass({ sourceMap: true }))
+        .use(postcss({ map: { inline: true }, plugins: ['autoprefixer']}))
+        .build((err) => {
+          if (err) done(err)
+          try {
+            equal(
+              fixture("prev-sourcemaps/build"),
+              fixture("prev-sourcemaps/expected")
+            );
+            done()
+          } catch (err) {
+            done(err)
+          }
+        });
+    })
+
     it("should pass absolute paths to postcss", function (done) {
       const metalsmith = Metalsmith(fixture("use-absolute-paths"));
       metalsmith