Lock File Conflicts - Complete Guide

# Common Lock File Conflicts

# 1. Package Manager Conflicts
# NPM vs Yarn
package-lock.json  # NPM
yarn.lock         # Yarn

# 2. Version Conflicts
# Different package versions
"react": "^18.0.0"  # package.json
"react": "18.2.0"   # package-lock.json

# 3. Dependency Resolution Conflicts
# Conflicting sub-dependencies
"lodash": "^4.17.0"
"lodash": "^4.17.21"

# 4. Registry Conflicts
# Different registries
"@company/package": "1.0.0"  # Private registry
"@company/package": "1.0.1"  # Public registry

# 5. Workspace Conflicts
# Monorepo workspace conflicts
"@workspace/shared": "1.0.0"
"@workspace/shared": "1.0.1"

# 6. Platform Conflicts
# OS-specific dependencies
"fsevents": "^2.3.0"  # macOS only
"fsevents": "^2.3.2"  # Different version

# 7. Node Version Conflicts
# Node version differences
"engines": {
  "node": ">=16.0.0"
}

# 8. Peer Dependency Conflicts
# Conflicting peer dependencies
"react": "^18.0.0"
"react": "^17.0.0"

# 9. Optional Dependency Conflicts
# Optional dependency versions
"optionalDependencies": {
  "fsevents": "^2.3.0"
}

# 10. Dev Dependency Conflicts
# Development dependency conflicts
"devDependencies": {
  "typescript": "^4.0.0"
}

# NPM Lock File Resolution

# 1. Delete and Reinstall
rm package-lock.json
rm -rf node_modules
npm install

# 2. Force Update Lock File
npm install --package-lock-only
npm install --force

# 3. Resolve Specific Conflicts
npm install package@version --save
npm install package@version --save-dev

# 4. Update Lock File
npm update
npm update package-name

# 5. Audit and Fix
npm audit
npm audit fix
npm audit fix --force

# 6. Clean Install
npm ci
npm ci --only=production

# 7. Resolve Peer Dependencies
npm install --legacy-peer-deps
npm install --force

# 8. Lock File Validation
npm ls
npm ls --depth=0

# 9. Dependency Resolution
npm install --no-package-lock
npm install --package-lock-only

# 10. Conflict Resolution
# Manual package-lock.json editing
# Use npm install to regenerate

# 11. Workspace Conflicts
npm install --workspaces
npm install --workspace=package-name

# 12. Registry Conflicts
npm config set registry https://registry.npmjs.org/
npm install --registry https://registry.npmjs.org/

# 13. Version Conflicts
npm install package@exact-version
npm install package@latest

# 14. Platform Conflicts
npm install --platform=linux
npm install --platform=win32

# 15. Node Version Conflicts
npm install --engine-strict
npm install --no-engine-strict

# Yarn Lock File Resolution

# 1. Delete and Reinstall
rm yarn.lock
rm -rf node_modules
yarn install

# 2. Force Update Lock File
yarn install --force
yarn install --check-files

# 3. Resolve Specific Conflicts
yarn add package@version
yarn add package@version --dev

# 4. Update Lock File
yarn upgrade
yarn upgrade package-name

# 5. Audit and Fix
yarn audit
yarn audit --fix

# 6. Clean Install
yarn install --frozen-lockfile
yarn install --production

# 7. Resolve Peer Dependencies
yarn install --legacy-peer-deps
yarn install --force

# 8. Lock File Validation
yarn list
yarn list --depth=0

# 9. Dependency Resolution
yarn install --no-lockfile
yarn install --update-checksums

# 10. Conflict Resolution
# Manual yarn.lock editing
# Use yarn install to regenerate

# 11. Workspace Conflicts
yarn install
yarn workspace package-name add dependency

# 12. Registry Conflicts
yarn config set registry https://registry.yarnpkg.com/
yarn install --registry https://registry.yarnpkg.com/

# 13. Version Conflicts
yarn add package@exact-version
yarn add package@latest

# 14. Platform Conflicts
yarn install --platform=linux
yarn install --platform=win32

# 15. Node Version Conflicts
yarn install --engine-strict
yarn install --no-engine-strict

# CI/CD Integration

# 1. GitHub Actions
# .github/workflows/lock-file-check.yml
name: Lock File Check
on: [push, pull_request]
jobs:
  lock-file-check:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v3
    - uses: actions/setup-node@v3
      with:
        node-version: '18'
    - name: Install Dependencies
      run: npm ci
    - name: Check Lock File
      run: npm ls --depth=0

# 2. GitLab CI
# .gitlab-ci.yml
lock_file_check:
  stage: test
  script:
    - npm ci
    - npm ls --depth=0
  only:
    - main
    - develop

# 3. Jenkins
# Jenkinsfile
pipeline {
  agent any
  stages {
    stage('Lock File Check') {
      steps {
        sh 'npm ci'
        sh 'npm ls --depth=0'
      }
    }
  }
}

# 4. Azure DevOps
# azure-pipelines.yml
trigger:
- main
pool:
  vmImage: 'ubuntu-latest'
steps:
- task: NodeTool@0
  inputs:
    versionSpec: '18.x'
- script: |
    npm ci
    npm ls --depth=0
  displayName: 'Lock File Check'

# 5. CircleCI
# .circleci/config.yml
version: 2
jobs:
  lock_file_check:
    docker:
      - image: node:18
    steps:
      - checkout
      - run: npm ci
      - run: npm ls --depth=0