fix: updated generator

.circleci/config.yml

@@ -9,14 +9,14 @@ jobs:
       - checkout
       - restore_cache: &restore_cache
           keys:
-            - v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}}
-            - v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-
-            - v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum ".circleci/config.yml"}}-master-
+            - v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum "scripts/circleci"}}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}}
+            - v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum "scripts/circleci"}}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-
+            - v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum "scripts/circleci"}}-{{checksum ".circleci/config.yml"}}-master-
       - run: ./scripts/circleci
       - store_test_results:
           path: ~/cli/reports
       - save_cache: &save_cache
-          key: v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}}
+          key: v0-yarn-{{ .Environment.CIRCLE_JOB }}-{{checksum "scripts/circleci"}}-{{checksum ".circleci/config.yml"}}-{{ .Branch }}-{{checksum "yarn.lock"}}
           paths:
             - ~/cli/node_modules
             - /usr/local/share/.cache/yarn

.eslintignore

@@ -0,0 +1 @@
+

.gitignore

@@ -1,7 +1,6 @@
+*-debug.log
+*-error.log
 /coverage
-/lib
 /node_modules
 /tmp
-
-*-error.log
-*-debug.log
+/lib

bin/run

@@ -1,15 +1,3 @@
 #!/usr/bin/env node
 
-const {createEnv} = require('yeoman-environment')
-
-const env = createEnv()
-
-env.register(
-  require.resolve('generator-dxcli'),
-  'dxcli:app'
-)
-
-const type = process.argv[2]
-if (!type) throw new Error('Usage: yarn create dxcli (single|multi|plugin|base)')
-
-env.run('dxcli:app', {type, path: process.argv[3]})
+require('generator-dxcli/generators/run')

package.json

@@ -5,7 +5,7 @@
   "author": "Jeff Dickey @jdxcode",
   "bin": "bin/run",
   "dependencies": {
-    "generator-dxcli": "^1.5.0",
+    "generator-dxcli": "^1.6.0",
     "yeoman-environment": "^2.0.5"
   },
   "devDependencies": {

scripts/circleci

@@ -21,12 +21,13 @@ if [[ "$CLI_ENGINE_GREENKEEPER_BRANCH" == 1 ]]; then
   greenkeeper-lockfile-upload
 fi
 
-NYC="npx nyc --nycrc-path node_modules/@dxcli/dev-nyc-config/.nycrc"
+CWD=$(pwd)
+NYC="./node_modules/.bin/nyc --nycrc-path node_modules/@dxcli/dev-nyc-config/.nycrc"
 mkdir -p reports
-MOCHA_FILE="reports/mocha.xml" \
+MOCHA_FILE="$CWD/reports/mocha.xml" \
   DXCLI_MOCHA_OPTS="--reporter mocha-junit-reporter" \
-  DXCLI_ESLINT_OPTS="--format junit --output-file reports/eslint.xml" \
-  DXCLI_TSLINT_OPTS="--format junit > reports/tslint.xml" \
+  DXCLI_ESLINT_OPTS="--format junit --output-file $CWD/reports/eslint.xml" \
+  DXCLI_TSLINT_OPTS="--format junit > $CWD/reports/tslint.xml" \
   $NYC yarn test
 $NYC report --reporter=text-lcov > coverage.lcov
 

yarn.lock

@@ -1632,16 +1632,17 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-generator-dxcli@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/generator-dxcli/-/generator-dxcli-1.5.0.tgz#c343668432fea07d42855c48f0f64e9c900333f1"
+generator-dxcli@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/generator-dxcli/-/generator-dxcli-1.6.0.tgz#ae09c3b2e989cf006c4dce55051b28c1ea0aef8f"
   dependencies:
     cli-ux "^2.0.21"
     debug "^3.1.0"
     fixpack "^2.3.1"
     lodash "^4.17.4"
     sort-pjson "^1.0.1"
     ts-lodash "^4.0.11"
+    yeoman-environment "^2.0.5"
     yeoman-generator "^2.0.1"
     yosay "^2.0.1"