Skip to content

Commit 577b583

Browse files
lixun910lixun910
committed
Merge branch 'master' into xli-assistant-data-analysis
2 parents 6a928ad + 6e42597 commit 577b583

File tree

192 files changed

+3282
-1326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+3282
-1326
lines changed

‎bindings/kepler.gl-jupyter/js/lib/keplergl/components/app.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ function App() {
8484
rel="stylesheet"
8585
href="http://d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css"
8686
/>
87+
<link
88+
rel="stylesheet"
89+
href="http://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css"
90+
/>
8791
<link
8892
rel="stylesheet"
8993
href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css"

‎bindings/kepler.gl-jupyter/js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"react-redux": "^8.0.5",
9393
"redux": "^4.2.1",
9494
"redux-actions": "^2.2.1",
95-
"styled-components": "^4.1.3"
95+
"styled-components": "6.1.8"
9696
},
9797
"resolutions": {
9898
"@deck.gl/core": "^8.9.27",

‎bindings/kepler.gl-jupyter/js/webpack/build-html.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ module.exports = (rules, plugins) => ({
7575
inject: true,
7676
links: [
7777
'https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css',
78+
'https://api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css',
7879
'https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css'
7980
],
8081
scripts: [

‎bindings/kepler.gl-jupyter/js/yarn.lock

Lines changed: 112 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,6 +1729,15 @@ __metadata:
17291729
languageName: node
17301730
linkType: hard
17311731

1732+
"@emotion/is-prop-valid@npm:1.2.1":
1733+
version: 1.2.1
1734+
resolution: "@emotion/is-prop-valid@npm:1.2.1"
1735+
dependencies:
1736+
"@emotion/memoize": "npm:^0.8.1"
1737+
checksum: 10c0/7c2aabdf0ca9986ca25abc9dae711348308cf18d418d64ffa4c8ffd2114806c47f2e06ba8ee769f38ec67d65bd59ec73f34d94023e81baa1c43510ac86ccd5e6
1738+
languageName: node
1739+
linkType: hard
1740+
17321741
"@emotion/is-prop-valid@npm:^0.8.1":
17331742
version: 0.8.8
17341743
resolution: "@emotion/is-prop-valid@npm:0.8.8"
@@ -1745,6 +1754,20 @@ __metadata:
17451754
languageName: node
17461755
linkType: hard
17471756

1757+
"@emotion/memoize@npm:^0.8.1":
1758+
version: 0.8.1
1759+
resolution: "@emotion/memoize@npm:0.8.1"
1760+
checksum: 10c0/dffed372fc3b9fa2ba411e76af22b6bb686fb0cb07694fdfaa6dd2baeb0d5e4968c1a7caa472bfcf06a5997d5e7c7d16b90e993f9a6ffae79a2c3dbdc76dfe78
1761+
languageName: node
1762+
linkType: hard
1763+
1764+
"@emotion/unitless@npm:0.8.0":
1765+
version: 0.8.0
1766+
resolution: "@emotion/unitless@npm:0.8.0"
1767+
checksum: 10c0/1f2cfb7c0ccb83c20b1c6d8d92a74a93da4b2a440f9a0d49ded08647faf299065a2ffde17e1335920fa10397b85f8635bbfe14f3cd29222a59ea81d978478072
1768+
languageName: node
1769+
linkType: hard
1770+
17481771
"@emotion/unitless@npm:^0.7.0":
17491772
version: 0.7.5
17501773
resolution: "@emotion/unitless@npm:0.7.5"
@@ -4918,6 +4941,13 @@ __metadata:
49184941
languageName: node
49194942
linkType: hard
49204943

4944+
"@types/stylis@npm:4.2.0":
4945+
version: 4.2.0
4946+
resolution: "@types/stylis@npm:4.2.0"
4947+
checksum: 10c0/c76c13e76ca485f598a13984cfb5e07bb88a851da5bee213587424a5f101f182c74f4f92d633cebf9abcec40ccebb645d600d184b7e4b42793e3eeca8729b110
4948+
languageName: node
4949+
linkType: hard
4950+
49214951
"@types/supercluster@npm:^7.1.0, @types/supercluster@npm:^7.1.3":
49224952
version: 7.1.3
49234953
resolution: "@types/supercluster@npm:7.1.3"
@@ -7351,6 +7381,17 @@ __metadata:
73517381
languageName: node
73527382
linkType: hard
73537383

7384+
"css-to-react-native@npm:3.2.0":
7385+
version: 3.2.0
7386+
resolution: "css-to-react-native@npm:3.2.0"
7387+
dependencies:
7388+
camelize: "npm:^1.0.0"
7389+
css-color-keywords: "npm:^1.0.0"
7390+
postcss-value-parser: "npm:^4.0.2"
7391+
checksum: 10c0/fde850a511d5d3d7c55a1e9b8ed26b69a8ad4868b3487e36ebfbfc0b96fc34bc977d9cd1d61a289d0c74d3f9a662d8cee297da53d4433bf2e27d6acdff8e1003
7392+
languageName: node
7393+
linkType: hard
7394+
73547395
"css-to-react-native@npm:^2.2.2":
73557396
version: 2.3.2
73567397
resolution: "css-to-react-native@npm:2.3.2"
@@ -7385,6 +7426,13 @@ __metadata:
73857426
languageName: node
73867427
linkType: hard
73877428

7429+
"csstype@npm:3.1.2":
7430+
version: 3.1.2
7431+
resolution: "csstype@npm:3.1.2"
7432+
checksum: 10c0/32c038af259897c807ac738d9eab16b3d86747c72b09d5c740978e06f067f9b7b1737e1b75e407c7ab1fe1543dc95f20e202b4786aeb1b8d3bdf5d5ce655e6c6
7433+
languageName: node
7434+
linkType: hard
7435+
73887436
"csstype@npm:^3.0.2":
73897437
version: 3.1.3
73907438
resolution: "csstype@npm:3.1.3"
@@ -11549,7 +11597,7 @@ __metadata:
1154911597
redux: "npm:^4.2.1"
1155011598
redux-actions: "npm:^2.2.1"
1155111599
rimraf: "npm:^2.6.1"
11552-
styled-components: "npm:^4.1.3"
11600+
styled-components: "npm:6.1.8"
1155311601
webpack: "npm:^4.29.0"
1155411602
webpack-cli: "npm:^3.2.1"
1155511603
webpack-dev-middleware: "npm:^3.5.1"
@@ -12685,6 +12733,15 @@ __metadata:
1268512733
languageName: node
1268612734
linkType: hard
1268712735

12736+
"nanoid@npm:^3.3.6":
12737+
version: 3.3.8
12738+
resolution: "nanoid@npm:3.3.8"
12739+
bin:
12740+
nanoid: bin/nanoid.cjs
12741+
checksum: 10c0/4b1bb29f6cfebf3be3bc4ad1f1296fb0a10a3043a79f34fbffe75d1621b4318319211cd420549459018ea3592f0d2f159247a6f874911d6d26eaaadda2478120
12742+
languageName: node
12743+
linkType: hard
12744+
1268812745
"nanoid@npm:^3.3.7":
1268912746
version: 3.3.7
1269012747
resolution: "nanoid@npm:3.3.7"
@@ -13670,13 +13727,24 @@ __metadata:
1367013727
languageName: node
1367113728
linkType: hard
1367213729

13673-
"postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
13730+
"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
1367413731
version: 4.2.0
1367513732
resolution: "postcss-value-parser@npm:4.2.0"
1367613733
checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161
1367713734
languageName: node
1367813735
linkType: hard
1367913736

13737+
"postcss@npm:8.4.31":
13738+
version: 8.4.31
13739+
resolution: "postcss@npm:8.4.31"
13740+
dependencies:
13741+
nanoid: "npm:^3.3.6"
13742+
picocolors: "npm:^1.0.0"
13743+
source-map-js: "npm:^1.0.2"
13744+
checksum: 10c0/748b82e6e5fc34034dcf2ae88ea3d11fd09f69b6c50ecdd3b4a875cfc7cdca435c958b211e2cb52355422ab6fccb7d8f2f2923161d7a1b281029e4a913d59acf
13745+
languageName: node
13746+
linkType: hard
13747+
1368013748
"postcss@npm:^8.4.33":
1368113749
version: 8.4.41
1368213750
resolution: "postcss@npm:8.4.41"
@@ -15366,7 +15434,7 @@ __metadata:
1536615434
languageName: node
1536715435
linkType: hard
1536815436

15369-
"shallowequal@npm:^1.0.1":
15437+
"shallowequal@npm:1.1.0, shallowequal@npm:^1.0.1":
1537015438
version: 1.1.0
1537115439
resolution: "shallowequal@npm:1.1.0"
1537215440
checksum: 10c0/b926efb51cd0f47aa9bc061add788a4a650550bbe50647962113a4579b60af2abe7b62f9b02314acc6f97151d4cf87033a2b15fc20852fae306d1a095215396c
@@ -15586,6 +15654,13 @@ __metadata:
1558615654
languageName: node
1558715655
linkType: hard
1558815656

15657+
"source-map-js@npm:^1.0.2":
15658+
version: 1.2.1
15659+
resolution: "source-map-js@npm:1.2.1"
15660+
checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf
15661+
languageName: node
15662+
linkType: hard
15663+
1558915664
"source-map-js@npm:^1.2.0":
1559015665
version: 1.2.0
1559115666
resolution: "source-map-js@npm:1.2.0"
@@ -16049,6 +16124,26 @@ __metadata:
1604916124
languageName: node
1605016125
linkType: hard
1605116126

16127+
"styled-components@npm:6.1.8":
16128+
version: 6.1.8
16129+
resolution: "styled-components@npm:6.1.8"
16130+
dependencies:
16131+
"@emotion/is-prop-valid": "npm:1.2.1"
16132+
"@emotion/unitless": "npm:0.8.0"
16133+
"@types/stylis": "npm:4.2.0"
16134+
css-to-react-native: "npm:3.2.0"
16135+
csstype: "npm:3.1.2"
16136+
postcss: "npm:8.4.31"
16137+
shallowequal: "npm:1.1.0"
16138+
stylis: "npm:4.3.1"
16139+
tslib: "npm:2.5.0"
16140+
peerDependencies:
16141+
react: ">= 16.8.0"
16142+
react-dom: ">= 16.8.0"
16143+
checksum: 10c0/fafe4b9198d5d7980c2358821d1a89f86200d55c8eec03670cf12cf43b8a05a77eafaf0872cd85821f68238308e0f5c9d9aa43a62e6987c65b70baa2c3277ab8
16144+
languageName: node
16145+
linkType: hard
16146+
1605216147
"styled-components@npm:^4.1.3":
1605316148
version: 4.4.1
1605416149
resolution: "styled-components@npm:4.4.1"
@@ -16082,6 +16177,13 @@ __metadata:
1608216177
languageName: node
1608316178
linkType: hard
1608416179

16180+
"stylis@npm:4.3.1":
16181+
version: 4.3.1
16182+
resolution: "stylis@npm:4.3.1"
16183+
checksum: 10c0/33e8ebd2bfa5f0bd0215f718dc2d3be896e1d00c5bcaeb9a4ae03cf239db6867af9eee230f57229bf1c29499357073ba3e6b547484ba1db2f5de1e8be7d4eee9
16184+
languageName: node
16185+
linkType: hard
16186+
1608516187
"stylis@npm:^3.5.0":
1608616188
version: 3.5.4
1608716189
resolution: "stylis@npm:3.5.4"
@@ -16522,6 +16624,13 @@ __metadata:
1652216624
languageName: node
1652316625
linkType: hard
1652416626

16627+
"tslib@npm:2.5.0":
16628+
version: 2.5.0
16629+
resolution: "tslib@npm:2.5.0"
16630+
checksum: 10c0/e32fc99cc730dd514e53c44e668d76016e738f0bcc726aad5dbd2d335cf19b87a95a9b1e4f0a9993e370f1d702b5e471cdd4acabcac428a3099d496b9af2021e
16631+
languageName: node
16632+
linkType: hard
16633+
1652516634
"tslib@npm:^1.9.0":
1652616635
version: 1.14.1
1652716636
resolution: "tslib@npm:1.14.1"

‎examples/custom-map-style/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset='UTF-8' />
55
<title>kepler.gl demo</title>
66
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
7+
<link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
78
<link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
89
<style type="text/css">
910
body {margin: 0; padding: 0; overflow: hidden;}

‎examples/custom-map-style/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"react-redux": "^8.0.5",
1414
"react-virtualized": "^9.21.0",
1515
"redux-actions": "^2.2.1",
16-
"styled-components": "^4.1.3"
16+
"styled-components": "6.1.8"
1717
},
1818
"devDependencies": {
1919
"@babel/core": "^7.12.1",

‎examples/custom-reducer/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset='UTF-8' />
55
<title>kepler.gl demo</title>
66
<link href="//d1a3f4spazzrp4.cloudfront.net/uber-fonts/4.0.0/superfine.css" rel="stylesheet">
7+
<link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
78
<link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
89
<style type="text/css">
910
body {margin: 0; padding: 0; overflow: hidden;}

‎examples/custom-reducer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"react-redux": "^8.0.5",
1515
"react-virtualized": "^9.21.0",
1616
"redux-actions": "^2.2.1",
17-
"styled-components": "^4.1.3"
17+
"styled-components": "6.1.8"
1818
},
1919
"devDependencies": {
2020
"@babel/core": "^7.12.1",

‎examples/custom-theme/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset='UTF-8' />
55
<title>kepler.gl demo</title>
66
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
7+
<link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
78
<link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
89
<style type="text/css">
910
body {margin: 0; padding: 0; overflow: hidden;}

‎examples/custom-theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"react-redux": "^8.0.5",
1414
"react-virtualized": "^9.21.0",
1515
"redux-actions": "^2.2.1",
16-
"styled-components": "^4.1.3"
16+
"styled-components": "6.1.8"
1717
},
1818
"devDependencies": {
1919
"@babel/core": "^7.12.1",

‎examples/demo-app/dist/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<meta charset='UTF-8' />
55
<title>kepler.gl demo</title>
66
<link rel="stylesheet" href="//d1a3f4spazzrp4.cloudfront.net/kepler.gl/uber-fonts/4.0.0/superfine.css">
7+
<link href="//api.tiles.mapbox.com/mapbox-gl-js/v1.1.1/mapbox-gl.css" rel="stylesheet">
78
<link href="https://unpkg.com/maplibre-gl@^3/dist/maplibre-gl.css" rel="stylesheet">
89
<link rel="stylesheet" href="/bundle.css">
910
<style type="text/css">

‎examples/demo-app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"dependencies": {
1212
"@auth0/auth0-spa-js": "^2.1.2",
1313
"@carto/toolkit": "0.0.1-rc.18",
14+
"@emotion/is-prop-valid": "^1.2.1",
1415
"@kepler.gl/actions": "^3.0.0-alpha.1",
1516
"@kepler.gl/cloud-providers": "^3.0.0-alpha.1",
1617
"@kepler.gl/components": "^3.0.0-alpha.1",
@@ -47,7 +48,7 @@
4748
"redux-actions": "^2.2.1",
4849
"redux-logger": "^3.0.6",
4950
"redux-thunk": "^1.0.0",
50-
"styled-components": "^4.1.3"
51+
"styled-components": "6.1.8"
5152
},
5253
"resolutions": {
5354
"@luma.gl/core": "8.5.21",

0 commit comments

Comments
 (0)