v2.7.1

Author: ZeeCoder

CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.7.1]
+
+### Fixed
+
+* Exluded some irrelevant paths from test coverage
+
+* `postcss-container-query`
+  * `watch:build` package script to help development
+  * testing build files
+  * Fixed exports (#90)
+
 ## [2.7.0]
 
 ### Added

package.json

@@ -20,10 +20,11 @@
     "prettier": "^1.10.2"
   },
   "scripts": {
-    "test": "lerna run flow && jest --coverage",
+    "test": "jest --coverage",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "watch:test": "jest --watch",
     "precommit": "lint-staged",
+    "pretest": "lerna run flow && yarn run build",
     "prettify": "prettier --write 'packages/**/*.js'",
     "build": "lerna run build",
     "bootstrap": "lerna bootstrap"
@@ -33,5 +34,14 @@
       "prettier --write",
       "git add"
     ]
+  },
+  "jest": {
+    "coveragePathIgnorePatterns": [
+      "/node_modules/",
+      "postcss-container-query/dist/saveMeta.js",
+      "container-query-meta-builder/dist",
+      "container-query-meta-builder/src/test",
+      "postcss-container-query/src/test"
+    ]
   }
 }

packages/postcss-container-query/package.json

@@ -1,20 +1,22 @@
 {
   "name": "@zeecoder/postcss-container-query",
-  "description": "PostCSS processing for container queries, using a media query like syntax.",
+  "description":
+    "PostCSS processing for container queries, using a media query like syntax.",
   "homepage": "https://github.com/ZeeCoder/container-query",
   "license": "MIT",
   "version": "2.7.0",
   "author": "Viktor Hubert <[email protected]>",
   "engines": {
     "node": ">=4"
   },
-  "main": "dist/bundle.cjs.js",
+  "main": "dist/index.js",
   "browser": {
     "fs": false
   },
   "scripts": {
     "test": "yarn run flow && jest",
     "build": "rollup -c",
+    "watch:build": "rollup -c --watch",
     "flow": "flow check",
     "prebuild": "yarn run flow",
     "prepublish": "yarn build"
@@ -28,8 +30,8 @@
     "jest": "^22.4.2",
     "rollup": "^0.56.2",
     "rollup-plugin-babel": "^3.0.2",
-    "rollup-plugin-babili": "^3.1.0",
-    "rollup-plugin-flow": "^1.1.1"
+    "rollup-plugin-flow": "^1.1.1",
+    "rollup-plugin-uglify": "^3.0.0"
   },
   "dependencies": {
     "@zeecoder/container-query-meta-builder": "^2.6.0",

packages/postcss-container-query/rollup.config.js

@@ -1,11 +1,31 @@
 import flow from "rollup-plugin-flow";
 import babel from "rollup-plugin-babel";
-import babili from "rollup-plugin-babili";
+import uglify from "rollup-plugin-uglify";
 import fs from "fs";
 
-export default {
-  input: "src/containerQuery.js",
-  output: [{ file: "dist/bundle.cjs.js", format: "cjs" }],
-  plugins: [flow(), babel(), babili()],
-  external: ["postcss", "lodash/trim", "fs"]
-};
+const generate = ({ input, output }) => ({
+  input,
+  output: [{ file: output, format: "cjs" }],
+  plugins: [flow(), babel(), uglify()],
+  external: [
+    "postcss",
+    "lodash/trim",
+    "fs",
+    "@zeecoder/container-query-meta-builder"
+  ]
+});
+
+export default [
+  generate({
+    input: "src/containerQuery.js",
+    output: "dist/index.js"
+  }),
+  generate({
+    input: "src/saveMeta.js",
+    output: "dist/saveMeta.js"
+  }),
+  generate({
+    input: "src/getMetadataFromMessages.js",
+    output: "dist/getMetadataFromMessages.js"
+  })
+];

packages/postcss-container-query/src/containerQuery.js

@@ -160,24 +160,4 @@ function containerQuery(options = {}) {
   };
 }
 
-/**
- * @param {Array<{plugin: string, type: string, [meta]: {}}>} messages
- * @return {null|{}}
- */
-export function getMetadataFromMessages(messages) {
-  const filteredMessages = messages.filter(
-    message =>
-      message.plugin === "postcss-container-query" &&
-      message.type === "metadata"
-  );
-
-  if (!filteredMessages.length) {
-    return null;
-  }
-
-  return filteredMessages[0].meta;
-}
-
-export { saveMeta };
-
 export default postcss.plugin(plugin, containerQuery);

packages/postcss-container-query/src/containerQuery.spec.js

@@ -1,5 +1,4 @@
 import postcss from "postcss";
-import containerQuery, { getMetadataFromMessages } from "./containerQuery";
 import Root from "../__mocks__/Root";
 import * as regularTest from "./test/regular";
 import * as customPropertiesTest from "./test/custom-properties";
@@ -11,7 +10,11 @@ import * as missingDeclarationWithRUnitsTest from "./test/missing-declaration-wi
 import * as selfTest from "./test/self";
 import * as simpleTest from "./test/simple";
 
-jest.mock("./saveMeta");
+const containerQuery = require("../dist");
+const getMetadataFromMessages = require("../dist/getMetadataFromMessages");
+const saveMeta = require("../dist/saveMeta");
+
+jest.mock("fs");
 
 /**
  * @param {string} rawCSS Raw CSS containing container queries
@@ -53,14 +56,22 @@ const assertProcessingResult = async (testObj, options = {}) => {
   expect(meta).toEqual(testObj.meta);
 };
 
-test("should use the default json saving function if none was supplied", () => {
-  const saveMeta = require("./saveMeta").default;
+test('should avoid accidentally creating ".default" exports', () => {
+  expect(typeof saveMeta).toBe("function");
+  expect(typeof getMetadataFromMessages).toBe("function");
+  expect(typeof containerQuery).toBe("function");
+  expect(typeof saveMeta.default).toBe("undefined");
+  expect(typeof getMetadataFromMessages.default).toBe("undefined");
+  expect(typeof containerQuery.default).toBe("undefined");
+});
 
+test("should use the default json saving function if none was supplied", () => {
+  const fs = require("fs");
   const pluginInstance = containerQuery();
 
   pluginInstance(new Root(), { messages: [] });
 
-  expect(saveMeta).toHaveBeenCalledTimes(1);
+  expect(fs.readFile).toHaveBeenCalledTimes(1);
 });
 
 test("should throw on missing container declaration", () => {

packages/postcss-container-query/src/getMetadataFromMessages.js

@@ -0,0 +1,17 @@
+/**
+ * @param {Array<{plugin: string, type: string, [meta]: {}}>} messages
+ * @return {null|{}}
+ */
+export default function getMetadataFromMessages(messages) {
+  const filteredMessages = messages.filter(
+    message =>
+      message.plugin === "postcss-container-query" &&
+      message.type === "metadata"
+  );
+
+  if (!filteredMessages.length) {
+    return null;
+  }
+
+  return filteredMessages[0].meta;
+}

packages/postcss-container-query/src/saveMeta.js

@@ -1,7 +1,7 @@
 import { readFile, writeFile } from "fs";
 
-const saveMeta = (cssFile, meta) =>
-  new Promise(resolve => {
+export default function saveMeta(cssFile, meta) {
+  return new Promise(resolve => {
     const stringMeta = JSON.stringify(meta);
     const jsonFilePath = `${cssFile}.json`;
 
@@ -23,5 +23,4 @@ const saveMeta = (cssFile, meta) =>
       }
     });
   });
-
-export default saveMeta;
+}