Browse Source

🔀 merge

pull/9/head
Nicolas Beaussart 6 years ago
parent
commit
1ea9a60eee
No known key found for this signature in database GPG Key ID: 51D5A407BFCE64A9
  1. 2
      package.json
  2. 3
      renovate.json
  3. 2
      src/tests/add/prettier.spec.ts
  4. 2
      src/tests/add/tailwind.spec.ts
  5. 2
      src/utls/base-add-command.spec.ts
  6. 14
      yarn.lock

2
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",

3
renovate.json

@ -0,0 +1,3 @@
{
"extends": ["config:base", "gitmoji"]
}

2
src/tests/add/prettier.spec.ts

@ -20,8 +20,10 @@ beforeEach(async () => {
execPath = filesystem.path('/', 'tmp', tmpDirName);
filesystem.dir(execPath);
process.chdir(execPath);
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;

2
src/tests/add/tailwind.spec.ts

@ -20,8 +20,10 @@ beforeEach(async () => {
execPath = filesystem.path('/', 'tmp', tmpDirName);
filesystem.dir(execPath);
process.chdir(execPath);
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;

2
src/utls/base-add-command.spec.ts

@ -18,8 +18,10 @@ beforeEach(async () => {
execPath = filesystem.path('/', 'tmp', tmpDirName);
filesystem.dir(execPath);
process.chdir(execPath);
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;

14
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==

Loading…
Cancel
Save