Merge pull request #1004 from pattern-lab/feature/twig-edition-prep

twig edition prep

Author: EvanLovely

README.md

@@ -30,7 +30,7 @@ The below assumes a new directory and project is required. This is likely what y
     ```bash
     mkdir new-project
     cd new-project
-    npm init -y && npx @pattern-lab/cli -c patternlab init
+    npx @pattern-lab/cli -c patternlab init
     ```
     > If you get an error stating that `npx` is not installed, ensure you are on `npm 5.2.0` or later by running `npm -v` or install it globally with `npm install -g npx`. [Learn more about npx.](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b)
 1. Follow the on-screen prompts to choose your Edition and a Starterkit should you want one.

packages/cli/bin/cli-actions/init.js

@@ -1,5 +1,6 @@
 'use strict';
 const patternlab = require('@pattern-lab/core');
+const merge = require('deepmerge');
 const ask = require('../ask');
 const scaffold = require('../scaffold');
 const installEdition = require('../install-edition');
@@ -50,14 +51,22 @@ const init = options =>
         patternlabConfig,
         projectDir
       ); // 3.1
-      patternlabConfig = Object.assign(patternlabConfig, newConf); // 3.2
+      if (newConf) {
+        patternlabConfig = merge(patternlabConfig, newConf); // 3.2
+      }
       spinner.succeed(`⊙ patternlab → Installed edition: ${edition}`);
     }
     if (starterkit) {
       spinner.text = `⊙ patternlab → Installing starterkit ${starterkit}`;
       spinner.start();
-      yield installStarterkit(starterkit, patternlabConfig);
+      const starterkitConfig = yield installStarterkit(
+        starterkit,
+        patternlabConfig
+      );
       spinner.succeed(`⊙ patternlab → Installed starterkit: ${starterkit}`);
+      if (starterkitConfig) {
+        patternlabConfig = merge(patternlabConfig, starterkitConfig);
+      }
     } // 4
     yield writeJsonAsync(
       path.resolve(projectDir, 'patternlab-config.json'),

packages/cli/bin/inquiries/edition.js

@@ -14,6 +14,10 @@ const editionSetup = [
     name: 'edition',
     message: 'Which edition do you want to use (defaults to edition-node)?',
     choices: [
+      {
+        name: 'edition-twig (php engine)',
+        value: '@pattern-lab/edition-twig',
+      },
       {
         name: 'edition-node',
         value: '@pattern-lab/edition-node',

packages/cli/bin/inquiries/starterkit.js

@@ -21,26 +21,26 @@ const starterkitSetup = [
         name: 'starterkit-mustache-foundation',
         value: 'starterkit-mustache-foundation',
       },
-      {
-        name: 'starterkit-twig-base',
-        value: 'starterkit-twig-base',
-      },
+      // {
+      //   name: 'starterkit-twig-base',
+      //   value: 'starterkit-twig-base',
+      // },
       {
         name: 'starterkit-twig-demo',
-        value: 'starterkit-twig-demo',
+        value: '@pattern-lab/starterkit-twig-demo',
       },
       {
         name: 'starterkit-mustache-materialdesign',
         value: 'starterkit-mustache-materialdesign',
       },
-      {
-        name: 'starterkit-twig-drupal-demo',
-        value: 'starterkit-twig-drupal-demo',
-      },
-      {
-        name: 'starterkit-twig-drupal-minimal',
-        value: 'starterkit-twig-drupal-minimal',
-      },
+      // {
+      //   name: 'starterkit-twig-drupal-demo',
+      //   value: 'starterkit-twig-drupal-demo',
+      // },
+      // {
+      //   name: 'starterkit-twig-drupal-minimal',
+      //   value: 'starterkit-twig-drupal-minimal',
+      // },
       {
         name: 'starterkit-mustache-webdesignday',
         value: 'starterkit-mustache-webdesignday',

packages/cli/bin/install-edition.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const merge = require('deepmerge');
 const EOL = require('os').EOL;
 const {
   checkAndInstallPackage,
@@ -21,6 +22,7 @@ const installEdition = (edition, config, projectDir) => {
      * 4. Do custom post-install procedures for different core editions:
      * 4.1 Copy gulpfile.js for edition-node-gulp
      * 4.2 Copy scripts for edition-node
+     * 4.3 Copy items for edition-twig
      */
     const sourceDir = config.paths.source.root;
     yield checkAndInstallPackage(edition); // 1
@@ -51,6 +53,29 @@ const installEdition = (edition, config, projectDir) => {
         );
         break;
       }
+      // 4.3
+      case '@pattern-lab/edition-twig': {
+        const editionPath = path.resolve('./node_modules', edition);
+        const editionConfigPath = path.resolve(
+          editionPath,
+          'patternlab-config.json'
+        );
+        const editionConfig = require(editionConfigPath);
+
+        pkg.scripts = Object.assign(
+          {},
+          pkg.scripts || {},
+          yield getJSONKey(edition, 'scripts')
+        );
+
+        yield copyAsync(
+          path.resolve(editionPath, 'alter-twig.php'),
+          path.resolve(sourceDir, '../', 'alter-twig.php')
+        );
+
+        config = merge(config, editionConfig);
+        break;
+      }
     }
     yield writeJsonAsync(path.resolve(projectDir, 'package.json'), pkg, {
       spaces: 2,

packages/cli/bin/install-starterkit.js

@@ -1,20 +1,27 @@
 'use strict';
 const path = require('path');
-const checkAndInstallPackage = require('./utils').checkAndInstallPackage;
-const copyAsync = require('./utils').copyAsync;
-const wrapAsync = require('./utils').wrapAsync;
+const fs = require('fs-extra');
+const {
+  copyAsync,
+  wrapAsync,
+  checkAndInstallPackage,
+  readJsonAsync,
+} = require('./utils');
 
 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 copyAsync(
-      path.resolve('./node_modules', name, 'dist'),
-      path.resolve(sourceDir)
-    );
-    return name;
+    const kitPath = path.resolve('./node_modules', name);
+    yield copyAsync(path.resolve(kitPath, 'dist'), path.resolve(sourceDir));
+    let kitConfig;
+    const kitConfigPath = path.resolve(kitPath, 'patternlab-config.json');
+    if (fs.existsSync(kitConfigPath)) {
+      kitConfig = yield readJsonAsync(kitConfigPath);
+    }
+    return kitConfig;
   });
 
 module.exports = installStarterkit;

packages/cli/bin/scaffold.js

@@ -1,5 +1,7 @@
 'use strict';
 const path = require('path');
+const execa = require('execa');
+const fs = require('fs');
 const wrapAsync = require('./utils').wrapAsync;
 const mkdirsAsync = require('./utils').mkdirsAsync;
 
@@ -14,6 +16,9 @@ const mkdirsAsync = require('./utils').mkdirsAsync;
  */
 const scaffold = (projectDir, sourceDir, publicDir, exportDir) =>
   wrapAsync(function*() {
+    if (!fs.existsSync(path.resolve(projectDir, 'package.json'))) {
+      execa.sync('npm', ['init', '-y']);
+    }
     /**
      * Create mandatory files structure
      * 1. Create project source directory

packages/cli/package.json

@@ -14,6 +14,7 @@
     "archiver": "2.1.1",
     "chalk": "2.4.1",
     "commander": "2.15.1",
+    "deepmerge": "^2.1.1",
     "execa": "0.10.0",
     "fs-extra": "6.0.1",
     "glob": "7.1.2",

packages/create/index.js

@@ -0,0 +1,4 @@
+#! /usr/bin/env node
+const init = require('@pattern-lab/cli/bin/cli-actions/init');
+
+init({});

packages/create/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@pattern-lab/create",
+  "version": "1.0.0",
+  "description": "",
+  "bin": "index.js",
+  "scripts": {},
+  "dependencies": {
+    "@pattern-lab/cli": "0.0.2-alpha.0"
+  },
+  "author": "",
+  "license": "MIT"
+}