pattern-lab · mfranzke · Dec 25, 2022 · Dec 25, 2022 · Dec 25, 2022 · Dec 25, 2022
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -17,7 +17,6 @@ jobs:
       - name: Setup the project
         run: |
           yarn run setup
-          npx lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
           npx lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
           npx lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
           npx lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core

diff --git a/.prettierignore b/.prettierignore
@@ -15,3 +15,5 @@ packages/**/annotations.js
 **/_meta/_head.*
 **/_meta/_foot.*
 **/development-edition*/source/_patterns/**
+# Ignoring handlebars template files that contain partials because of https://github.com/prettier/prettier/issues/11834
+packages/core/test/**/*.hbs
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,6 @@ before_install:
 
 before_script:
   - yarn run setup
-  - npx lerna add @pattern-lab/engine-mustache --scope=@pattern-lab/core
   - npx lerna add @pattern-lab/engine-handlebars --scope=@pattern-lab/core
   - npx lerna add @pattern-lab/engine-underscore --scope=@pattern-lab/core
   - npx lerna add @pattern-lab/engine-liquid --scope=@pattern-lab/core

diff --git a/packages/cli/test/fixtures/patternlab-config.json b/packages/cli/test/fixtures/patternlab-config.json
@@ -41,15 +41,15 @@
 			"styleguide": "node_modules/@pattern-lab/uikit-workshop/dist/",
 			"patternlabFiles": {
 				"general-header":
-					"node_modules/@pattern-lab/uikit-workshop/views/partials/general-header.mustache",
+					"node_modules/@pattern-lab/uikit-workshop/views/partials/general-header.hbs",
 				"general-footer":
-					"node_modules/@pattern-lab/uikit-workshop/views/partials/general-footer.mustache",
+					"node_modules/@pattern-lab/uikit-workshop/views/partials/general-footer.hbs",
 				"patternSection":
-					"node_modules/@pattern-lab/uikit-workshop/views/partials/patternSection.mustache",
+					"node_modules/@pattern-lab/uikit-workshop/views/partials/patternSection.hbs",
 				"patternSectionSubgroup":
-					"node_modules/@pattern-lab/uikit-workshop/views/partials/patternSectionSubgroup.mustache",
+					"node_modules/@pattern-lab/uikit-workshop/views/partials/patternSectionSubgroup.hbs",
 				"viewall":
-					"node_modules/@pattern-lab/uikit-workshop/views/viewall.mustache"
+					"node_modules/@pattern-lab/uikit-workshop/views/viewall.hbs"
 			},
 			"js": "./test/fixtures/source/js",
 			"images": "./test/fixtures/source/images",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -5,7 +5,6 @@
   "main": "./src/index.js",
   "dependencies": {
     "@pattern-lab/engine-handlebars": "^6.0.0",
-    "@pattern-lab/engine-mustache": "^6.0.0",
     "@pattern-lab/live-server": "^6.0.0",
     "chalk": "4.1.0",
     "chokidar": "3.5.1",

diff --git a/packages/core/patternlab-config.json b/packages/core/patternlab-config.json
@@ -41,15 +41,15 @@
       "styleguide": "dist/",
       "patternlabFiles": {
         "general-header":
-          "views/partials/general-header.mustache",
+          "views/partials/general-header.hbs",
         "general-footer":
-          "views/partials/general-footer.mustache",
+          "views/partials/general-footer.hbs",
         "patternSection":
-          "views/partials/patternSection.mustache",
+          "views/partials/patternSection.hbs",
         "patternSectionSubgroup":
-          "views/partials/patternSectionSubgroup.mustache",
+          "views/partials/patternSectionSubgroup.hbs",
         "viewall":
-          "views/viewall.mustache"
+          "views/viewall.hbs"
       },
       "js": "./source/js",
       "images": "./source/images",
@@ -68,7 +68,7 @@
       "css": "public/css"
     }
   },
-  "patternExtension": "mustache",
+  "patternExtension": "hbs",
   "patternStateCascade": ["inprogress", "inreview", "complete"],
   "patternExportAll": false,
   "patternExportDirectory": "pattern_exports",

