Skip to content

Commit

Permalink
remove object spread syntax and include browserslist in webpack test (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Hamley authored Nov 18, 2021
1 parent fb5beca commit 6ceb1a6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/geo/projection/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import naturalEarth from './natural_earth.js';
import winkelTripel from './winkel_tripel.js';
import cylindricalEqualArea from './cylindrical_equal_area.js';
import LngLat from '../lng_lat.js';
import {extend} from '../../util/util.js';
import type {ProjectionSpecification} from '../../style-spec/types.js';

export type Projection = {
Expand Down Expand Up @@ -44,11 +45,11 @@ function getConicProjection(projection: Projection, config: ProjectionSpecificat
cylindricalFunctions = {wrap: true, project, unproject};
}

return {...projection, ...config, ...cylindricalFunctions};
return extend({}, projection, config, cylindricalFunctions);
}
}

return {...projection, ...config};
return extend({}, projection, config);
}

export function getProjection(config: ProjectionSpecification) {
Expand Down
9 changes: 9 additions & 0 deletions test/build/transpilation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
},
"author": "",
"license": "ISC",
"browserslist": {
"development": [
">0.2%",
"not dead",
"not ie 11",
"not chrome < 51",
"not safari < 10"
]
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@babel/preset-env": "^7.12.10",
Expand Down

0 comments on commit 6ceb1a6

Please sign in to comment.