Merge branch 'dev' into feature/update-uikit-build-tools

Author: bolt-bot

packages/cli/package.json

@@ -30,7 +30,7 @@
     "eslint-plugin-prettier": "2.6.0",
     "prettier": "1.11.1",
     "proxyquire": "2.0.1",
-    "tap": "11.1.1"
+    "tap": "11.1.5"
   },
   "files": [
     "bin"

packages/core/package.json

@@ -30,7 +30,7 @@
     "pretty-quick": "1.2.2",
     "rewire": "2.5.2",
     "standard-version": "4.3.0",
-    "tap": "11.1.1"
+    "tap": "11.1.5"
   },
   "keywords": [
     "Pattern Lab",

packages/core/src/lib/annotation_exporter.js renamed to packages/core/src/lib/annotationExporter.js

@@ -6,43 +6,49 @@ const _ = require('lodash');
 const mp = require('./markdown_parser');
 const logger = require('./log');
 
-const annotations_exporter = function(pl) {
+const annotationExporter = function(pl) {
   const paths = pl.config.paths;
-  let oldAnnotations;
 
   /**
    * Parses JS annotations.
    * @returns array of comments that used to be wrapped in raw JS
    */
-  function parseAnnotationsJS() {
+  function parseAnnotationsJSON() {
+    const jsonPath = path.resolve(paths.source.annotations, 'annotations.json');
+    let annotations;
+
     //attempt to read the file
     try {
-      oldAnnotations = fs.readFileSync(
-        path.resolve(paths.source.annotations, 'annotations.js'),
-        'utf8'
-      );
+      if (fs.pathExistsSync(jsonPath)) {
+        //read the new file
+        annotations = fs.readFileSync(jsonPath, 'utf8');
+      } else {
+        //read the old file
+        const jsPath = path.resolve(paths.source.annotations, 'annotations.js');
+
+        annotations = fs
+          .readFileSync(jsPath, 'utf8')
+          .replace(/^\s*var comments ?= ?/, '')
+          .replace(/};\s*$/, '}');
+
+        logger.info(
+          `Please convert ${jsPath} to JSON and rename it annotations.json.`
+        );
+      }
     } catch (ex) {
       logger.debug(
-        `annotations.js file missing from ${
+        `annotations.json file missing from ${
           paths.source.annotations
         }. This may be expected if you do not use annotations or are using markdown.`
       );
       return [];
     }
 
-    //parse as JSON by removing the old wrapping js syntax. comments and the trailing semi-colon
-    oldAnnotations = oldAnnotations.replace('var comments = ', '');
-    oldAnnotations = oldAnnotations.replace('};', '}');
-
     try {
-      const oldAnnotationsJSON = JSON.parse(oldAnnotations);
-      return oldAnnotationsJSON.comments;
+      const annotationsJSON = JSON.parse(annotations);
+      return annotationsJSON.comments;
     } catch (ex) {
-      logger.error(
-        `There was an error parsing JSON for ${
-          paths.source.annotations
-        }annotations.js`
-      );
+      logger.error(`There was an error parsing JSON for ${jsonPath}`);
       return [];
     }
   }
@@ -108,7 +114,7 @@ const annotations_exporter = function(pl) {
    * @returns array of annotations
    */
   function gatherAnnotations() {
-    const annotationsJS = parseAnnotationsJS();
+    const annotationsJS = parseAnnotationsJSON();
     const annotationsMD = parseAnnotationsMD();
     return _.unionBy(annotationsJS, annotationsMD, 'el');
   }
@@ -117,13 +123,13 @@ const annotations_exporter = function(pl) {
     gather: function() {
       return gatherAnnotations();
     },
-    gatherJS: function() {
-      return parseAnnotationsJS();
+    gatherJSON: function() {
+      return parseAnnotationsJSON();
     },
     gatherMD: function() {
       return parseAnnotationsMD();
     },
   };
 };
 
-module.exports = annotations_exporter;
+module.exports = annotationExporter;

packages/core/src/lib/exportData.js

@@ -4,7 +4,7 @@ const eol = require('os').EOL;
 const path = require('path');
 const _ = require('lodash');
 
-const ae = require('./annotation_exporter');
+const ae = require('./annotationExporter');
 
 let fs = require('fs-extra'); //eslint-disable-line prefer-const
 
@@ -13,7 +13,7 @@ let fs = require('fs-extra'); //eslint-disable-line prefer-const
  * @param patternlab - global data store
  */
 module.exports = function(patternlab) {
-  const annotation_exporter = new ae(patternlab);
+  const annotationExporter = new ae(patternlab);
 
   const paths = patternlab.config.paths;
 
@@ -68,7 +68,7 @@ module.exports = function(patternlab) {
     eol;
 
   //annotations
-  const annotationsJSON = annotation_exporter.gather();
+  const annotationsJSON = annotationExporter.gather();
   const annotations =
     'var comments = { "comments" : ' + JSON.stringify(annotationsJSON) + '};';
   _.each(patternlab.uikits, uikit => {

packages/core/test/annotation_exporter_tests.js

@@ -20,12 +20,12 @@ function createFakePatternLab(anPath, customProps) {
 }
 
 var patternlab = createFakePatternLab(anPath);
-var ae = require('../src/lib/annotation_exporter')(patternlab);
+var ae = require('../src/lib/annotationExporter')(patternlab);
 
 tap.test('converts old JS annotations into new format', function(test) {
   //arrange
   //act
-  var annotations = ae.gatherJS();
+  var annotations = ae.gatherJSON();
 
   //assert
   test.equals(annotations.length, 2);
@@ -77,7 +77,7 @@ tap.test('merges both annotation methods into one array', function(test) {
 tap.test('when there are 0 annotation files', function(test) {
   var emptyAnPath = './test/files/empty/';
   var patternlab2 = createFakePatternLab(emptyAnPath);
-  var ae2 = require('../src/lib/annotation_exporter')(patternlab2);
+  var ae2 = require('../src/lib/annotationExporter')(patternlab2);
 
   var annotations = ae2.gather();
   test.equals(annotations.length, 0);

packages/engine-mustache/package.json

@@ -5,7 +5,7 @@
   "main": "lib/engine_mustache.js",
   "dependencies": {
     "fs-extra": "0.30.0",
-    "mustache": "2.2.0"
+    "mustache": "2.3.0"
   },
   "keywords": [
     "Pattern Lab",