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.

Sign up for GitHub

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

Jump to bottom

remove object spread syntax and include browserslist in webpack test #11295

Merged
merged 1 commit into from
Nov 18, 2021
Merged

remove object spread syntax and include browserslist in webpack test #11295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/geo/projection/index.js
View file
Open in desktop
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
View file
Open in desktop
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