Skip to content

Commit

Permalink
fix: fetch semantic release when needed
Browse files Browse the repository at this point in the history
  • Loading branch information
jdx committed Jan 29, 2018
1 parent 08b3b7a commit 7340723
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 34 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"bin": "bin/run",
"bugs": "https://github.com/dxcli/create-dxcli/issues",
"dependencies": {
"@dxcli/command": "^0.2.4",
"@dxcli/config": "^0.1.33",
"@dxcli/engine": "^0.1.17",
"@dxcli/command": "^0.2.5",
"@dxcli/config": "^0.1.37",
"@dxcli/engine": "^0.1.18",
"@dxcli/version": "^0.1.12",
"cli-ux": "^3.3.8",
"debug": "^3.1.0",
Expand All @@ -20,7 +20,7 @@
"yosay": "^2.0.1"
},
"devDependencies": {
"@dxcli/dev": "^2.0.15",
"@dxcli/dev": "^2.0.16",
"@dxcli/semantic-release": "^0.3.3",
"@dxcli/test": "^0.9.18",
"@dxcli/tslint": "^0.1.3",
Expand Down
5 changes: 2 additions & 3 deletions src/generators/app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class App extends Generator {
message: 'components to include',
choices: [
{name: 'typescript', checked: this.fromScratch ? false : !!this.pjson.devDependencies.typescript},
{name: 'semantic-release', checked: this.fromScratch ? false : !!this.pjson.devDependencies['@dxcli/semantic-release']},
{name: 'semantic-release', checked: this.fromScratch ? false : !!this.pjson.scripts.commitmsg},
{name: 'mocha', checked: this.fromScratch ? false : !!this.pjson.devDependencies.mocha},
],
filter: ((arr: string[]) => _.keyBy(arr)) as any,
Expand Down Expand Up @@ -226,7 +226,7 @@ class App extends Generator {
this.pjson.scripts.prepublishOnly = 'nps build'
}
if (this.semantic_release) {
this.pjson.scripts.commitmsg = 'dxcli-commitlint'
this.pjson.scripts.commitmsg = 'commitlint -x @commitlint/config-conventional -e $GIT_PARAMS'
}
}

Expand Down Expand Up @@ -347,7 +347,6 @@ class App extends Generator {
'@dxcli/test',
)
}
if (this.semantic_release) devDependencies.push('@dxcli/semantic-release')
if (this.ts) {
devDependencies.push(
'typescript',
Expand Down
1 change: 1 addition & 0 deletions templates/circle.yml.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
- restore_cache: *restore_cache
- run: .circleci/setup_git
- run: .circleci/yarn
- run: yarn global add @dxcli/semantic-release@1
- run: yarn exec nps release
<%_ } _%>

Expand Down
42 changes: 15 additions & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@
lodash "^4.17.4"
tslib "^1.9.0"

"@dxcli/command@^0.2.4":
version "0.2.4"
resolved "https://registry.yarnpkg.com/@dxcli/command/-/command-0.2.4.tgz#697dd134d60b409e2a42b86260835e78967d10de"
"@dxcli/command@^0.2.5":
version "0.2.5"
resolved "https://registry.yarnpkg.com/@dxcli/command/-/command-0.2.5.tgz#f9078fb5745f45536de0636c069174033af4a9ff"
dependencies:
"@dxcli/parser" "^0.0.5"
debug "^3.1.0"
lodash "^4.17.4"
tslib "^1.9.0"

"@dxcli/config@^0.1.33":
version "0.1.33"
resolved "https://registry.yarnpkg.com/@dxcli/config/-/config-0.1.33.tgz#b29c059c2f5b8b764f00ccf42b2ea7aaa4f962e4"
"@dxcli/config@^0.1.37":
version "0.1.37"
resolved "https://registry.yarnpkg.com/@dxcli/config/-/config-0.1.37.tgz#7014bd6a6d2ae83d40bfe153c06b3a3e1e35dfd2"
dependencies:
cli-ux "^3.3.8"
debug "^3.1.0"
Expand All @@ -131,11 +131,10 @@
lodash "^4.17.4"
read-pkg "^3.0.0"

"@dxcli/dev@^2.0.15":
version "2.0.15"
resolved "https://registry.yarnpkg.com/@dxcli/dev/-/dev-2.0.15.tgz#2984dabb5e8069515ed328cb59d920a00bee7483"
"@dxcli/dev@^2.0.16":
version "2.0.16"
resolved "https://registry.yarnpkg.com/@dxcli/dev/-/dev-2.0.16.tgz#8d1d30fb02a02a1595d74bf464e71593228b0e93"
dependencies:
"@dxcli/nyc-config" "^0.0.4"
"@types/ansi-styles" "^2.0.30"
"@types/chai" "^4.1.2"
"@types/lodash" "^4.14.97"
Expand All @@ -146,24 +145,17 @@
"@types/read-pkg" "^3.0.0"
"@types/strip-ansi" "^3.0.0"
"@types/supports-color" "^3.1.0"
eslint-config-dxcli "^1.2.0"
eslint-config-dxcli "^1.2.1"
nyc "^11.4.1"

"@dxcli/engine@^0.1.17":
version "0.1.17"
resolved "https://registry.yarnpkg.com/@dxcli/engine/-/engine-0.1.17.tgz#77f067fd8ff187e12da16d06ac251e4b75cf23cf"
dependencies:
"@dxcli/loader" "^0.2.12"
cli-ux "^3.3.8"
debug "^3.1.0"

"@dxcli/loader@^0.2.12":
version "0.2.12"
resolved "https://registry.yarnpkg.com/@dxcli/loader/-/loader-0.2.12.tgz#d4e65c71d344de28c7434b9457ae50fef089d646"
"@dxcli/engine@^0.1.18":
version "0.1.18"
resolved "https://registry.yarnpkg.com/@dxcli/engine/-/engine-0.1.18.tgz#7f7ce2fea40efd50153026bd50bd739baef67c33"
dependencies:
"@dxcli/manifest-file" "^0.1.0"
cli-ux "^3.3.8"
debug "^3.1.0"
fs-extra "^5.0.0"
globby "^7.1.1"
lodash "^4.17.4"

Expand All @@ -177,10 +169,6 @@
lodash "^4.17.4"
rwlockfile "^2.0.21"

"@dxcli/nyc-config@^0.0.4":
version "0.0.4"
resolved "https://registry.yarnpkg.com/@dxcli/nyc-config/-/nyc-config-0.0.4.tgz#bd60c089aaa6d5da34e415bab6bc527d8c35a210"

"@dxcli/parser@^0.0.5":
version "0.0.5"
resolved "https://registry.yarnpkg.com/@dxcli/parser/-/parser-0.0.5.tgz#51daf8133e8cec6ff21bfa464c4d58cd46b5ed99"
Expand Down Expand Up @@ -1641,7 +1629,7 @@ eslint-ast-utils@^1.0.0:
lodash.get "^4.4.2"
lodash.zip "^4.2.0"

eslint-config-dxcli@^1.2.0:
eslint-config-dxcli@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/eslint-config-dxcli/-/eslint-config-dxcli-1.2.1.tgz#8e65ee698fa77e9485462c788fa466edffccc13d"
dependencies:
Expand Down

0 comments on commit 7340723

Please sign in to comment.