From 882496d30c85c509053d1892b6a68e4ec2225f23 Mon Sep 17 00:00:00 2001
From: Alan <alan@salsadigital.com.au>
Date: Wed, 17 Jul 2019 11:36:56 +1000
Subject: [PATCH] [SDPA-2718] Update docs / new-component /
 package-dependencies scripts. (#412)

* [SDPA-2718] Update generate-readme to work with storybook 5.

* [SDPA-2718] Update package-dependencies script.

* [SDPA-2718] Update new-package script.

* [SDPA-2718] Fixes to new-component script.
---
 package.json                                  |  5 +-
 src/package.json                              |  6 +-
 .../.npmignore                                |  0
 .../LICENSE                                   |  0
 .../component_template.vue}                   |  8 +-
 .../generate-component/generate-component.js  | 91 +++++++++++++++++++
 .../generate-component/index_template.js      |  4 +
 .../generate-component/package_template.json  | 15 +++
 .../generate-component/stories_template.js    | 15 +++
 .../generate-dependencies/dependency-utils.js | 14 +--
 .../generate-dependencies.js                  |  7 +-
 .../generate-package/generate-package.js      | 87 ------------------
 .../generate-package/index_template.js        |  4 -
 .../generate-package/package_template.json    | 15 ---
 .../generate-package/stories_template.js      | 16 ----
 .../generate-readme/generate-readme.js        | 54 ++++++++---
 yarn.lock                                     | 32 ++++++-
 17 files changed, 221 insertions(+), 152 deletions(-)
 rename src/scripts/{generate-package => generate-component}/.npmignore (100%)
 rename src/scripts/{generate-package => generate-component}/LICENSE (100%)
 rename src/scripts/{generate-package/package_template.vue => generate-component/component_template.vue} (72%)
 create mode 100644 src/scripts/generate-component/generate-component.js
 create mode 100644 src/scripts/generate-component/index_template.js
 create mode 100644 src/scripts/generate-component/package_template.json
 create mode 100644 src/scripts/generate-component/stories_template.js
 delete mode 100644 src/scripts/generate-package/generate-package.js
 delete mode 100644 src/scripts/generate-package/index_template.js
 delete mode 100644 src/scripts/generate-package/package_template.json
 delete mode 100644 src/scripts/generate-package/stories_template.js

diff --git a/package.json b/package.json
index 0a12a7cda..9ad43a7a3 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,10 @@
     "bay:destroy": "docker-compose down -v",
     "bay:logs": "docker-compose logs",
     "bay:cli": "docker exec -i $(docker-compose ps -q app)",
