Skip to content

Commit

Permalink
[fix] fixes for exported maps (#2807)
Browse files Browse the repository at this point in the history
- fix broken maplibre gl css link
- fix umd build
- use react 18.3.1 in exported maps
- temp fix for missing datasets in exported maps

Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
  • Loading branch information
igorDykhta authored Dec 3, 2024
1 parent 979c9a5 commit 95448ac
Show file tree
Hide file tree
Showing 25 changed files with 578 additions and 214 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ Each version should:
Ref: http://keepachangelog.com/en/0.3.0/
-->

## [3.1.0-alpha.1] - December 3 2024

- f6b37c6af [fix] fixes for exported maps
- 979c9a5a1 [fix] align upload icon (#2799)
- 6862eb85c [fix] Fix for Try Sample Data (#2796)
- f4f7fd2b4 [fix] fix examples - proper publicPath to include bundle chunks (#2795)
- 7ca7f9178 [chore] prepublishOnly command fixes (#2793)
- 40c6c8b09 [chore] npmpublish fixes - set npm registry manually (#2792)
- f60b94f48 [chore] fix npmpublish action (#2791)
- e77981e13 [chore] fix for package publishing (#2790)

## [3.1.0-alpha.0] - November 26 2024

- 5b4f6537 [feat] create new dataset action (#2778)
Expand Down
58 changes: 58 additions & 0 deletions esbuild/umd-esbuild.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project

import esbuild from 'esbuild';
import {replace} from 'esbuild-plugin-replace';
import {umdWrapper} from 'esbuild-plugin-umd-wrapper';

import process from 'node:process';
import {spawn} from 'node:child_process';
import {join} from 'node:path';
import KeplerPackage from '../package.json' assert {type: 'json'};

const LIB_DIR = './';
const NODE_MODULES_DIR = join(LIB_DIR, 'node_modules');
const SRC_DIR = join(LIB_DIR, 'src');

const config = {
entryPoints: ['./src/index.js'],
bundle: true,
platform: 'browser',
outfile: './umd/keplergl.min.js',
format: 'umd',
logLevel: 'error',
minify: true,
sourcemap: false,
treeShaking: true,

external: ['react', 'react-dom', 'redux', 'react-redux', 'styled-components'],

plugins: [
// automatically injected kepler.gl package version into the bundle
replace({
__PACKAGE_VERSION__: KeplerPackage.version,
include: /constants\/src\/default-settings\.ts/
}),
umdWrapper({
libraryName: "KeplerGl",
globals: {
"react": "React",
"react-dom": "ReactDOM",
'redux': 'Redux',
'react-redux': 'ReactRedux',
'styled-components': 'styled'
}
})
]
};

(async () => {
await esbuild
.build({
...config
})
.catch(e => {
console.error(e);
process.exit(1);
});
})();
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "kepler.gl",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl is a webgl based application to visualize large scale location data in the browser",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -74,7 +74,7 @@
"start:https": "yarn install-and-start examples/demo-app start-local-https",
"start:e2e": "yarn install-and-start examples/demo-app start-local-e2e",
"build": "NODE_OPTIONS=--openssl-legacy-provider rm -fr dist && babel src/{actions,components,reducers,cloud-providers,localization,tasks,ai-assistant} --out-dir dist --source-maps inline --extensions '.ts,.tsx,.js,.jsx' --ignore '**/*.d.ts'",
"build:umd": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/umd.js --progress --env.prod",
"build:umd": "node ./esbuild/umd-esbuild.config.mjs",
"build:types": "tsc --project tsconfig.production.json",
"analyze": "yarn analyze:bundle",
"analyze:bundle": "NODE_OPTIONS=--openssl-legacy-provider webpack --config ./webpack/bundle.js --progress --env.prod",
Expand Down Expand Up @@ -103,7 +103,7 @@
"@deck.gl/mapbox": "^8.9.27",
"@hubble.gl/core": "1.2.0-alpha.6",
"@hubble.gl/react": "1.2.0-alpha.6",
"@kepler.gl/components": "3.1.0-alpha.0",
"@kepler.gl/components": "3.1.0-alpha.1",
"@loaders.gl/polyfills": "^4.3.2",
"@types/mapbox__geo-viewport": "^0.4.1",
"html-webpack-plugin": "^4.3.0",
Expand Down Expand Up @@ -161,6 +161,9 @@
"documentation": "^9.1.1",
"dts-bundle-webpack": "^1.0.2",
"enzyme": "^3.11.0",
"esbuild": "^0.23.1",
"esbuild-plugin-replace": "^1.4.0",
"esbuild-plugin-umd-wrapper": "3.0.0",
"eslint": "~8.53.0",
"eslint-config-developit": "^1.2.0",
"eslint-config-prettier": "8.5.0",
Expand Down
12 changes: 6 additions & 6 deletions src/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/actions",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -31,11 +31,11 @@
],
"dependencies": {
"@deck.gl/core": "^8.9.27",
"@kepler.gl/cloud-providers": "3.1.0-alpha.0",
"@kepler.gl/constants": "3.1.0-alpha.0",
"@kepler.gl/layers": "3.1.0-alpha.0",
"@kepler.gl/processors": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/cloud-providers": "3.1.0-alpha.1",
"@kepler.gl/constants": "3.1.0-alpha.1",
"@kepler.gl/layers": "3.1.0-alpha.1",
"@kepler.gl/processors": "3.1.0-alpha.1",
"@kepler.gl/types": "3.1.0-alpha.1",
"@reduxjs/toolkit": "^1.7.2",
"@types/lodash.curry": "^4.1.7",
"@types/react-redux": "^7.1.23",
Expand Down
12 changes: 6 additions & 6 deletions src/ai-assistant/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/ai-assistant",
"author": "Xun Li<lixun910@gmail.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl AI assistant",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -30,11 +30,11 @@
"umd"
],
"dependencies": {
"@kepler.gl/components": "3.1.0-alpha.0",
"@kepler.gl/constants": "3.1.0-alpha.0",
"@kepler.gl/layers": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/utils": "3.1.0-alpha.0",
"@kepler.gl/components": "3.1.0-alpha.1",
"@kepler.gl/constants": "3.1.0-alpha.1",
"@kepler.gl/layers": "3.1.0-alpha.1",
"@kepler.gl/types": "3.1.0-alpha.1",
"@kepler.gl/utils": "3.1.0-alpha.1",
"global": "^4.3.0",
"react-ai-assist": "0.0.8"
},
Expand Down
4 changes: 2 additions & 2 deletions src/cloud-providers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/cloud-providers",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -30,7 +30,7 @@
"umd"
],
"dependencies": {
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.1",
"react": "^18.2.0"
},
"nyc": {
Expand Down
6 changes: 3 additions & 3 deletions src/common-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/common-utils",
"author": "Shan He <heshan0131@gmail.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl common utils",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -30,8 +30,8 @@
"umd"
],
"dependencies": {
"@kepler.gl/constants": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/constants": "3.1.0-alpha.1",
"@kepler.gl/types": "3.1.0-alpha.1",
"d3-array": "^2.8.0",
"global": "^4.3.0",
"type-analyzer": "0.4.0"
Expand Down
30 changes: 15 additions & 15 deletions src/components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/components",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -37,20 +37,20 @@
"@dnd-kit/sortable": "^7.0.2",
"@dnd-kit/utilities": "^3.2.1",
"@floating-ui/react": "0.25.1",
"@kepler.gl/actions": "3.1.0-alpha.0",
"@kepler.gl/cloud-providers": "3.1.0-alpha.0",
"@kepler.gl/common-utils": "3.1.0-alpha.0",
"@kepler.gl/constants": "3.1.0-alpha.0",
"@kepler.gl/effects": "3.1.0-alpha.0",
"@kepler.gl/layers": "3.1.0-alpha.0",
"@kepler.gl/localization": "3.1.0-alpha.0",
"@kepler.gl/processors": "3.1.0-alpha.0",
"@kepler.gl/reducers": "3.1.0-alpha.0",
"@kepler.gl/schemas": "3.1.0-alpha.0",
"@kepler.gl/styles": "3.1.0-alpha.0",
"@kepler.gl/table": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/utils": "3.1.0-alpha.0",
"@kepler.gl/actions": "3.1.0-alpha.1",
"@kepler.gl/cloud-providers": "3.1.0-alpha.1",
"@kepler.gl/common-utils": "3.1.0-alpha.1",
"@kepler.gl/constants": "3.1.0-alpha.1",
"@kepler.gl/effects": "3.1.0-alpha.1",
"@kepler.gl/layers": "3.1.0-alpha.1",
"@kepler.gl/localization": "3.1.0-alpha.1",
"@kepler.gl/processors": "3.1.0-alpha.1",
"@kepler.gl/reducers": "3.1.0-alpha.1",
"@kepler.gl/schemas": "3.1.0-alpha.1",
"@kepler.gl/styles": "3.1.0-alpha.1",
"@kepler.gl/table": "3.1.0-alpha.1",
"@kepler.gl/types": "3.1.0-alpha.1",
"@kepler.gl/utils": "3.1.0-alpha.1",
"@mapbox/mapbox-sdk": "^0.15.3",
"@nebula.gl/edit-modes": "1.0.2-alpha.1",
"@tippyjs/react": "^4.2.0",
Expand Down
4 changes: 2 additions & 2 deletions src/constants/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/constants",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -30,7 +30,7 @@
"umd"
],
"dependencies": {
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.1",
"@types/d3-scale": "^3.2.2",
"@types/keymirror": "^0.1.1",
"colorbrewer": "^1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion src/deckgl-arrow-layers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/deckgl-arrow-layers",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "Deck.gl layers with GeoArrow and GeoParquet support",
"license": "MIT",
"main": "dist/index.js",
Expand Down
8 changes: 4 additions & 4 deletions src/deckgl-layers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/deckgl-layers",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -35,9 +35,9 @@
"@deck.gl/core": "^8.9.27",
"@deck.gl/geo-layers": "^8.9.27",
"@deck.gl/layers": "^8.9.27",
"@kepler.gl/constants": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/utils": "3.1.0-alpha.0",
"@kepler.gl/constants": "3.1.0-alpha.1",
"@kepler.gl/types": "3.1.0-alpha.1",
"@kepler.gl/utils": "3.1.0-alpha.1",
"@luma.gl/constants": "^8.5.20",
"@luma.gl/core": "^8.5.20",
"@mapbox/geo-viewport": "^0.4.1",
Expand Down
8 changes: 4 additions & 4 deletions src/effects/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/effects",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl viaual effects",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -31,9 +31,9 @@
],
"dependencies": {
"@deck.gl/core": "^8.9.27",
"@kepler.gl/constants": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/utils": "3.1.0-alpha.0",
"@kepler.gl/constants": "3.1.0-alpha.1",
"@kepler.gl/types": "3.1.0-alpha.1",
"@kepler.gl/utils": "3.1.0-alpha.1",
"@luma.gl/core": "^8.5.20",
"@luma.gl/shadertools": "^8.5.20",
"suncalc": "^1.9.0"
Expand Down
18 changes: 9 additions & 9 deletions src/layers/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/layers",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -36,14 +36,14 @@
"@deck.gl/geo-layers": "^8.9.27",
"@deck.gl/layers": "^8.9.27",
"@deck.gl/mesh-layers": "^8.9.27",
"@kepler.gl/common-utils": "3.1.0-alpha.0",
"@kepler.gl/constants": "3.1.0-alpha.0",
"@kepler.gl/deckgl-arrow-layers": "3.1.0-alpha.0",
"@kepler.gl/deckgl-layers": "3.1.0-alpha.0",
"@kepler.gl/localization": "3.1.0-alpha.0",
"@kepler.gl/table": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/utils": "3.1.0-alpha.0",
"@kepler.gl/common-utils": "3.1.0-alpha.1",
"@kepler.gl/constants": "3.1.0-alpha.1",
"@kepler.gl/deckgl-arrow-layers": "3.1.0-alpha.1",
"@kepler.gl/deckgl-layers": "3.1.0-alpha.1",
"@kepler.gl/localization": "3.1.0-alpha.1",
"@kepler.gl/table": "3.1.0-alpha.1",
"@kepler.gl/types": "3.1.0-alpha.1",
"@kepler.gl/utils": "3.1.0-alpha.1",
"@loaders.gl/arrow": "^4.3.2",
"@loaders.gl/core": "^4.3.2",
"@loaders.gl/gis": "^4.3.2",
Expand Down
2 changes: 1 addition & 1 deletion src/localization/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/localization",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down
14 changes: 7 additions & 7 deletions src/processors/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@kepler.gl/processors",
"author": "Shan He <shan@uber.com>",
"version": "3.1.0-alpha.0",
"version": "3.1.0-alpha.1",
"description": "kepler.gl constants used by kepler.gl components, actions and reducers",
"license": "MIT",
"main": "dist/index.js",
Expand Down Expand Up @@ -31,12 +31,12 @@
],
"dependencies": {
"@danmarshall/deckgl-typings": "4.9.22",
"@kepler.gl/common-utils": "3.1.0-alpha.0",
"@kepler.gl/constants": "3.1.0-alpha.0",
"@kepler.gl/schemas": "3.1.0-alpha.0",
"@kepler.gl/table": "3.1.0-alpha.0",
"@kepler.gl/types": "3.1.0-alpha.0",
"@kepler.gl/utils": "3.1.0-alpha.0",
"@kepler.gl/common-utils": "3.1.0-alpha.1",
"@kepler.gl/constants": "3.1.0-alpha.1",
"@kepler.gl/schemas": "3.1.0-alpha.1",
"@kepler.gl/table": "3.1.0-alpha.1",
"@kepler.gl/types": "3.1.0-alpha.1",
"@kepler.gl/utils": "3.1.0-alpha.1",
"@loaders.gl/arrow": "^4.3.2",
"@loaders.gl/core": "^4.3.2",
"@loaders.gl/csv": "^4.3.2",
Expand Down
Loading

0 comments on commit 95448ac

Please sign in to comment.