@deck.gl/jupyter-widget 8.9.0-beta.1 → 8.9.0-beta.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/jupyter-widget",
   "description": "Jupyter widget for rendering deck.gl in a Jupyter notebook",
   "license": "MIT",
-  "version": "8.9.0-beta.1",
+  "version": "8.9.0-beta.2",
   "keywords": [
     "jupyter",
     "jupyterlab",
@@ -29,16 +29,16 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@deck.gl/aggregation-layers": "8.9.0-beta.1",
-    "@deck.gl/geo-layers": "8.9.0-beta.1",
-    "@deck.gl/google-maps": "8.9.0-beta.1",
-    "@deck.gl/json": "8.9.0-beta.1",
-    "@deck.gl/layers": "8.9.0-beta.1",
-    "@deck.gl/mesh-layers": "8.9.0-beta.1",
+    "@deck.gl/aggregation-layers": "8.9.0-beta.2",
+    "@deck.gl/geo-layers": "8.9.0-beta.2",
+    "@deck.gl/google-maps": "8.9.0-beta.2",
+    "@deck.gl/json": "8.9.0-beta.2",
+    "@deck.gl/layers": "8.9.0-beta.2",
+    "@deck.gl/mesh-layers": "8.9.0-beta.2",
     "@jupyter-widgets/base": "^1.1.10 || ^2 || ^3 || ^4",
-    "@loaders.gl/3d-tiles": "^3.3.0-alpha.10",
-    "@loaders.gl/core": "^3.3.0-alpha.10",
-    "@loaders.gl/csv": "^3.3.0-alpha.10",
+    "@loaders.gl/3d-tiles": "^3.3.1",
+    "@loaders.gl/core": "^3.3.1",
+    "@loaders.gl/csv": "^3.3.1",
     "@luma.gl/constants": "^8.5.16",
     "mapbox-gl": "^1.13.2"
   },
@@ -51,5 +51,5 @@
       }
     }
   },
-  "gitHead": "47223d1ea084c3f9b0c9f0f9736682850bb5db85"
+  "gitHead": "5dae086e4f3eb46c30d8e761f9d600be4f68e949"
 }

package/src/deck-bundle.js

@@ -2,7 +2,7 @@
  * Pulls together all deck.gl dependencies used
  * in @deck.gl/jupyter-widget
  */
-export * from '../../core/bundle';
+export * from '@deck.gl/core';
 export * from '@deck.gl/layers';
 export * from '@deck.gl/aggregation-layers';
 export * from '@deck.gl/geo-layers';

package/src/index.js

@@ -11,7 +11,9 @@ import jupyterTransport from './lib/jupyter-transport';
 import JupyterTransportModel from './lib/jupyter-transport-model';
 import JupyterTransportView from './lib/jupyter-transport-view';
 
-import * as deckBundle from './deck-bundle';
+import * as deckExports from './deck-bundle';
+import * as lumaExports from '@deck.gl/core/scripting/lumagl';
+import * as loadersExports from '@deck.gl/core/scripting/loadersgl';
 
 // Some static assets may be required by the custom widget javascript. The base
 // url for the notebook is not known at build time and is therefore computed dynamically.
@@ -27,7 +29,15 @@ initPlayground();
 
 // Expose deck
 globalThis.deck = globalThis.deck || {};