-    "bay:pull": "docker image ls --format \"{{.Repository}}:{{.Tag}}\" | grep amazeeio | grep -v none | xargs -n1 docker pull | cat"
+    "bay:pull": "docker image ls --format \"{{.Repository}}:{{.Tag}}\" | grep amazeeio | grep -v none | xargs -n1 docker pull | cat",
+    "docs:storybook": "cd src/ && yarn run docs",
+    "new-component:storybook": "cd src/ && yarn run new-component",
+    "package-dependencies:storybook": "cd src/ && yarn run package-dependencies"
   },
   "devDependencies": {
     "@babel/core": "^7.5.0",
diff --git a/src/package.json b/src/package.json
index 9845dad55..76b825fa9 100644
--- a/src/package.json
+++ b/src/package.json
@@ -7,7 +7,10 @@
   "scripts": {
     "start": "start-storybook -p 6006 -s ./static",
     "build-storybook": "cross-env NODE_ENV=production build-storybook -c .storybook -s ./static -o ./public",
-    "test:unit": "cross-env NODE_ENV=test jest --colors"
+    "test:unit": "cross-env NODE_ENV=test jest --colors",
+    "docs": "node ./scripts/generate-readme/generate-readme.js",
+    "new-component": "node ./scripts/generate-component/generate-component.js",
+    "package-dependencies": "node ./scripts/generate-dependencies/generate-dependencies.js"
   },
   "dependencies": {
     "@dpc-sdp/ripple-accordion": "1.0.0-beta.8",
@@ -76,6 +79,7 @@
     "svg-sprite-loader": "^3.7.3",
     "svgo": "^1.2.2",
     "svgo-loader": "^2.2.1",
+    "twig": "^1.13.3",
     "url-loader": "^2.0.1",
     "vue-loader": "^15.7.0",
     "vue-style-loader": "^4.1.2",
diff --git a/src/scripts/generate-package/.npmignore b/src/scripts/generate-component/.npmignore
similarity index 100%
rename from src/scripts/generate-package/.npmignore
rename to src/scripts/generate-component/.npmignore
diff --git a/src/scripts/generate-package/LICENSE b/src/scripts/generate-component/LICENSE
similarity index 100%
rename from src/scripts/generate-package/LICENSE
rename to src/scripts/generate-component/LICENSE
diff --git a/src/scripts/generate-package/package_template.vue b/src/scripts/generate-component/component_template.vue
similarity index 72%
rename from src/scripts/generate-package/package_template.vue
rename to src/scripts/generate-component/component_template.vue
index 082f06a9c..619a284ad 100644
--- a/src/scripts/generate-package/package_template.vue
+++ b/src/scripts/generate-component/component_template.vue
@@ -1,5 +1,7 @@
 <template>
-  <div class="{{packageClassName}}"></div>
+  <div class="{{componentClassName}}">
+    <span>{{ componentNaturalName }}</span>
+  </div>
 </template>
 
 <script>
@@ -7,7 +9,7 @@
 // import RplIcon from '@dpc-sdp/ripple-icon'
 
 export default {
-  name: '{{packageRippleName}}',
+  name: '{{componentRippleName}}',
   props: {
     // ...
   },
@@ -29,7 +31,7 @@ export default {
   @import "~@dpc-sdp/ripple-global/scss/settings";
   @import "~@dpc-sdp/ripple-global/scss/tools";
 
-  .{{packageClassName}} {
+  .{{componentClassName}} {
     // Add styles
   }
 </style>
diff --git a/src/scripts/generate-component/generate-component.js b/src/scripts/generate-component/generate-component.js
new file mode 100644
index 000000000..c98cc0e79
--- /dev/null
+++ b/src/scripts/generate-component/generate-component.js
@@ -0,0 +1,91 @@
+/**
+ * Generates a Package and folder for a new component, based off the default
+ * templates.
+ */
+
+let Twig = require('twig')
+let fs = require('fs')
+let path = require('path')
+const packageManager = 'yarn'
+const componentDirectory = '../packages/components'
+
+if (process.argv.length < 5) {
+  console.error(`Missing arguments: ${packageManager} run new-component:storybook "[Component name]" "[Component description]" "[Atoms / Molecules / Organisms]"`)
+  console.log(`e.g. ${packageManager} run new-component:storybook "My Component" "A component to..." "Organisms"`)
+  return true
+}
+
+let pkg = fs.readFileSync('./package.json', 'utf-8')
+
+// Arguments
+let componentName = process.argv.length > 2 ? process.argv[2] : 'My Component'
+let description = process.argv.length > 3 ? process.argv[3] : 'A component for...'
+let atom = process.argv.length > 4 ? process.argv[4] : 'Organisms'
+let version = JSON.parse(pkg).version
+
+// Helper functions
+function getSnakeCase (val) {
+  return val.toLowerCase().replace(/\s/gi, '-')
+}
+
+function getTitleCase (val) {
+  const arr = val.split(' ')
+  for (let i = 0; i < arr.length; i++) {
+    let word = arr[i]
+    arr[i] = word[0].toUpperCase() + word.substr(1).toLowerCase()
+  }
+  return arr.join(' ')
+}
+
+function getTitleCaseNoSpace (val) {
+  return getTitleCase(val).replace(/\s/gi, '')
+}
+
+function getCamelCase (val) {
+  const word = getTitleCaseNoSpace(val)
+  return (word[0].toLowerCase() + word.substr(1))
+}
+
+// Get Names
+let data = {
+  componentNaturalName: getTitleCase(componentName),
+  componentSpacelessName: getTitleCaseNoSpace(componentName),
+  componentFileName: getTitleCaseNoSpace(componentName),
+  componentDemoDataName: getCamelCase(componentName),
+  componentRippleName: 'Rpl' + getTitleCaseNoSpace(componentName),
+  componentClassName: 'rpl-' + getSnakeCase(componentName),
+  componentPackageName: 'ripple-' + getSnakeCase(componentName),
+  componentRippleExportName: '{ ' + 'Rpl' + getTitleCaseNoSpace(componentName) + ' }',
+  componentDescription: description,
+  componentAtomFolder: getTitleCaseNoSpace(atom),
+  componentVersion: version
+}
+const directory = componentDirectory + '/' + data.componentAtomFolder + '/' + data.componentSpacelessName + '/'
+const files = [
+  { template: '.npmignore', output: '.npmignore' },
+  { template: 'component_template.vue', output: data.componentSpacelessName + '.vue' },
+  { template: 'index_template.js', output: 'index.js' },
+  { template: 'LICENSE', output: 'LICENSE' },
+  { template: 'package_template.json', output: 'package.json' },
+  { template: 'stories_template.js', output: 'stories.js' }
+]
+
+// Make folder
+if (!fs.existsSync(directory)) {
+  fs.mkdirSync(directory)
+}
+// Create all files
+files.forEach((item) => {
+  Twig.renderFile(path.join(__dirname, item.template), data, (err, twigOutput) => {
+    if (err) {
+      console.log(err)
+    } else {
+      fs.writeFileSync(directory + item.output, twigOutput)
+    }
+  })
+})
+
+console.log(`Created "${getTitleCase(componentName)}"`)
+console.log(`\nTo complete setup, run:`)
+console.log(`- ${packageManager} run package-dependencies:storybook`)
+console.log(`- ${packageManager} run docs:storybook`)
diff --git a/src/scripts/generate-component/index_template.js b/src/scripts/generate-component/index_template.js
new file mode 100644
index 000000000..5cb51c996
--- /dev/null
+++ b/src/scripts/generate-component/index_template.js
@@ -0,0 +1,4 @@
+import {{componentRippleName}} from './{{componentFileName}}.vue'
+
+export {{componentRippleExportName}}
+export default {{componentRippleName}}
diff --git a/src/scripts/generate-component/package_template.json b/src/scripts/generate-component/package_template.json
new file mode 100644
index 000000000..6f31fe512
--- /dev/null
+++ b/src/scripts/generate-component/package_template.json
@@ -0,0 +1,15 @@
+{
+  "name": "@dpc-sdp/{{componentPackageName}}",
+  "version": "{{componentVersion}}",
+  "description": "{{componentDescription}}",
+  "license": "Apache-2.0",
+  "main": "index.js",
+  "homepage": "https://ripple.sdp.vic.gov.au",
+  "repository": "https://github.com/dpc-sdp/ripple/tree/master/packages/components/{{componentAtomFolder}}/{{componentSpacelessName}}",
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@dpc-sdp/ripple-global": "{{componentVersion}}"
+  }
+}
diff --git a/src/scripts/generate-component/stories_template.js b/src/scripts/generate-component/stories_template.js
new file mode 100644
index 000000000..b973051d0
--- /dev/null
+++ b/src/scripts/generate-component/stories_template.js
@@ -0,0 +1,15 @@
+import { storiesOf } from '@storybook/vue'
+
+import {
+  withKnobs
+} from '@storybook/addon-knobs/vue'
+
+import {{componentRippleName}} from './{{componentFileName}}.vue'
+
+storiesOf('{{componentAtomFolder}}/{{componentSpacelessName}}', module)
+  .addDecorator(withKnobs)
+  .add('{{componentNaturalName}}', () => ({
+    components: { {{componentRippleName}} },
+    template: `<{{componentClassName}} />`,
+    props: {}
+  }))
diff --git a/src/scripts/generate-dependencies/dependency-utils.js b/src/scripts/generate-dependencies/dependency-utils.js
index 0dee7be5b..401f68452 100644
--- a/src/scripts/generate-dependencies/dependency-utils.js
+++ b/src/scripts/generate-dependencies/dependency-utils.js
@@ -4,6 +4,7 @@
  */
 
 let fs = require('fs')
+const componentDirectory = '../packages/components'
 
 function getImportStatmentsFromVueFiles (directoryArray) {
   const importSet = new Set()
@@ -57,9 +58,9 @@ function listMissingPackages (packageDirectories) {
 }
 
 function fixMissingPackages (packageDirectories) {
-  // Get lerna version.
-  let lerna = fs.readFileSync('./lerna.json', 'utf-8')
-  lerna = JSON.parse(lerna)
+  // Get version.
+  let rootPkg = fs.readFileSync('./package.json', 'utf-8')
+  let version = JSON.parse(rootPkg).version
 
   packageDirectories.forEach(pkg => {
     // Get each package.
@@ -83,7 +84,7 @@ function fixMissingPackages (packageDirectories) {
 
     // Add ripple packages.
     imports.forEach(neededPackage => {
-      pkgObj.dependencies[neededPackage] = lerna.version
+      pkgObj.dependencies[neededPackage] = version
     })
 
     orderDependencies(pkgObj)
@@ -105,7 +106,7 @@ function orderDependencies (obj) {
 
 function getPackageDirectories () {
   let pkgglob = require('glob-fs')({ gitignore: true })
-  return pkgglob.readdirSync('./packages/**/package.json')
+  return pkgglob.readdirSync(`${componentDirectory}/**/package.json`)
 }
 
 function addComponentsToRootPackage (packageDirectories) {
@@ -122,10 +123,9 @@ function addComponentsToRootPackage (packageDirectories) {
 
   // Add ripple packages to root dependencies.
   packageDirectories.forEach(pkg => {
-    let pkgPath = pkg.substr(0, (pkg.lastIndexOf('/')))
     let pkgJson = fs.readFileSync(pkg)
     pkgJson = JSON.parse(pkgJson)
-    packageJson.dependencies[pkgJson.name] = `file:${pkgPath}`
+    packageJson.dependencies[pkgJson.name] = pkgJson.version
   })
 
   orderDependencies(packageJson)
diff --git a/src/scripts/generate-dependencies/generate-dependencies.js b/src/scripts/generate-dependencies/generate-dependencies.js
index 1311a079d..1c65eb76c 100644
--- a/src/scripts/generate-dependencies/generate-dependencies.js
+++ b/src/scripts/generate-dependencies/generate-dependencies.js
@@ -1,13 +1,12 @@
 /**
  * Adds package dependencies to:
  * * Root `./package.json`
- * * Components `./packages/.../package.json`
+ * * Components `./components/.../package.json`
  *
  * Requires:
  *
  * 1. Each ripple component package to have a `package.json` file with:
  *   - name
- * 2. The root directory to have a `lerna.json` file with:
  *   - version
  *
  * Script expects to be called via npm in the root directory:
@@ -20,8 +19,8 @@ const utils = require('./dependency-utils')
 // Get all ripple packages and add depdendencies.
 const packages = utils.getPackageDirectories()
 
-// Add all ripple `./packages/` to `./package.json`.
+// Add all ripple `./components/` to `./package.json`.
 utils.addComponentsToRootPackage(packages)
 
-// Add all imported ripple `./packages/` to `./packages/**/package.json`.
+// Add all imported ripple `./components/` to `./components/**/package.json`.
 utils.fixMissingPackages(packages)
diff --git a/src/scripts/generate-package/generate-package.js b/src/scripts/generate-package/generate-package.js
deleted file mode 100644
index 29bc00735..000000000
--- a/src/scripts/generate-package/generate-package.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Generates a Package and folder for a new package, based off the default
- * templates.
- */
-
-let Twig = require('twig')
-let fs = require('fs')
-let path = require('path')
-
-if (process.argv.length < 5) {
-  console.error('Missing arguments: npm run new-package "[Package name]" "[Package description]" "[Atoms / Molecules / Organisms]"')
-  console.log('e.g. npm run new-package "My Package" "A package to..." "Organisms"')
-  return true
-}
-
-let lerna = fs.readFileSync('./lerna.json', 'utf-8')
-lerna = JSON.parse(lerna)
-
-// Arguments
-let packageName = process.argv.length > 2 ? process.argv[2] : 'My Package'
-let description = process.argv.length > 3 ? process.argv[3] : 'A package for...'
-let atom = process.argv.length > 4 ? process.argv[4] : 'Organisms'
-let version = lerna.version
-
-// Helper functions
-function getSnakeCase (val) {
-  return val.toLowerCase().replace(/\s/gi, '-')
-}
-
-function getTitleCase (val) {
-  const arr = val.split(' ')
-  for (let i = 0; i < arr.length; i++) {
-    let word = arr[i]
-    arr[i] = word[0].toUpperCase() + word.substr(1).toLowerCase()
-  }
-  return arr.join(' ')
-}
-
-function getTitleCaseNoSpace (val) {
-  return getTitleCase(val).replace(/\s/gi, '')
-}
-
-function getCamelCase (val) {
-  const word = getTitleCaseNoSpace(val)
-  return (word[0].toLowerCase() + word.substr(1))
-}
-
-// Get Names
-let data = {
-  packageNaturalName: getTitleCase(packageName),
-  packageSpacelessName: getTitleCaseNoSpace(packageName),
-  packageFileName: getTitleCaseNoSpace(packageName),
-  packageDemoDataName: getCamelCase(packageName),
-  packageRippleName: 'Rpl' + getTitleCaseNoSpace(packageName),
-  packageClassName: 'rpl-' + getSnakeCase(packageName),
-  packagePackageName: 'ripple-' + getSnakeCase(packageName),
-  packageRippleExportName: '{ ' + 'Rpl' + getTitleCaseNoSpace(packageName) + ' }',
-  packageDescription: description,
-  packageAtomFolder: getTitleCaseNoSpace(atom),
-  packageVersion: version
-}
-const directory = './packages/' + data.packageAtomFolder + '/' + data.packageSpacelessName + '/'
-const files = [
-  { template: '.npmignore', output: '.npmignore' },
-  { template: 'package_template.vue', output: data.packageSpacelessName + '.vue' },
-  { template: 'index_template.js', output: 'index.js' },
-  { template: 'LICENSE', output: 'LICENSE' },
-  { template: 'package_template.json', output: 'package.json' },
-  { template: 'stories_template.js', output: 'stories.js' }
-]
-
-// Make folder
-if (!fs.existsSync(directory)) {
-  fs.mkdirSync(directory)
-}
-// Create all files
-files.forEach((item) => {
-  Twig.renderFile(path.join(__dirname, item.template), data, (err, twigOutput) => {
-    if (err) {
-      console.log(err)
-    } else {
-      fs.writeFileSync(directory + item.output, twigOutput)
-    }
-  })
-})
-
-console.log(`Created "${getTitleCase(packageName)}"`)
diff --git a/src/scripts/generate-package/index_template.js b/src/scripts/generate-package/index_template.js
deleted file mode 100644
index 91d818345..000000000
--- a/src/scripts/generate-package/index_template.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import {{packageRippleName}} from './{{packageFileName}}.vue'
-
-export {{packageRippleExportName}}
-export default {{packageRippleName}}
diff --git a/src/scripts/generate-package/package_template.json b/src/scripts/generate-package/package_template.json
deleted file mode 100644
index cb10fb5e3..000000000
--- a/src/scripts/generate-package/package_template.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@dpc-sdp/{{packagePackageName}}",
-  "version": "{{packageVersion}}",
-  "description": "{{packageDescription}}",
-  "license": "Apache-2.0",
-  "main": "index.js",
-  "homepage": "https://ripple.sdp.vic.gov.au",
-  "repository": "https://github.com/dpc-sdp/ripple/tree/master/packages/{{packageAtomFolder}}/{{packageSpacelessName}}",
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "@dpc-sdp/ripple-global": "{{packageVersion}}"
-  }
-}
diff --git a/src/scripts/generate-package/stories_template.js b/src/scripts/generate-package/stories_template.js
deleted file mode 100644
index 7b4ae645f..000000000
--- a/src/scripts/generate-package/stories_template.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { storiesOf } from '@storybook/vue'
-import { withReadme } from 'storybook-readme'
-
-import {
-  withKnobs
-} from '@storybook/addon-knobs/vue'
-
-import {{packageRippleName}} from './{{packageFileName}}.vue'
-
-storiesOf('{{packageAtomFolder}}/{{packageSpacelessName}}', module)
-  .addDecorator(withKnobs)
-  .add('{{packageNaturalName}}', withReadme(readme, () => ({
-    components: { {{packageRippleName}} },
-    template: `<{{packageClassName}} />`,
-    props: {}
-  })))
diff --git a/src/scripts/generate-readme/generate-readme.js b/src/scripts/generate-readme/generate-readme.js
index 2873038ea..22f3f9e86 100644
--- a/src/scripts/generate-readme/generate-readme.js
+++ b/src/scripts/generate-readme/generate-readme.js
@@ -25,6 +25,41 @@ let glob = require('glob-fs')({ gitignore: true })
 let wrap = require('wordwrap')(80)
 let { getImportStatements, getImportStatementFromJS } = require('./get-imports')
 
+function getStoryOutline (story) {
+  let storiesOf = /(?:storiesOf\(')([A-Za-z\/\s()]+)(?:',)/g
+  let storyMatch = storiesOf.exec(story)
+  let stories = []
+
+  while (storyMatch !== null) {
+    stories.push({
+      storyName: storyMatch[1],
+      storyIndex: storyMatch.index,
+      add: []
+    })
+    storyMatch = storiesOf.exec(story)
+  }
+
+  for (let i = 0; i < stories.length; i++) {
+    const element = stories[i]
+    const strStart = element.storyIndex
+    const strEnd = (i < stories.length - 1) ? stories[i+1].storyIndex : story.length
+    // Check for adds
+    const subStory = story.substring(strStart, strEnd)
+    let add = /(?:add\([\n\s]*)(?:')(.+)(?:',)/gim
+    let addMatch = add.exec(subStory)
+    while (addMatch !== null) {
+      const storyMatching = element.storyName.toLowerCase().replace(/\(|\)/g, '').replace(/\s|\/|\\/g, '-')
+      const addMatching = addMatch[1].toLowerCase().replace(/\(|\)/g, '').replace(/\s|\/|\\/g, '-')
+      stories[i].add.push({
+        path: `Storybook/${element.storyName}/${addMatch[1].replace('\\', '')}`,
+        params: `?path=/story/${storyMatching}--${addMatching}`
+      })
+      addMatch = add.exec(subStory)
+    }
+  }
+  return stories
+}
+
 function generateTemplate (directory) {
   let data = {
     packageName: '',
@@ -80,19 +115,14 @@ function generateTemplate (directory) {
   }
 
   // Get story parameters.
-  let story = fs.readFileSync(directory + 'stories.js', 'utf8')
-  let storiesOf = /(?:storiesOf\(')(.+)(?:',)/g
-  let storiesOfMatch = storiesOf.exec(story)
+  let storyFile = fs.readFileSync(directory + 'stories.js', 'utf8')
+  let stories = getStoryOutline(storyFile)
 
-  let add = /(?:add\([\n\s]*)(?:')(.+)(?:',)/gim
-  let addMatch = add.exec(story)
-  while (addMatch !== null) {
-    data.storybookParams.push({
-      path: 'Storybook/' + addMatch[1].replace('\\', ''),
-      params: '?selectedKind=' + encodeURI(storiesOfMatch[1]) + '&selectedStory=' + encodeURI(addMatch[1])
+  stories.forEach(story => {
+    story.add.forEach(add => {
+      data.storybookParams.push(add)
     })
-    addMatch = add.exec(story)
-  }
+  })
 
   // Add check for no-ssr folder.
 
@@ -109,7 +139,7 @@ function generateTemplate (directory) {
 }
 
 // Get all packages and generate.
-let packages = glob.readdirSync('./packages/**/package.json')
+let packages = glob.readdirSync('../packages/components/**/package.json')
 packages.forEach(item => {
   let packagePath = item.substr(0, (item.lastIndexOf('/') + 1))
   generateTemplate('./' + packagePath)
diff --git a/yarn.lock b/yarn.lock
index b18de108c..f5561b354 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6798,7 +6798,7 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-es6-promise@^4.0.3:
+es6-promise@^4.0.3, es6-promise@^4.2.5:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
@@ -7921,6 +7921,11 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
+foreachasync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
+  integrity sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -10743,6 +10748,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locutus@^2.0.5:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/locutus/-/locutus-2.0.11.tgz#83f85109971fd3dd620482a04381916e4a31d4f0"
+  integrity sha512-C0q1L38lK5q1t+wE0KY21/9szrBHxye6o2z5EJzU+5B79tubNOC+nLAEzTTn1vPUGoUuehKh8kYKqiVUTWRyaQ==
+  dependencies:
+    es6-promise "^4.2.5"
+
 lodash-es@^4.17.11:
   version "4.17.14"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.14.tgz#12a95a963cc5955683cee3b74e85458954f37ecc"
@@ -11375,7 +11387,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@3.0.4, minimatch@3.0.x, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -16442,6 +16454,15 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+twig@^1.13.3:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/twig/-/twig-1.13.3.tgz#895fe341beb6a3f53051318b90a40e0ab0e28fe9"
+  integrity sha512-Kjart2102Kf0IdsEmLonSJKcByU7o9uiJhBde3GhrNHrX4XenT5WSKu4Hpkx+rF6Kyppeyd48BKsCREIOPXd/g==
+  dependencies:
+    locutus "^2.0.5"
+    minimatch "3.0.x"
+    walk "2.3.x"
+
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -17026,6 +17047,13 @@ wait-on@3.2.0:
     request "^2.88.0"
     rx "^4.1.0"
 
+walk@2.3.x:
+  version "2.3.14"
+  resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.14.tgz#60ec8631cfd23276ae1e7363ce11d626452e1ef3"
+  integrity sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==
+  dependencies:
+    foreachasync "^3.0.0"
+
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"