rebase and fix local webpack configs

examples/react-map-gl-draw/app.js

@@ -7,7 +7,7 @@ import {
   DrawPointMode,
   DrawLineStringMode,
   DrawRectangleMode,
-  DrawPolygonMode
+  DrawPolygonMode,
 } from '@nebula.gl/edit-modes';
 
 import { MODES } from './constants';
@@ -19,7 +19,7 @@ const MODE_TO_HANDLER = {
   [MODES.DRAW_POINT]: DrawPointMode,
   [MODES.DRAW_PATH]: DrawLineStringMode,
   [MODES.DRAW_RECTANGLE]: DrawRectangleMode,
-  [MODES.DRAW_POLYGON]: DrawPolygonMode
+  [MODES.DRAW_POLYGON]: DrawPolygonMode,
 };
 
 // eslint-disable-next-line no-process-env, no-undef

examples/react-map-gl-draw/toolbar.js

@@ -9,7 +9,7 @@ const ICON_MAP = [
   { id: MODES.DRAW_POINT, text: 'Draw Point', icon: 'icon-point.svg' },
   { id: MODES.DRAW_PATH, text: 'Draw Polyline', icon: 'icon-path.svg' },
   { id: MODES.DRAW_POLYGON, text: 'Draw Polygon', icon: 'icon-polygon.svg' },
-  { id: MODES.DRAW_RECTANGLE, text: 'Draw Rectangle', icon: 'icon-rectangle.svg' }
+  { id: MODES.DRAW_RECTANGLE, text: 'Draw Rectangle', icon: 'icon-rectangle.svg' },
 ];
 
 const Container = styled.div`

examples/webpack.config.local.js

@@ -11,12 +11,12 @@ const resolve = require('path').resolve;
 const webpack = require('webpack');
 
 const LIB_DIR = resolve(__dirname, '..');
-const MAIN_SRC_DIR = resolve(LIB_DIR, './modules/main');
-const EDIT_MODES_SRC_DIR = resolve(LIB_DIR, './modules/edit-modes');
-const LAYERS_SRC_DIR = resolve(LIB_DIR, './modules/layers');
-const OVERLAYS_SRC_DIR = resolve(LIB_DIR, './modules/overlays');
-const EDITOR_SRC_DIR = resolve(LIB_DIR, './modules/editor');
-const REACT_EDITOR_LITE_SRC_DIR = resolve(LIB_DIR, './modules/react-map-gl-draw');
+const MAIN_SRC_DIR = resolve(LIB_DIR, './modules/main/src/');
+const EDIT_MODES_SRC_DIR = resolve(LIB_DIR, './modules/edit-modes/src/');
+const LAYERS_SRC_DIR = resolve(LIB_DIR, './modules/layers/src/');
+const OVERLAYS_SRC_DIR = resolve(LIB_DIR, './modules/overlays/src/');
+const EDITOR_SRC_DIR = resolve(LIB_DIR, './modules/editor/src/');
+const REACT_EDITOR_LITE_SRC_DIR = resolve(LIB_DIR, './modules/react-map-gl-draw/src');
 
 // const babelConfig = require('../babel.config');
 
@@ -33,6 +33,7 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR) {
     devtool: 'source-map',
 
     resolve: {
+      extensions: ['.js', '.ts', '.tsx'],
       alias: {
         'nebula.gl/dist': MAIN_SRC_DIR,
         'nebula.gl': MAIN_SRC_DIR,
@@ -70,10 +71,15 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR) {
       rules: [
         {
           // Unfortunately, webpack doesn't import library sourcemaps on its own...
-          test: /\.js$/,
+          test: /\.js$|\.ts$|\.tsx$/,
           use: ['source-map-loader'],
           enforce: 'pre',
         },
+        {
+          test: /\.tsx?$/,
+          use: 'ts-loader',
+          exclude: /node_modules/,
+        },
       ],
     },
     // Optional: Enables reading mapbox token from environment variable

jest.config.js

@@ -3,6 +3,6 @@ module.exports = {
   verbose: true,
   testURL: 'http://localhost/',
   collectCoverageFrom: ['modules/*/src/**/*.{ts,tsx}', '!**/node_modules/**'],
-  testPathIgnorePatterns: ['/node_modules/', '/website/'],
+  testPathIgnorePatterns: ['/node_modules/', '/lib/', '/website/'],
   "preset": "ts-jest"
 };