diff --git a/packages/core/src/lib/buildPatterns.js b/packages/core/src/lib/buildPatterns.js
@@ -91,7 +91,7 @@ module.exports = async (deletePatternDir, patternlab, additionalData) => {
             //take the user defined head and foot and process any data and patterns that apply
 
             //todo this need to be made aware of multiple ui kits
-            //perhaps we can check for a convention like [uikitname]_00-head.mustache, and if found, add them to patternlab.uikits[uikitname].userFoot
+            //perhaps we can check for a convention like [uikitname]_head.hbs, and if found, add them to patternlab.uikits[uikitname].userFoot
             //then, if present, use those during compose()
             const headPatternPromise = processMetaPattern(
               `_head.${patternlab.config.patternExtension}`,

diff --git a/packages/core/src/lib/decompose.js b/packages/core/src/lib/decompose.js
@@ -4,7 +4,6 @@ const logger = require('./log');
 const lh = require('./lineage_hunter');
 const lih = require('./list_item_hunter');
 const addPattern = require('./addPattern');
-const expandPartials = require('./expandPartials');
 
 const lineage_hunter = new lh();
 const list_item_hunter = new lih();
@@ -28,8 +27,6 @@ module.exports = function (pattern, patternlab, ignoreLineage) {
     patternlab
   );
 
-  const expandPartialPromise = expandPartials(pattern, patternlab);
-
   let lineagePromise;
 
   //find pattern lineage
@@ -46,12 +43,9 @@ module.exports = function (pattern, patternlab, ignoreLineage) {
     addPattern(pattern, patternlab);
   });
 
-  return Promise.all([
-    listItemPromise,
-    expandPartialPromise,
-    lineagePromise,
-    addPromise,
-  ]).catch((reason) => {
-    logger.error(reason);
-  });
+  return Promise.all([listItemPromise, lineagePromise, addPromise]).catch(
+    (reason) => {
+      logger.error(reason);
+    }
+  );
 };
