Merge branch 'dev' into feature/fix-directory-naming

Author: sghoweri

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+patreon: patternlab

.gitignore

@@ -5,6 +5,7 @@ Thumbs.db
 .nyc_output/
 .vscode/
 .idea/
+.env
 packages/core/test/public
 packages/*/public
 !packages/core/test/patterns/public/.gitkeep

README.md

@@ -61,6 +61,7 @@ Pattern Lab / Node wouldn't be what it is today without the support of the commu
 
 * **[Brad Frost](http://bradfrost.com/)**
 * [Marcos Peebles](https://twitter.com/marcospeebles)
+* [Maximilian Franzke](https://twitter.com/maedmaex)
 * [Susan Simkins](https://twitter.com/susanmsimkins)
 
 ## Contributing

lerna.json

@@ -19,7 +19,10 @@
       ]
     },
     "publish": {
-      "allowBranch": "master"
+      "allowBranch": [
+        "dev",
+        "master"
+      ]
     }
   },
   "npmClientArgs": [

package.json

@@ -10,7 +10,12 @@
     "eslint-plugin-prettier": "^3.1.0",
     "lerna": "3.11.0",
     "prettier": "^1.14.3",
-    "pretty-quick": "^1.11.1"
+    "pretty-quick": "^1.11.1",
+    "auto": "^7.8.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pattern-lab/patternlab-node.git"
   },
   "private": true,
   "scripts": {
@@ -22,7 +27,9 @@
     "lint:fix": "npm run lint -- --fix",
     "lint": "eslint --max-warnings 0 './packages/{core,cli,uikit-workshop}/**/*.js ' --ignore-path .eslintignore",
     "test": "lerna run test",
-    "clean": "git clean -dfx"
+    "clean": "git clean -dfx",
+    "publish": "npx lerna publish -m \"[skip travis] chore(release): publish %s\"",
+    "postpublish": "auto release"
   },
   "nyc": {
     "exclude": [

packages/cli/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.0.3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@1.0.2...@pattern-lab/cli@1.0.3) (2019-10-14)
+
+**Note:** Version bump only for package @pattern-lab/cli
+
+
+
+
+
+
 # [1.0.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/cli/compare/@pattern-lab/cli@0.1.0...@pattern-lab/cli@1.0.0) (2019-08-23)
 
 

packages/cli/bin/inquiries/starterkit.js

@@ -10,42 +10,46 @@ const starterkitSetup = [
     message: 'Which starterkit do you want to use?',
     choices: [
       {
-        name: 'starterkit-handlebars-demo [Recommended]',
+        name: 'starterkit-handlebars-demo (Recommended)',
         value: '@pattern-lab/starterkit-handlebars-demo',
       },
       {
-        name: 'starterkit-twig-demo [Recommended]',
+        name: 'starterkit-handlebars-vanilla (Recommended)',
+        value: '@pattern-lab/starterkit-handlebars-vanilla',
+      },
+      {
+        name: 'starterkit-twig-demo (Recommended)',
         value: '@pattern-lab/starterkit-twig-demo',
-      },         
+      },
       {
         name: 'starterkit-mustache-bootstrap',
         value: 'starterkit-mustache-bootstrap',
-      },    
+      },
       {
         name: 'starterkit-mustache-demo',
         value: '@pattern-lab/starterkit-mustache-demo',
-      },      
+      },
       {
         name: 'starterkit-mustache-foundation',
         value: 'starterkit-mustache-foundation',
-      },      
+      },
       {
         name: 'starterkit-mustache-materialdesign',
         value: 'starterkit-mustache-materialdesign',
-      },      
+      },
       {
         name: 'starterkit-mustache-base',
         value: '@pattern-lab/starterkit-mustache-base',
       },
-   
+
       new inquirer.Separator(),
       {
         name: 'Custom starterkit',
         value: CUSTOM_STARTERKIT,
       },
       new inquirer.Separator(),
       {
-        name: 'None',
+        name: 'None (Start a blank project)',
         value: false,
       },
     ],

packages/cli/bin/install-plugin.js

@@ -22,7 +22,7 @@ const installPlugin = (plugin, config) =>
     try {
       const pluginConfigJSON = require(pluginPathConfig);
       if (!_.has(config.plugins[name].options)) {
-        _.set(config, `plugins[${name}]['options]`, pluginConfigJSON);
+        _.set(config, `plugins[${name}][options]`, pluginConfigJSON);
       }
     } catch (ex) {
       //a config.json file is not required at this time

packages/cli/bin/install-starterkit.js

@@ -12,8 +12,7 @@ const installStarterkit = (starterkit, config) =>
   wrapAsync(function*() {
     const sourceDir = config.paths.source.root;
     const name = starterkit.value || starterkit;
-    const url = name.startsWith('@pattern-lab/') ? name : `pattern-lab/${name}`;
-    yield checkAndInstallPackage(name, url);
+    yield checkAndInstallPackage(name);
     const kitPath = path.resolve('./node_modules', name);
     yield copyAsync(path.resolve(kitPath, 'dist'), path.resolve(sourceDir));
     let kitConfig;

packages/cli/bin/utils.js

@@ -126,16 +126,15 @@ const copyWithPattern = (cwd, pattern, dest) =>
  * @func fetchPackage
  * @desc Fetches and saves packages from npm into node_modules and adds a reference in the package.json under dependencies
  * @param {string} packageName - The package name
- * @param {string} [url] - A URL which will be used to fetch the package from
  */
-const fetchPackage = (packageName, url) =>
+const fetchPackage = packageName =>
   wrapAsync(function*() {
     const useYarn = hasYarn();
     const pm = useYarn ? 'yarn' : 'npm';
     const installCmd = useYarn ? 'add' : 'install';
     try {
-      if (packageName || url) {
-        const cmd = yield spawn(pm, [installCmd, url || packageName]);
+      if (packageName) {
+        const cmd = yield spawn(pm, [installCmd, packageName]);
         error(cmd.stderr);
       }
     } catch (err) {
@@ -150,10 +149,9 @@ const fetchPackage = (packageName, url) =>
  * @func checkAndInstallPackage
  * Checks whether a package for a given packageName is installed locally. If package cannot be found, fetch and install it
  * @param {string} packageName - The package name
- * @param {string} [url] - A URL which will be used to fetch the package from
  * @return {boolean}
  */
-const checkAndInstallPackage = (packageName, url) =>
+const checkAndInstallPackage = packageName =>
   wrapAsync(function*() {
     try {
       require.resolve(packageName);
@@ -162,7 +160,7 @@ const checkAndInstallPackage = (packageName, url) =>
       debug(
         `checkAndInstallPackage: ${packageName} not installed. Fetching it now …`
       );
-      yield fetchPackage(packageName, url);
+      yield fetchPackage(packageName);
       return false;
     }
   });