Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: deep array merge #2324

Merged
merged 4 commits into from
Jan 14, 2022
Merged

fix: deep array merge #2324

merged 4 commits into from
Jan 14, 2022

Commits on Jan 4, 2022

  1. package-lock.json: update to lockfileVersion 2

    Update by running: npm i --package-lock-only
    
    According to
    https://docs.npmjs.com/cli/v8/configuring-npm/package-lock-json#lockfileversion
    lockfileVersion 2 is backwards compatible with 1 but adds extra metadata
    to aid with performance and reproducible builds.
    
    Additionally, swagger-ui already uses lockfileVersion 2 in its
    package-lock.json.
    lipnitsk committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    45d2375 View commit details
    Browse the repository at this point in the history
  2. fix: deep array merge

    deep-extend does not support array merge. There was special code added
    to merge top-level arrays, but that was a shallow merge.
    
    Use deepmerge instead of deep-extend to merge arrays also. Default merge
    settings seem to work well - all tests pass.
    
    Extend all-of merge test case based on
    swagger-api/swagger-ui#7618
    
    Fixes: 2f5bb86 ("Fix and test for swagger-ui swagger-api#3328: swagger-api/swagger-ui#3328. Added manual logic to merge arrays after calling deepExtend within `mergeDeep` function")
    lipnitsk committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    538b180 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2022

  1. Update package-lock.json

    char0n authored Jan 14, 2022
    Configuration menu
    Copy the full SHA
    5acf31b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f83d866 View commit details
    Browse the repository at this point in the history