-Object.assign(globalThis.deck, deckBundle);
+Object.assign(globalThis.deck, deckExports);
+
+// Expose luma
+globalThis.luma = globalThis.luma || {};
+Object.assign(globalThis.luma, lumaExports);
+
+// Expose loaders
+globalThis.loaders = globalThis.loaders || {};
+Object.assign(globalThis.loaders, loadersExports);
 
 export {
   // Transports

package/src/playground/create-deck.js

@@ -14,7 +14,10 @@ import {createGoogleMapsDeckOverlay} from './utils/google-maps-utils';
 import {addSupportComponents} from '../lib/components/index';
 
 /* eslint-disable import/namespace */
-import * as deck from '../deck-bundle';
+import * as deckExports from '../deck-bundle';
+import {COORDINATE_SYSTEM, log, WebMercatorViewport} from '@deck.gl/core';
+import {JSONConverter} from '@deck.gl/json';
+import DeckGL from '@deck.gl/core/scripting/deckgl';
 
 const classesFilter = x => x.charAt(0) === x.charAt(0).toUpperCase();
 const functionsFilter = x => x.charAt(0) === x.charAt(0).toLowerCase() && x.charAt(0) !== '_';
@@ -31,17 +34,17 @@ function extractElements(library = {}, filter) {
 
 // Handle JSONConverter and loaders configuration
 const jsonConverterConfiguration = {
-  classes: extractElements(deck, classesFilter),
+  classes: extractElements(deckExports, classesFilter),
   // Will be resolved as `<enum-name>.<enum-value>`
   enumerations: {
-    COORDINATE_SYSTEM: deck.COORDINATE_SYSTEM,
+    COORDINATE_SYSTEM,
     GL: GLConstants
   }
 };
 
 registerLoaders([CSVLoader]);
 
-const jsonConverter = new deck.JSONConverter({
+const jsonConverter = new JSONConverter({
   configuration: jsonConverterConfiguration
 });
 
@@ -123,7 +126,7 @@ function createStandaloneFromProvider({
         onHover: info => handleEvent('deck-hover-event', info),
         onResize: size => handleEvent('deck-resize-event', size),
         onViewStateChange: ({viewState, interactionState, oldViewState}) => {
-          const viewport = new deck.WebMercatorViewport(viewState);
+          const viewport = new WebMercatorViewport(viewState);
           viewState.nw = viewport.unproject([0, 0]);
           viewState.se = viewport.unproject([viewport.width, viewport.height]);
           handleEvent('deck-view-state-change-event', viewState);
@@ -142,8 +145,8 @@ function createStandaloneFromProvider({
 
   switch (mapProvider) {
     case 'mapbox':
-      deck.log.info('Using Mapbox base maps')();
-      return new deck.DeckGL({
+      log.info('Using Mapbox base maps')();
+      return new DeckGL({
         ...sharedProps,
         ...props,
         map: mapboxgl,
@@ -151,22 +154,22 @@ function createStandaloneFromProvider({
         onLoad: modifyMapboxElements
       });
     case 'carto':
-      deck.log.info('Using Carto base maps')();
-      return new deck.DeckGL({
+      log.info('Using Carto base maps')();
+      return new DeckGL({
         map: mapboxgl,
         ...sharedProps,
         ...props
       });
     case 'google_maps':
-      deck.log.info('Using Google Maps base maps')();
+      log.info('Using Google Maps base maps')();
       return createGoogleMapsDeckOverlay({
         ...sharedProps,
         ...props,
         googleMapsKey
       });
     default:
-      deck.log.info('No recognized map provider specified')();
-      return new deck.DeckGL({
+      log.info('No recognized map provider specified')();
+      return new DeckGL({
         ...sharedProps,
         ...props,
         map: null,

package/src/playground/playground.js

@@ -1,4 +1,4 @@
-import * as deckBundle from '../deck-bundle';
+import {Layer} from '@deck.gl/core';
 
 import {Transport} from '@deck.gl/json';
 
@@ -84,7 +84,7 @@ export function processDataBuffer({binary, convertedJson}) {
 // Filters circular references on JSON string conversion
 function filterJsonValue(key, value) {
   // eslint-disable-next-line
-  return value instanceof deckBundle.Layer ? value.id : value;
+  return value instanceof Layer ? value.id : value;
 }
 
 // Handles a general event

package/src/playground/utils/google-maps-utils.js

@@ -1,6 +1,7 @@
 /* global window */
 /* eslint-disable import/namespace */
-import * as deck from '../../deck-bundle';
+import {log} from '@deck.gl/core';
+import {GoogleMapsOverlay} from '@deck.gl/google-maps';
 
 export function createGoogleMapsDeckOverlay({
   container,
@@ -13,10 +14,10 @@ export function createGoogleMapsDeckOverlay({
   initialViewState = {latitude: 0, longitude: 0, zoom: 1}
 }) {
   if (!googleMapsKey) {
-    deck.log.warn('No Google Maps API key set')();
+    log.warn('No Google Maps API key set')();
     return null;
   }
-  const deckOverlay = new deck.GoogleMapsOverlay({layers});
+  const deckOverlay = new GoogleMapsOverlay({layers});
   const view = {
     center: {lat: initialViewState.latitude, lng: initialViewState.longitude},
     mapTypeId: mapStyle,