git-diff-apply
Advanced tools
git-diff-apply - npm Package Compare versions
Comparing version 3.0.0 to 4.0.0
@@ -17,5 +17,2 @@ #!/usr/bin/env node | ||
| }, | ||
| 'resolve-conflicts': { | ||
| type: 'boolean' | ||
| }, | ||
| 'ignored-files': { | ||
@@ -42,5 +39,4 @@ type: 'array' | ||
| (async() => { | ||
| let returnObject; | ||
| try { | ||
| returnObject = await gitDiffApply(argv); | ||
| await gitDiffApply(argv); | ||
| } catch (err) { | ||
@@ -50,13 +46,2 @@ console.log(err); | ||
| } | ||
| let ps = returnObject.resolveConflictsProcess; | ||
| if (ps) { | ||
| process.stdin.pipe(ps.stdin); | ||
| ps.stdout.pipe(process.stdout); | ||
| ps.stderr.pipe(process.stderr); | ||
| // since we are piping, not inheriting, the child process | ||
| // doesn't have the power to close its parent | ||
| ps.on('exit', process.exit); | ||
| } | ||
| })(); |
| { | ||
| "name": "git-diff-apply", | ||
| "version": "3.0.0", | ||
| "version": "4.0.0", | ||
| "description": "Use an unrelated remote repository to apply a git diff", | ||
@@ -15,3 +15,3 @@ "main": "src", | ||
| "lint": "eslint . --ext js,json", | ||
| "test": "mocha test/**/*-test.js" | ||
| "test": "mocha" | ||
| }, | ||
@@ -39,3 +39,3 @@ "repository": { | ||
| "engines": { | ||
| "node": ">=12.13" | ||
| "node": ">=14.15" | ||
| }, | ||
@@ -45,26 +45,26 @@ "dependencies": { | ||
| "fixturify": "^2.0.0", | ||
| "fs-extra": "^9.0.0", | ||
| "fs-extra": "^10.0.0", | ||
| "tmp": "0.2.1", | ||
| "uuid": "^8.0.0", | ||
| "yargs": "^16.0.0" | ||
| "yargs": "^17.0.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@kellyselden/node-template": "2.0.0", | ||
| "chai": "^4.3.4", | ||
| "@kellyselden/node-template": "2.2.2", | ||
| "chai": "^4.3.6", | ||
| "cpr": "^3.0.1", | ||
| "eslint": "^7.26.0", | ||
| "eslint-config-sane": "^1.0.0", | ||
| "eslint-config-sane-node": "^1.0.1", | ||
| "eslint-plugin-json-files": "^1.0.0", | ||
| "eslint-plugin-mocha": "^8.1.0", | ||
| "eslint": "^8.10.0", | ||
| "eslint-config-sane": "^1.0.2", | ||
| "eslint-config-sane-node": "^1.1.1", | ||
| "eslint-plugin-json-files": "^1.3.0", | ||
| "eslint-plugin-mocha": "^9.0.0", | ||
| "eslint-plugin-node": "^11.1.0", | ||
| "eslint-plugin-prefer-let": "^1.1.0", | ||
| "fixturify-project": "^2.0.0", | ||
| "git-fixtures": "^3.0.0", | ||
| "mocha": "^8.4.0", | ||
| "mocha-helpers": "^5.1.1", | ||
| "eslint-plugin-prefer-let": "^3.0.1", | ||
| "fixturify-project": "^4.0.0", | ||
| "git-fixtures": "^4.2.2", | ||
| "mocha": "^9.2.1", | ||
| "mocha-helpers": "^6.2.1", | ||
| "renovate-config-standard": "2.1.2", | ||
| "sinon": "^9.0.0", | ||
| "standard-node-template": "2.0.0" | ||
| "sinon": "^13.0.0", | ||
| "standard-node-template": "3.0.0" | ||
| } | ||
| } |
@@ -16,3 +16,2 @@ 'use strict'; | ||
| const convertToObj = require('./convert-to-obj'); | ||
| const resolveConflicts = require('./resolve-conflicts'); | ||
| const commitAndTag = require('./commit-and-tag'); | ||
@@ -40,3 +39,2 @@ const gitRemoveAll = require('./git-remove-all'); | ||
| endTag, | ||
| resolveConflicts: _resolveConflicts, | ||
| ignoredFiles = [], | ||
@@ -52,3 +50,2 @@ reset, | ||
| let hasConflicts; | ||
| let returnObject; | ||
@@ -210,3 +207,5 @@ | ||
| } catch (err) { | ||
| hasConflicts = true; | ||
| if (!err.message.includes('error: could not apply')) { | ||
| throw err; | ||
| } | ||
| } | ||
@@ -293,6 +292,2 @@ | ||
| if (hasConflicts && _resolveConflicts) { | ||
| returnObject.resolveConflictsProcess = resolveConflicts({ cwd }); | ||
| } | ||
| return returnObject; | ||
@@ -299,0 +294,0 @@ }; |
New alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Fixed alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Improved metrics
- Number of medium supply chain risk alerts
- decreased by-50%
1
Worsened metrics
- Total package byte prevSize
- decreased by-4.47%
18618
- Number of package files
- decreased by-4.55%
21
- Lines of code
- decreased by-4.71%
506
Dependency changes
+ Addedcliui@8.0.1(transitive)
+ Addedfs-extra@10.1.0(transitive)
+ Addedyargs@17.7.2(transitive)
+ Addedyargs-parser@21.1.1(transitive)
- Removedat-least-node@1.0.0(transitive)
- Removedcliui@7.0.4(transitive)
- Removedfs-extra@9.1.0(transitive)
- Removedyargs@16.2.0(transitive)
- Removedyargs-parser@20.2.9(transitive)
Updatedfs-extra@^10.0.0
Updatedyargs@^17.0.0