Merge with upstream

Author: mikecote

.eslintignore

@@ -41,7 +41,7 @@ target
 # package overrides
 /packages/eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
-/packages/kbn-plugin-generator/sao_template/template
+/packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist
 /packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
 /packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/

.eslintrc.js

@@ -604,7 +604,6 @@ module.exports = {
     {
       files: [
         '.eslintrc.js',
-        'packages/kbn-plugin-generator/**/*.js',
         'packages/kbn-eslint-import-resolver-kibana/**/*.js',
         'packages/kbn-eslint-plugin-eslint/**/*',
         'x-pack/gulpfile.js',

packages/kbn-plugin-generator/README.md

@@ -17,17 +17,17 @@ If you are targeting **Kibana 6.3 or greater** then checkout the corresponding K
 To target the current development version of Kibana just use the default  `master` branch.
 
 ```sh
-node scripts/generate_plugin my_plugin_name
+node scripts/generate_plugin --name my_plugin_name -y
 # generates a plugin in `plugins/my_plugin_name`
 ```
 
-To target 6.3, use the `6.x` branch (until the `6.3` branch is created).
+To target 6.8, use the `6.8` branch.
 
 ```sh
 git checkout 6.x
 yarn kbn bootstrap # always bootstrap when switching branches
-node scripts/generate_plugin my_plugin_name
-# generates a plugin for Kibana 6.3 in `../kibana-extra/my_plugin_name`
+node scripts/generate_plugin --name my_plugin_name -y
+# generates a plugin for Kibana 6.8 in `../kibana-extra/my_plugin_name`
 ```
 
 The generate script supports a few flags; run it with the `--help` flag to learn more.
@@ -49,7 +49,7 @@ yarn kbn bootstrap
 
 ## Plugin Development Scripts
 
-Generated plugins receive a handful of scripts that can be used during development. Those scripts are detailed in the [README.md](sao_template/template/README.md) file in each newly generated plugin, and expose the scripts provided by the [Kibana plugin helpers](../kbn-plugin-helpers), but here is a quick reference in case you need it:
+Generated plugins receive a handful of scripts that can be used during development. Those scripts are detailed in the [README.md](template/README.md) file in each newly generated plugin, and expose the scripts provided by the [Kibana plugin helpers](../kbn-plugin-helpers), but here is a quick reference in case you need it:
 
 > ***NOTE:*** All of these scripts should be run from the generated plugin.
 

packages/kbn-plugin-generator/index.js

@@ -1,14 +1,26 @@
 {
   "name": "@kbn/plugin-generator",
-  "license": "Apache-2.0",
-  "private": true,
   "version": "1.0.0",
+  "private": true,
+  "license": "Apache-2.0",
+  "main": "target/index.js",
+  "scripts": {
+    "kbn:bootstrap": "node scripts/build",
+    "kbn:watch": "node scripts/build --watch"
+  },
   "dependencies": {
-    "chalk": "^4.1.0",
-    "dedent": "^0.7.0",
+    "@kbn/dev-utils": "1.0.0",
+    "ejs": "^3.1.5",
     "execa": "^4.0.2",
-    "getopts": "^2.2.4",
-    "lodash": "^4.17.15",
-    "sao": "^0.22.12"
+    "inquirer": "^7.3.3",
+    "normalize-path": "^3.0.0",
+    "prettier": "^2.0.5",
+    "vinyl": "^2.2.0",
+    "vinyl-fs": "^3.0.3"
+  },
+  "devDependencies": {
+    "@types/ejs": "^3.0.4",
+    "@types/prettier": "^2.0.2",
+    "@types/inquirer": "^7.3.1"
   }
 }