nebula to deckglcommunity/editable layers

Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>

Author: igorDykhta

examples/demo-app/esbuild.config.mjs

@@ -124,35 +124,6 @@ const config = {
   ]
 };
 
-// Create compatibility plugin function
-const createLumaGlCompatPlugin = useKeplerNodeModules => ({
-  name: 'luma-gl-compat',
-  setup(build) {
-    // Intercept imports from @nebula.gl/layers that import from @luma.gl/core
-    build.onResolve({filter: /^@luma\.gl\/core$/}, args => {
-      // Only redirect if the import is coming from @nebula.gl/layers
-      if (args.importer && args.importer.includes('@nebula.gl/layers')) {
-        // Always use our compatibility shim when importing from @nebula.gl/layers
-        // The shim re-exports everything from @luma.gl/core plus Geometry from @luma.gl/engine
-        if (useKeplerNodeModules) {
-          return {
-            path: resolve(__dirname, SRC_DIR, 'compat/luma-gl-compat.ts'),
-            namespace: 'file'
-          };
-        } else {
-          // When not using kepler node modules, we need to resolve to the shim in the root
-          // LIB_DIR is relative to examples/demo-app, so resolve from config file directory
-          return {
-            path: resolve(__dirname, LIB_DIR, 'src/compat/luma-gl-compat.ts'),
-            namespace: 'file'
-          };
-        }
-      }
-      // Return undefined to let esbuild handle the import normally for other cases
-      return undefined;
-    });
-  }
-});
 
 function addAliases(externals, args) {
   const resolveAlias = getThirdPartyLibraryAliases(true);
@@ -312,7 +283,6 @@ function openURL(url) {
         // Optionally generate a bundle analysis
         plugins: [
           ...config.plugins,
-          createLumaGlCompatPlugin(true),
           {
             name: 'bundle-analyzer',
             setup(build) {
@@ -344,7 +314,7 @@ function openURL(url) {
         sourcemap: true,
         // add alias to resolve libraries so there is only one copy of them
         ...(useKeplerModules ? {alias: localAliases} : {alias: getThirdPartyLibraryAliases(false)}),
-        plugins: [...config.plugins, createLumaGlCompatPlugin(useKeplerModules)],
+        plugins: [...config.plugins],
         banner: {
           js: `new EventSource('/esbuild').addEventListener('change', () => location.reload());`
         }

package.json

@@ -134,10 +134,11 @@
     "@babel/runtime": "^7.12.1",
     "@babel/traverse": "^7.12.1",
     "@cfaester/enzyme-adapter-react-18": "^0.7.0",
+    "@deck.gl-community/editable-layers": "9.1.1",
+    "@deck.gl-community/layers": "9.1.1",
     "@deck.gl/test-utils": "^9.2.0",
     "@loaders.gl/polyfills": "^4.3.2",
     "@luma.gl/test-utils": "^9.2.0",
-    "@nebula.gl/layers": "1.0.2-alpha.1",
     "@open-wc/webpack-import-meta-loader": "0.4.7",
     "@probe.gl/env": "^3.5.0",
     "@probe.gl/test-utils": "^3.5.0",

src/compat/luma-gl-compat.ts

@@ -30,6 +30,8 @@
     "umd"
   ],
   "dependencies": {
+    "@deck.gl-community/editable-layers": "9.1.1",
+    "@deck.gl-community/layers": "9.1.1",
     "@deck.gl/core": "^9.2.0",
     "@deck.gl/react": "^9.2.0",
     "@deck.gl/widgets": "^9.2.0",
@@ -57,7 +59,6 @@
     "@loaders.gl/pmtiles": "^4.3.2",
     "@loaders.gl/wms": "4.3.2",
     "@mapbox/mapbox-sdk": "^0.15.3",
-    "@nebula.gl/edit-modes": "1.0.2-alpha.1",
     "@tippyjs/react": "^4.2.0",
     "@types/classnames": "^2.3.1",
     "@types/d3-array": "^2.8.0",

src/components/package.json

@@ -18,7 +18,7 @@ import {
 } from '@kepler.gl/constants';
 import {Layer, EditorLayerUtils} from '@kepler.gl/layers';
 import {Filter, FeatureSelectionContext, Feature} from '@kepler.gl/types';
-import {FeatureOf, Polygon} from '@nebula.gl/edit-modes';
+import {FeatureOf, Polygon} from '@deck.gl-community/editable-layers';
 import {Datasets} from '@kepler.gl/table';
 
 import {RootContext} from '../context';

src/components/src/editor/editor.tsx

@@ -10,7 +10,7 @@ import styled from 'styled-components';
 
 import {Layer} from '@kepler.gl/layers';
 import {Filter} from '@kepler.gl/types';
-import {Feature} from '@nebula.gl/edit-modes';
+import {Feature} from '@deck.gl-community/editable-layers';
 import {Datasets} from '@kepler.gl/table';
 import {canApplyFeatureFilter} from '@kepler.gl/utils';
 

src/components/src/editor/feature-action-panel.tsx

@@ -30,6 +30,8 @@
     "umd"
   ],
   "dependencies": {
+    "@deck.gl-community/editable-layers": "9.1.1",
+    "@deck.gl-community/layers": "9.1.1",
     "@deck.gl/core": "^9.2.0",
     "@deck.gl/extensions": "^9.2.0",
     "@deck.gl/geo-layers": "^9.2.0",
@@ -54,8 +56,6 @@
     "@loaders.gl/wkt": "^4.3.2",
     "@luma.gl/constants": "^9.2.0",
     "@mapbox/geojson-normalize": "0.0.1",
-    "@nebula.gl/edit-modes": "1.0.2-alpha.1",
-    "@nebula.gl/layers": "1.0.2-alpha.1",
     "@turf/bbox": "^6.0.1",
     "@turf/boolean-within": "^6.0.1",
     "@turf/center": "^6.0.1",

src/layers/package.json

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 // Copyright contributors to the kepler.gl project
 
-import {EditableGeoJsonLayer} from '@nebula.gl/layers';
-import {Layer as DeckLayer, LayerProps as DeckLayerProps} from '@deck.gl/core';
 import {
+  EditableGeoJsonLayer,
   DrawPolygonMode,
   TranslateMode,
   CompositeMode,
   DrawRectangleMode
-} from '@nebula.gl/edit-modes';
+} from '@deck.gl-community/editable-layers';
+import {Layer as DeckLayer, LayerProps as DeckLayerProps} from '@deck.gl/core';
 import {PathStyleExtension} from '@deck.gl/extensions';
 
 import {EDITOR_LAYER_ID, EDITOR_MODES, EDITOR_LAYER_PICKING_RADIUS} from '@kepler.gl/constants';

src/layers/src/editor-layer/editor-layer.ts

@@ -5,9 +5,8 @@ import {
   ModifyMode,
   FeatureOf,
   LineString,
-  Point,
-  Viewport as NebulaViewport
-} from '@nebula.gl/edit-modes';
+  Point
+} from '@deck.gl-community/editable-layers';
 import {Viewport} from '@deck.gl/core';
 
 import {EDITOR_LAYER_PICKING_RADIUS} from '@kepler.gl/constants';
@@ -24,7 +23,7 @@ export class ModifyModeExtended extends ModifyMode {
     inPoint: FeatureOf<Point>,
     viewport: Viewport | null | undefined
   ) {
-    const p = super.getNearestPoint(line, inPoint, viewport as NebulaViewport | null | undefined);
+    const p = super.getNearestPoint(line, inPoint, viewport);
     if (p && viewport) {
       const p1 = viewport.project(p.geometry.coordinates);
       const p2 = viewport.project(inPoint.geometry.coordinates);

src/layers/src/editor-layer/modify-mode-extended.ts

@@ -30,6 +30,8 @@
     "umd"
   ],
   "dependencies": {
+    "@deck.gl-community/editable-layers": "9.1.1",
+    "@deck.gl-community/layers": "9.1.1",
     "@kepler.gl/common-utils": "3.2.5",
     "@kepler.gl/constants": "3.2.5",
     "@kepler.gl/schemas": "3.2.5",
@@ -46,7 +48,6 @@
     "@loaders.gl/schema": "^4.3.2",
     "@loaders.gl/wkt": "^4.3.2",
     "@mapbox/geojson-normalize": "0.0.1",
-    "@nebula.gl/edit-modes": "1.0.2-alpha.1",
     "@turf/helpers": "^6.1.4",
     "apache-arrow": ">=15.0.0",
     "d3-dsv": "^2.0.0",