Merge branch 'dev' into refactor-updated-depencencies-webpack

Author: mfranzke

packages/cli/package.json

@@ -23,17 +23,12 @@
     "ora": "5.4.0"
   },
   "devDependencies": {
-    "@pattern-lab/starterkit-mustache-base": "3.0.3",
     "dos2unix-cli": "^1.0.1",
     "eslint": "4.18.2",
     "eslint-config-prettier": "2.9.0",
     "eslint-plugin-prettier": "2.6.0",
     "prettier": "2.8.1",
     "proxyquire": "2.1.3",
-    "starterkit-mustache-acidtest": "0.0.3",
-    "starterkit-mustache-bootstrap": "0.1.1",
-    "starterkit-mustache-foundation": "0.1.1",
-    "starterkit-mustache-materialdesign": "0.1.2",
     "tap": "14.11.0"
   },
   "files": [

packages/cli/readme.md

@@ -94,8 +94,8 @@ Passing no options starts the init in interactive mode
 	Options:
 		-h, --help                output usage information
 		-p, --project-dir <path>  Specify a project directory. Default: ./
-		-e, --edition <name>      Specify an edition to install. Default: edition-node
-		-k, --starterkit <name>   Specify a starterkit to install. Default: starterkit-mustache-base
+		-e, --edition <name>      Specify an edition to install. Default: @pattern-lab/edition-node
+		-k, --starterkit <name>   Specify a starterkit to install. Default: @pattern-lab/starterkit-handlebars-demo
 ```
 
 ### Serve Pattern Lab

packages/cli/test/cli-build.test.js

@@ -17,7 +17,7 @@ tap.test('Init and build ->', (t) =>
       '--edition',
       '@pattern-lab/edition-node',
       '--starterkit',
-      '@pattern-lab/starterkit-mustache-demo',
+      '@pattern-lab/starterkit-handlebars-demo',
     ]);
     yield spawnCmd([
       'build',

packages/cli/test/cli-disable.test.js

@@ -16,7 +16,7 @@ tap.test('Disable ->', (t) =>
       '--edition',
       '@pattern-lab/edition-node',
       '--starterkit',
-      '@pattern-lab/starterkit-mustache-base',
+      '@pattern-lab/starterkit-handlebars-vanilla',
     ]);
     yield spawnCmd([
       'install',

packages/cli/test/cli-enable.test.js

@@ -16,7 +16,7 @@ tap.test('Enable ->', (t) =>
       '--edition',
       '@pattern-lab/edition-node',
       '--starterkit',
-      '@pattern-lab/starterkit-mustache-base',
+      '@pattern-lab/starterkit-handlebars-vanilla',
     ]);
     yield spawnCmd([
       'install',

packages/cli/test/cli-export.test.js

@@ -17,7 +17,7 @@ tap.test('Init and export ->', (t) =>
       '--edition',
       '@pattern-lab/edition-node',
       '--starterkit',
-      '@pattern-lab/starterkit-mustache-base',
+      '@pattern-lab/starterkit-handlebars-vanilla',
     ]);
     yield spawnCmd([
       'export',

packages/cli/test/cli-init.test.js

@@ -17,7 +17,7 @@ tap.test('Init ->', (t) =>
       '--edition',
       '@pattern-lab/edition-node',
       '--starterkit',
-      '@pattern-lab/starterkit-mustache-base',
+      '@pattern-lab/starterkit-handlebars-vanilla',
     ]);
     t.ok(
       fs.existsSync(path.resolve(projectRoot)),

packages/cli/test/fixtures/patternlab-config.json

@@ -68,7 +68,7 @@
 			"css": "./test/fixtures/public/css"
 		}
 	},
-	"patternExtension": "mustache",
+	"patternExtension": "hbs",
 	"patternStateCascade": ["inprogress", "inreview", "complete"],
 	"patternExportDirectory": "./pattern_exports/",
 	"patternExportPatternPartials": [],

packages/cli/test/install-starterkit.test.js

@@ -14,64 +14,34 @@ const minimalConfig = {
   },
 };
 
-tap.test('Install starterkit-mustache-demo ->', (t) =>
+tap.test('Install @pattern-lab/starterkit-handlebars-vanilla ->', (t) =>
   wrapAsync(function* () {
     yield installStarterkit(
-      '@pattern-lab/starterkit-mustache-demo',
+      '@pattern-lab/starterkit-handlebars-vanilla',
       minimalConfig
     );
-    const pkg = yield moduleExist('@pattern-lab/starterkit-mustache-demo');
+    const pkg = yield moduleExist('@pattern-lab/starterkit-handlebars-vanilla');
     t.ok(pkg, 'module should exist after install');
     t.end();
   })
 );
 
-tap.test('Install starterkit-mustache-base ->', (t) =>
+tap.test('Install @pattern-lab/starterkit-handlebars-demo ->', (t) =>
   wrapAsync(function* () {
     yield installStarterkit(
-      '@pattern-lab/starterkit-mustache-base',
+      '@pattern-lab/starterkit-handlebars-demo',
       minimalConfig
     );
-    const pkg = yield moduleExist('@pattern-lab/starterkit-mustache-base');
+    const pkg = yield moduleExist('@pattern-lab/starterkit-handlebars-demo');
     t.ok(pkg, 'module should exist after install');
     t.end();
   })
 );
 
-tap.test('Install starterkit-mustache-bootstrap ->', (t) =>
+tap.test('Install @pattern-lab/starterkit-twig-demo ->', (t) =>
   wrapAsync(function* () {
-    yield installStarterkit('starterkit-mustache-bootstrap', minimalConfig);
-    const pkg = yield moduleExist('starterkit-mustache-bootstrap');
-    t.ok(pkg, 'module should exist after install');
-    t.end();
-  })
-);
-
-tap.test('Install starterkit-mustache-foundation ->', (t) =>
-  wrapAsync(function* () {
-    yield installStarterkit('starterkit-mustache-foundation', minimalConfig);
-    const pkg = yield moduleExist('starterkit-mustache-foundation');
-    t.ok(pkg, 'module should exist after install');
-    t.end();
-  })
-);
-
-tap.test('Install starterkit-mustache-acidtest ->', (t) =>
-  wrapAsync(function* () {
-    yield installStarterkit('starterkit-mustache-acidtest', minimalConfig);
-    const pkg = yield moduleExist('starterkit-mustache-acidtest');
-    t.ok(pkg, 'module should exist after install');
-    t.end();
-  })
-);
-
-tap.test('Install starterkit-mustache-materialdesign ->', (t) =>
-  wrapAsync(function* () {
-    yield installStarterkit(
-      'starterkit-mustache-materialdesign',
-      minimalConfig
-    );
-    const pkg = yield moduleExist('starterkit-mustache-materialdesign');
+    yield installStarterkit('@pattern-lab/starterkit-twig-demo', minimalConfig);
+    const pkg = yield moduleExist('@pattern-lab/starterkit-twig-demo');
     t.ok(pkg, 'module should exist after install');
     t.end();
   })

packages/core/src/lib/expandPartials.js

@@ -2,12 +2,10 @@
 
 const logger = require('./log');
 const ph = require('./parameter_hunter');
-const smh = require('./style_modifier_hunter');
 const jsonCopy = require('./json_copy');
 const getPartial = require('./get');
 
 const parameter_hunter = new ph();
-const style_modifier_hunter = new smh();
 
 module.exports = function (currentPattern, patternlab) {
   const processRecursive = require('./processRecursive');
@@ -47,18 +45,6 @@ module.exports = function (currentPattern, patternlab) {
                 `partial pattern ${partial}`
               );
 
-              //if partial has style modifier data, replace the styleModifier value
-              if (
-                currentPattern.stylePartials &&
-                currentPattern.stylePartials.length > 0
-              ) {
-                style_modifier_hunter.consume_style_modifier(
-                  cleanPartialPattern,
-                  foundPartial,
-                  patternlab
-                );
-              }
-
               //this is what we came here for
               logger.debug(
                 `within ${currentPattern.patternPartial}, replacing extendedTemplate partial ${foundPartial} with ${cleanPartialPattern.patternPartial}'s extendedTemplate`

packages/core/src/lib/loadPattern.js

@@ -132,10 +132,6 @@ module.exports = function (relPath, patternlab) {
 
   currentPattern.template = fs.readFileSync(templatePath, 'utf8');
 
-  //find any stylemodifiers that may be in the current pattern
-  currentPattern.stylePartials =
-    currentPattern.findPartialsWithStyleModifiers();
-
   //find any pattern parameters that may be in the current pattern
   currentPattern.parameteredPartials =
     currentPattern.findPartialsWithPatternParameters();

packages/core/src/lib/object_factory.js

@@ -265,10 +265,6 @@ Pattern.prototype = {
     return this.engine.findPartials(this);
   },
 
-  findPartialsWithStyleModifiers: function () {
-    return this.engine.findPartialsWithStyleModifiers(this);
-  },
-
   findPartialsWithPatternParameters: function () {
     return this.engine.findPartialsWithPatternParameters(this);
   },

packages/core/src/lib/parameter_hunter.js

@@ -1,8 +1,5 @@
 'use strict';
 
-const smh = require('./style_modifier_hunter');
-const style_modifier_hunter = new smh();
-
 const getPartial = require('./get');
 const logger = require('./log');
 const parseLink = require('./parseLink');
@@ -313,15 +310,6 @@ const parameter_hunter = function () {
               }
             }
 
-            //if partial has style modifier data, replace the styleModifier value
-            if (pattern.stylePartials && pattern.stylePartials.length > 0) {
-              style_modifier_hunter.consume_style_modifier(
-                partialPattern,
-                pMatch,
-                patternlab
-              );
-            }
-
             // set pattern.extendedTemplate pMatch with replacedPartial
             pattern.extendedTemplate = pattern.extendedTemplate.replace(
               pMatch,

packages/core/src/lib/processIterative.js

@@ -11,9 +11,6 @@ module.exports = function (pattern, patternlab) {
   return pph
     .find_pseudopatterns(pattern, patternlab)
     .then(() => {
-      //find any stylemodifiers that may be in the current pattern
-      pattern.stylePartials = pattern.findPartialsWithStyleModifiers();
-
       //find any pattern parameters that may be in the current pattern
       pattern.parameteredPartials = pattern.findPartialsWithPatternParameters();
       return Promise.resolve(pattern);

packages/core/src/lib/pseudopattern_hunter.js

@@ -86,7 +86,6 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function (
           extendedTemplate: currentPattern.extendedTemplate,
           isPseudoPattern: true,
           basePattern: currentPattern,
-          stylePartials: currentPattern.stylePartials,
           parameteredPartials: currentPattern.parameteredPartials,
 
           // Only regular patterns are discovered during iterative walks

packages/core/src/lib/style_modifier_hunter.js

@@ -248,13 +248,6 @@ tap.test(
   }
 );
 
-tap.test(
-  'find_pattern_partials finds simple partials with style modifiers',
-  function (test) {
-    testFindPartials(test, ['{{> molecules-single-comment:foo }}']);
-  }
-);
-
 tap.test(
   'find_pattern_partials finds partials with handlebars parameters',
   function (test) {