From 2946e69840ab10fbafde472b7b26c78f23696ae3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 13 Feb 2020 16:12:12 +0000 Subject: [PATCH 1/6] Add renovate.json --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..f45d8f1 --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} From 0882622e8391f5dd80ae4aa7e6930ac8025aeb63 Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Thu, 13 Feb 2020 17:17:32 +0100 Subject: [PATCH 2/6] Update renovate.json --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index f45d8f1..0588121 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,6 @@ { "extends": [ - "config:base" + "config:base", + "gitmoji" ] } From 15ef0fc60b9446c63c8d2628c9b26d6c2f07ea87 Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Thu, 13 Feb 2020 17:18:52 +0100 Subject: [PATCH 3/6] Update renovate.json --- renovate.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/renovate.json b/renovate.json index 0588121..2cf85a5 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,3 @@ { - "extends": [ - "config:base", - "gitmoji" - ] + "extends": ["config:base","gitmoji"] } From 1f6b1392597c918b0e8346e6a3244cab92a72e07 Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Thu, 13 Feb 2020 17:20:13 +0100 Subject: [PATCH 4/6] Update renovate.json --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 2cf85a5..aa15052 100644 --- a/renovate.json +++ b/renovate.json @@ -1,3 +1,3 @@ { - "extends": ["config:base","gitmoji"] + "extends": ["config:base", "gitmoji"] } From c664d6d318447382c27d1cb60ca81732cfb581d4 Mon Sep 17 00:00:00 2001 From: Nicolas Beaussart Date: Thu, 13 Feb 2020 17:22:17 +0100 Subject: [PATCH 5/6] :white_check_mark: fix tests for git config --- src/tests/add/prettier.spec.ts | 6 ++++-- src/tests/add/tailwind.spec.ts | 6 ++++-- src/utls/base-add-command.spec.ts | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/tests/add/prettier.spec.ts b/src/tests/add/prettier.spec.ts index 4d2ca48..5a58658 100644 --- a/src/tests/add/prettier.spec.ts +++ b/src/tests/add/prettier.spec.ts @@ -20,8 +20,10 @@ beforeEach(async () => { execPath = filesystem.path('/', 'tmp', tmpDirName); filesystem.dir(execPath); process.chdir(execPath); - await system.run('git config --global user.email "you@example.com"'); - await system.run('git config --global user.name "Your Name"'); + try { + await system.run('git config --global user.email "you@example.com"'); + await system.run('git config --global user.name "Your Name"'); + } catch {} }); afterEach(() => { console.log = originalLog; diff --git a/src/tests/add/tailwind.spec.ts b/src/tests/add/tailwind.spec.ts index d38e015..0f9b86c 100644 --- a/src/tests/add/tailwind.spec.ts +++ b/src/tests/add/tailwind.spec.ts @@ -20,8 +20,10 @@ beforeEach(async () => { execPath = filesystem.path('/', 'tmp', tmpDirName); filesystem.dir(execPath); process.chdir(execPath); - await system.run('git config --global user.email "you@example.com"'); - await system.run('git config --global user.name "Your Name"'); + try { + await system.run('git config --global user.email "you@example.com"'); + await system.run('git config --global user.name "Your Name"'); + } catch {} }); afterEach(() => { console.log = originalLog; diff --git a/src/utls/base-add-command.spec.ts b/src/utls/base-add-command.spec.ts index 999bc8d..ccbfec5 100644 --- a/src/utls/base-add-command.spec.ts +++ b/src/utls/base-add-command.spec.ts @@ -18,8 +18,10 @@ beforeEach(async () => { execPath = filesystem.path('/', 'tmp', tmpDirName); filesystem.dir(execPath); process.chdir(execPath); - await system.run('git config --global user.email "you@example.com"'); - await system.run('git config --global user.name "Your Name"'); + try { + await system.run('git config --global user.email "you@example.com"'); + await system.run('git config --global user.name "Your Name"'); + } catch {} }); afterEach(() => { console.log = originalLog; From 3eb2443a1f0db6f46e2942a5cdaa45c78205321e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 13 Feb 2020 16:29:31 +0000 Subject: [PATCH 6/6] :arrow_up: Upgrade dependency @oclif/config to v1.14.0 --- package.json | 2 +- yarn.lock | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a6741ca..a8a12b8 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "bugs": "https://github.com/beaussan/nbx/issues", "dependencies": { "@oclif/command": "1.5.19", - "@oclif/config": "1.13.3", + "@oclif/config": "1.14.0", "@oclif/errors": "1.2.2", "@oclif/plugin-help": "2.2.3", "@oclif/plugin-not-found": "1.2.3", diff --git a/yarn.lock b/yarn.lock index 9235528..19f35ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -996,7 +996,17 @@ debug "^4.1.1" semver "^5.6.0" -"@oclif/config@1.13.3", "@oclif/config@^1", "@oclif/config@^1.12.12", "@oclif/config@^1.12.8": +"@oclif/config@1.14.0": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.14.0.tgz#0af93facd5c5087f804489f1603c4f3bc0c45014" + integrity sha512-KsOP/mx9lzTah+EtGqLUXN3PDL0J3zb9/dTneFyiUK2K6T7vFEGhV6OasmqTh4uMZHGYTGrNPV8x/Yw6qZNL6A== + dependencies: + "@oclif/errors" "^1.0.0" + "@oclif/parser" "^3.8.0" + debug "^4.1.1" + tslib "^1.9.3" + +"@oclif/config@^1", "@oclif/config@^1.12.12", "@oclif/config@^1.12.8": version "1.13.3" resolved "https://registry.yarnpkg.com/@oclif/config/-/config-1.13.3.tgz#1b13e18d0e4242ddbd9cbd100f0eec819aa2bf8c" integrity sha512-qs5XvGRw+1M41abOKCjd0uoeHCgsMxa2MurD2g2K8CtQlzlMXl0rW5idVeimIg5208LLuxkfzQo8TKAhhRCWLg== @@ -1023,7 +1033,7 @@ qqjs "^0.3.10" tslib "^1.9.3" -"@oclif/errors@1.2.2", "@oclif/errors@^1.2.1", "@oclif/errors@^1.2.2": +"@oclif/errors@1.2.2", "@oclif/errors@^1.0.0", "@oclif/errors@^1.2.1", "@oclif/errors@^1.2.2": version "1.2.2" resolved "https://registry.yarnpkg.com/@oclif/errors/-/errors-1.2.2.tgz#9d8f269b15f13d70aa93316fed7bebc24688edc2" integrity sha512-Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg==