npm-merge-driver-install

A package to automatically merge package-lock.json conflicts. Heavily based on npm-merge-driver with automated setup at package install time and a single small dependency for ci checking.

Table of Contents generated with DocToc

• Installation
• I don't want it to install in ci
• Provided binaries

Installation

To install run

npm i --save-dev npm-merge-driver-install

then add a prepare script in package.json like the following:

{"prepare": "npm-merge-driver-install"}

I don't want it to install in ci

create a prepare.js file and change your prepare script to the following:

// NOTE: you can use is-ci here or other custom code
const isCI = require('is-ci');
const npmMergeDriverInstall = require('npm-merge-driver-install');

if (!isCi) {
  npmMergeDriverInstall.install();
}

then change the prepare script in package.json to

{"prepare": "node prepare.js"}

Provided binaries

• npm-merge-driver-install: install npm merge driver
• npm-merge-driver-uninstall: uninstall npm merge driver
• npm-merge-driver-merge: the internal merge binary used to merge package.json and package-lock.json
• npm-merge-driver-is-installed: check if npm-merge-driver-install is installed

3.0.0 (2022-02-10)

Features

• BREAKING: no auto installation, better manual install support (7e26931)

2.0.2 (2021-12-09)

Bug Fixes

• get-root issues and tests on windows (3f8433e)

Chores

• add github actions ci setup (78fb46f)
• update packages (3e095b8)
• use shared package @brandonocasey/spawn-promise (bcc2a9c)

Tests

• add lots of tests (efa36ae)

2.0.1 (2020-11-09)

Bug Fixes

• remove npm-merge-driver too (7539ffb)

2.0.0 (2020-10-22)

Features

• remove most dependencies to prevent security issues (ce8eccf)

Chores

• fix travis (20dc4e5)
• package: update dependencies to enable Greenkeeper 🌴 (#7) (84ab239)
• package: update videojs-generator-verify to version 1.2.0 (#5) (84a52a6)

BREAKING CHANGES

• We no longer use npm-merge-driver under the hood. Instead we use scripts that do the same thing.

1.1.1 (2018-10-31)

Bug Fixes

• Add bin to package.json (83a891c)

1.1.0 (2018-10-31)

Features

• add binary usage (ad17d7f)

Bug Fixes

• a typo (9669c13)

Chores

• package: update lint-staged to version 8.0.4 (#3) (17c7f13)

Documentation

• readme: add Greenkeeper badge (#1) (1eff20c)
• add travis badge (b76976f)