diff --git a/packages/core/src/lib/expandPartials.js b/packages/core/src/lib/expandPartials.js
diff --git a/packages/core/src/lib/object_factory.js b/packages/core/src/lib/object_factory.js
@@ -33,7 +33,7 @@ const Pattern = function (
   patternlab,
   isPromoteToFlatPatternRun
 ) {
-  this.relPath = path.normalize(relPath); // 'atoms/global/colors.mustache'
+  this.relPath = path.normalize(relPath); // 'atoms/global/colors.hbs'
 
   /**
    * We expect relPath to be the path of the pattern template, relative to the
@@ -52,7 +52,7 @@ const Pattern = function (
 
   this.fileName = pathObj.name; // 'colors'
   this.subdir = pathObj.dir; // 'atoms/global'
-  this.fileExtension = pathObj.ext; // '.mustache'
+  this.fileExtension = pathObj.ext; // '.hbs'
 
   // TODO: Remove if block when dropping ordering by prefix and keep else code
   // (When we drop the info about the old ordering is deprecated)
@@ -343,7 +343,7 @@ Pattern.prototype = {
    */
   getPatternInfo: (pathObj, patternlab, isPromoteToFlatPatternRun) => {
     const info = {
-      // colors(.mustache) is deeply nested in atoms-/global/colors
+      // colors(.hbs) is deeply nested in atoms-/global/colors
       patternlab: patternlab,
       patternHasOwnDir: isPromoteToFlatPatternRun
         ? path.basename(pathObj.dir).replace(prefixMatcher, '') ===

diff --git a/packages/core/src/lib/pattern_engines.js b/packages/core/src/lib/pattern_engines.js
@@ -83,7 +83,7 @@ function findEnginesInConfig(config) {
 // any loaded PatternEngine by addressing them like this:
 //
 //   var PatternEngines = require('./pattern_engines/pattern_engines');
-//   var Mustache = PatternEngines['mustache'];
+//   var Handlebars = PatternEngines['handlebars'];
 //
 // Object.create lets us create an object with a specified prototype. We want
 // this here because we would like the object's "own properties" to include
@@ -103,14 +103,6 @@ const PatternEngines = Object.create({
     const enginesInConfig = findEnginesInConfig(patternLabConfig);
 
     if (enginesInConfig) {
-      // Quick fix until we've removed @pattern-lab/engine-mustache, starting with https://github.com/pattern-lab/patternlab-node/issues/1239 & https://github.com/pattern-lab/patternlab-node/pull/1455
-      // @TODO: Remove after removing @pattern-lab/engine-mustache dependency
-      enginesInConfig.mustache = enginesInConfig.mustache || {};
-      enginesInConfig.mustache.package =
-        enginesInConfig.mustache.package || '@pattern-lab/engine-mustache';
-      enginesInConfig.mustache.extensions =
-        enginesInConfig.mustache.extensions || 'mustache';
-
       // Try loading each of the configured pattern engines
       // eslint-disable-next-line guard-for-in
       for (const name in enginesInConfig) {
@@ -239,9 +231,9 @@ const PatternEngines = Object.create({
       }
     }
 
-    // otherwise, assume it's a plain mustache template string and act
+    // otherwise, assume it's a plain handlebars template string and act
     // accordingly
-    return 'mustache';
+    return 'handlebars';
   },
 
   /**

diff --git a/packages/core/test/addPattern_tests.js b/packages/core/test/addPattern_tests.js
@@ -14,7 +14,7 @@ tap.test(
     //arrange
     const patternlab = util.fakePatternLab(patterns_dir);
 
-    var pattern = new Pattern('test/bar.mustache');
+    var pattern = new Pattern('test/bar.hbs');
     pattern.extendedTemplate = 'barExtended';
     pattern.template = 'bar';
 
@@ -35,7 +35,7 @@ tap.test(
     //arrange
     const patternlab = util.fakePatternLab(patterns_dir);
 
-    var pattern = new Pattern('test/bar.mustache');
+    var pattern = new Pattern('test/bar.hbs');
     pattern.extendedTemplate = undefined;
     pattern.template = 'bar';
 

diff --git a/packages/core/test/files/_meta/_head.mustache b/packages/core/test/files/_meta/_head.mustache
diff --git a/...les/_patterns/orderTest/a/a-test.mustache → ...st/files/_patterns/orderTest/a/a-test.hbs b/...les/_patterns/orderTest/a/a-test.mustache → ...st/files/_patterns/orderTest/a/a-test.hbs
diff --git a/...les/_patterns/orderTest/b/b-test.mustache → ...st/files/_patterns/orderTest/b/b-test.hbs b/...les/_patterns/orderTest/b/b-test.mustache → ...st/files/_patterns/orderTest/b/b-test.hbs
diff --git a/...les/_patterns/orderTest/c/c-test.mustache → ...st/files/_patterns/orderTest/c/c-test.hbs b/...les/_patterns/orderTest/c/c-test.mustache → ...st/files/_patterns/orderTest/c/c-test.hbs
diff --git a/.../orderTest/c/subfolder/subfolder.mustache → ...terns/orderTest/c/subfolder/subfolder.hbs b/.../orderTest/c/subfolder/subfolder.mustache → ...terns/orderTest/c/subfolder/subfolder.hbs
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType1/blue.hbs b/packages/core/test/files/_patterns/patternType1/patternSubType1/blue.hbs
@@ -0,0 +1 @@
+blue
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType1/blue.mustache b/packages/core/test/files/_patterns/patternType1/patternSubType1/blue.mustache
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType1/red.hbs b/packages/core/test/files/_patterns/patternType1/patternSubType1/red.hbs
@@ -0,0 +1 @@
+red
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType1/red.mustache b/packages/core/test/files/_patterns/patternType1/patternSubType1/red.mustache
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType1/yellow.hbs b/packages/core/test/files/_patterns/patternType1/patternSubType1/yellow.hbs
@@ -0,0 +1 @@
+yellow
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType1/yellow.mustache b/packages/core/test/files/_patterns/patternType1/patternSubType1/yellow.mustache
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType2/black.hbs b/packages/core/test/files/_patterns/patternType1/patternSubType2/black.hbs
@@ -0,0 +1 @@
+black
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType2/black.mustache b/packages/core/test/files/_patterns/patternType1/patternSubType2/black.mustache
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType2/grey.hbs b/packages/core/test/files/_patterns/patternType1/patternSubType2/grey.hbs
@@ -0,0 +1 @@
+grey
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType2/grey.mustache b/packages/core/test/files/_patterns/patternType1/patternSubType2/grey.mustache
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType2/white.hbs b/packages/core/test/files/_patterns/patternType1/patternSubType2/white.hbs
@@ -0,0 +1 @@
+white
diff --git a/packages/core/test/files/_patterns/patternType1/patternSubType2/white.mustache b/packages/core/test/files/_patterns/patternType1/patternSubType2/white.mustache
diff --git a/...s/_patterns/test/_hidden-pattern.mustache → .../files/_patterns/test/_hidden-pattern.hbs b/...s/_patterns/test/_hidden-pattern.mustache → .../files/_patterns/test/_hidden-pattern.hbs
diff --git a/packages/core/test/files/_patterns/test/_ignored-pattern.hbs b/packages/core/test/files/_patterns/test/_ignored-pattern.hbs
@@ -0,0 +1 @@
+<div>These aren't the patterns you are looking for.</div>
diff --git a/packages/core/test/files/_patterns/test/_ignored-pattern.mustache b/packages/core/test/files/_patterns/test/_ignored-pattern.mustache
diff --git a/packages/core/test/files/_patterns/test/a.hbs b/packages/core/test/files/_patterns/test/a.hbs
@@ -0,0 +1,4 @@
+<b>a</b>
+{{#if a}}
+  <i>a!</i>
+{{/if}}
diff --git a/packages/core/test/files/_patterns/test/a.mustache b/packages/core/test/files/_patterns/test/a.mustache
diff --git a/packages/core/test/files/_patterns/test/another-styled-atom.hbs b/packages/core/test/files/_patterns/test/another-styled-atom.hbs
@@ -0,0 +1 @@
+{{> test-styled-atom additionalClasses="test_1" }}
diff --git a/packages/core/test/files/_patterns/test/another-styled-atom.mustache b/packages/core/test/files/_patterns/test/another-styled-atom.mustache
diff --git a/packages/core/test/files/_patterns/test/b.hbs b/packages/core/test/files/_patterns/test/b.hbs
@@ -0,0 +1,5 @@
+<b>b</b>
+{{#if b }}
+<i>b!</i>
+{{/if }}
+{{> test-a a=true }}
diff --git a/packages/core/test/files/_patterns/test/b.mustache b/packages/core/test/files/_patterns/test/b.mustache
diff --git a/...re/test/files/_patterns/test/bar.mustache → ...es/core/test/files/_patterns/test/bar.hbs b/...re/test/files/_patterns/test/bar.mustache → ...es/core/test/files/_patterns/test/bar.hbs
diff --git a/...re/test/files/_patterns/test/baz.mustache → ...es/core/test/files/_patterns/test/baz.hbs b/...re/test/files/_patterns/test/baz.mustache → ...es/core/test/files/_patterns/test/baz.hbs
diff --git a/.../_patterns/test/bookend-listitem.mustache → ...files/_patterns/test/bookend-listitem.hbs b/.../_patterns/test/bookend-listitem.mustache → ...files/_patterns/test/bookend-listitem.hbs
@@ -1,7 +1,7 @@
 <div class="test_group">
   {{#listItems.two}}
     {{> test-styled-atom }}
-    {{> test-styled-atom:test_1 }}
+    {{> test-styled-atom additionalClasses="test_1" }}
     {{> test-styled-atom}}
   {{/listItems.two}}
 </div>
diff --git a/packages/core/test/files/_patterns/test/bookend-params.hbs b/packages/core/test/files/_patterns/test/bookend-params.hbs
@@ -0,0 +1,6 @@
+<div class="test_group">
+    {{> test-styled-atom }}
+    {{> test-styled-atom additionalClasses="test_2" message="2" }}
+    {{> test-styled-atom additionalClasses="test_3" message="3" }}
+    {{> test-styled-atom }}
+</div>
diff --git a/packages/core/test/files/_patterns/test/bookend-params.mustache b/packages/core/test/files/_patterns/test/bookend-params.mustache
diff --git a/packages/core/test/files/_patterns/test/bookend.hbs b/packages/core/test/files/_patterns/test/bookend.hbs
@@ -0,0 +1,6 @@
+<div class="test_group">
+    {{> test-styled-atom }}
+    {{> test-styled-atom additionalClasses="test_2" }}
+    {{> test-styled-atom additionalClasses="test_3" }}
+    {{> test-styled-atom}}
+</div>