wip

.ocularrc.js

@@ -1,7 +1,8 @@
-const {resolve, join} = require('path');
+/** @typedef {import('ocular-dev-tools').OcularConfig} OcularConfig */
+import {dirname, join} from 'path';
+import {fileURLToPath} from 'url';
 
-const packageRoot = resolve(__dirname);
-const nodeModules = join(packageRoot, 'node_modules');
+const packageRoot = dirname(fileURLToPath(import.meta.url));
 const lumaModules = join(packageRoot, '../luma.gl/modules');
 
 const LUMA_ALIASES_LOCAL = {
@@ -16,20 +17,25 @@ const LUMA_ALIASES_LOCAL = {
 
 const useLocalLuma = false;
 
+/** @type {OcularConfig} */
 const config = {
   lint: {
     paths: ['modules', 'test']
     // paths: ['modules', 'test', 'examples', 'website']
   },
 
+  babel: false,
+
   bundle: {
     globalName: 'deck',
     externals: ['h3-js'],
-    target: ['supports webgl', 'not dead'],
+    target: ['chrome110', 'firefox110', 'safari15'],
     format: 'umd',
     globals: {
       '@deck.gl/*': 'globalThis.deck',
       '@luma.gl/core': 'globalThis.luma',
+      '@luma.gl/engine': 'globalThis.luma',
+      '@luma.gl/webgl': 'globalThis.luma',
       '@loaders.gl/core': 'globalThis.loaders',
       'h3-js': 'globalThis.h3 || {}'
     }
@@ -43,23 +49,6 @@ const config = {
     'deck.gl-test': join(packageRoot, './test')
   },
 
-  // These packages are of type: 'module' and do not work in node tests when compiled to commonjs
-  // ts-node has experimental ESM support, but there's no reliable module aliasing
-  // See https://github.com/dividab/tsconfig-paths/issues/122
-  nodeAliases: {
-    '@jupyter-widgets/base': `${packageRoot}/test/modules/jupyter-widget/dummy-jupyter-widgets-base.ts`,
-    '@mapbox/tiny-sdf': `${nodeModules}/@mapbox/tiny-sdf/index.cjs`,
-    'd3-array': `${nodeModules}/d3-array/dist/d3-array.cjs`,
-    'd3-color': `${nodeModules}/d3-color/dist/d3-color.cjs`,
-    'd3-format': `${nodeModules}/d3-format/dist/d3-format.cjs`,
-    'd3-interpolate': `${nodeModules}/d3-interpolate/dist/d3-interpolate.cjs`,
-    'd3-scale': `${nodeModules}/d3-scale/dist/d3-scale.cjs`,
-    'd3-time': `${nodeModules}/d3-time/dist/d3-time.cjs`,
-    'd3-time-format': `${nodeModules}/d3-time-format/dist/d3-time-format.cjs`,
-    'mapbox-gl': `${packageRoot}/test/modules/jupyter-widget/dummy-mapbox-gl.ts`,
-    'react-map-gl/dist/esm/mapbox/mapbox': `${nodeModules}/react-map-gl/dist/es5/mapbox/mapbox.js`
-  },
-
   browserTest: {
     server: {wait: 5000}
   },
@@ -77,4 +66,4 @@ if (useLocalLuma) {
   Object.assign(config.aliases, LUMA_ALIASES_LOCAL);
 }
 
-module.exports = config;
+export default config;

examples/layer-browser/package.json

@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "license": "MIT",
+  "type": "module",
   "scripts": {
     "start-local": "vite --config ../vite.config.local.mjs"
   },

examples/layer-browser/src/data-samples.js

@@ -1,23 +1,23 @@
 import {Vector3} from '@math.gl/core';
 
 /* load data samples for display */
-import allPoints from '../data/sf.bike.parking.json';
+import allPoints from '../data/sf.bike.parking.json' assert { type: 'json' };
 import {pointGrid} from './utils';
 import {pointsToWorldGrid} from './utils/grid-aggregator';
-import {default as meterTrajectorySmall} from '../data/meter-trajectory-small.json';
-
-import {default as choropleths} from '../data/sf.zip.geo.json';
-export {default as geojson} from '../data/sample.geo.json';
-export {default as geojsonHole} from '../data/hole.geo.json';
-export {default as geojsonLarge} from '../data/canada.geo.json';
-export {default as hexagons} from '../data/hexagons.json';
-export {default as routes} from '../data/sfmta.routes.json';
-export {default as trips} from '../data/trips.json';
-export {default as SFTrips} from '../data/sf.trips';
-export {default as iconAtlas} from '../data/icon-atlas.json';
-export {default as quadkeys} from '../data/sf.quadkeys.json';
-export {default as s2cells} from '../data/sf.s2cells.json';
-export {default as geohashes} from '../data/sf.geohashes.json';
+import {default as meterTrajectorySmall} from '../data/meter-trajectory-small.json' assert { type: 'json' };
+
+import {default as choropleths} from '../data/sf.zip.geo.json' assert { type: 'json' };
+export {default as geojson} from '../data/sample.geo.json' assert { type: 'json' };
+export {default as geojsonHole} from '../data/hole.geo.json' assert { type: 'json' };
+export {default as geojsonLarge} from '../data/canada.geo.json' assert { type: 'json' };
+export {default as hexagons} from '../data/hexagons.json' assert { type: 'json' };
+export {default as routes} from '../data/sfmta.routes.json' assert { type: 'json' };
+export {default as trips} from '../data/trips.json' assert { type: 'json' };
+export {default as SFTrips} from '../data/sf.trips.json' assert { type: 'json' };
+export {default as iconAtlas} from '../data/icon-atlas.json' assert { type: 'json' };
+export {default as quadkeys} from '../data/sf.quadkeys.json' assert { type: 'json' };
+export {default as s2cells} from '../data/sf.s2cells.json' assert { type: 'json' };
+export {default as geohashes} from '../data/sf.geohashes.json' assert { type: 'json' };
 export {choropleths};
 
 export const positionOrigin = [-122.42694203247012, 37.751537058389985];

modules/aggregation-layers/bundle.ts

@@ -1,3 +1,7 @@
 export * from '../layers/bundle/peer-dependency';
 
-export * from './src';
+// Import from package name instead of relative path
+// This will be resolved to src or dist by esbuild depending on bundle settings
+// dist has TS transformers applied
+/* eslint-disable import/no-extraneous-dependencies */
+export * from '@deck.gl/aggregation-layers';

modules/aggregation-layers/package.json

@@ -2,6 +2,7 @@
   "name": "@deck.gl/aggregation-layers",
   "description": "deck.gl layers that aggregate the input data into alternative representations",
   "license": "MIT",
+  "type": "module",
   "version": "9.0.0-beta.1",
   "publishConfig": {
     "access": "public"
@@ -16,13 +17,19 @@
     "type": "git",
     "url": "https://github.com/visgl/deck.gl.git"
   },
-  "main": "dist/es5/index.js",
-  "module": "dist/esm/index.js",
-  "types": "typed/index.d.ts",
+  "types": "dist/index.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "files": [
     "dist",
     "src",
-    "typed",
     "dist.min.js"
   ],
   "sideEffects": false,

modules/aggregation-layers/tsconfig.json

@@ -5,7 +5,7 @@
   "compilerOptions": {
     "composite": true,
     "rootDir": "src",
-    "outDir": "typed"
+    "outDir": "dist"
   },
   "references": [
     {"path": "../core"},

modules/arcgis/package.json

@@ -2,6 +2,7 @@
   "name": "@deck.gl/arcgis",
   "description": "Use deck.gl as a custom ArcGIS API for JavaScript layer",
   "license": "MIT",
+  "type": "module",
   "version": "9.0.0-beta.1",
   "publishConfig": {
     "access": "public"
@@ -16,12 +17,17 @@
     "type": "git",
     "url": "https://github.com/visgl/deck.gl.git"
   },
-  "main": "dist/es5/index.js",
-  "module": "dist/esm/index.js",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "files": [
     "dist",
     "src",
-    "typed",
     "dist.min.js"
   ],
   "sideEffects": false,

modules/arcgis/tsconfig.json

@@ -5,7 +5,7 @@
   "compilerOptions": {
     "composite": true,
     "rootDir": "src",
-    "outDir": "typed"
+    "outDir": "dist"
   },
   "references": [
     {"path": "../core"}

modules/carto/bundle.ts

@@ -1,4 +1,8 @@
-import * as CartoUtils from './src';
+// Import from package name instead of relative path
+// This will be resolved to src or dist by esbuild depending on bundle settings
+// dist has TS transformers applied
+/* eslint-disable import/no-extraneous-dependencies */
+import * as CartoUtils from '@deck.gl/carto';
 
 export * from '../layers/bundle/peer-dependency';
 

modules/carto/package.json

@@ -2,6 +2,7 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
+  "type": "module",
   "version": "9.0.0-beta.1",
   "publishConfig": {
     "access": "public"
@@ -18,13 +19,19 @@
     "type": "git",
     "url": "https://github.com/visgl/deck.gl.git"
   },
-  "main": "dist/es5/index.js",
-  "module": "dist/esm/index.js",
-  "types": "typed/index.d.ts",
+  "types": "dist/index.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "files": [
     "dist",
     "src",
-    "typed",
     "dist.min.js"
   ],
   "sideEffects": false,

modules/carto/src/api/fetch-map.ts

@@ -16,7 +16,7 @@ import {
   vectorQuerySource,
   vectorTableSource,
   vectorTilesetSource
-} from '../sources';
+} from '../sources/index';
 import {parseMap} from './parse-map';
 import {requestWithParameters} from './request-with-parameters';
 import {assert} from '../utils';

modules/carto/src/api/query.ts

@@ -1,4 +1,4 @@
-import {SOURCE_DEFAULTS} from '../sources';
+import {SOURCE_DEFAULTS} from '../sources/index';
 import type {SourceOptions, QuerySourceOptions, QueryResult} from '../sources/types';
 import {buildQueryUrl} from './endpoints';
 import {requestWithParameters} from './request-with-parameters';

modules/carto/src/index.ts

@@ -23,7 +23,7 @@ export {default as BASEMAP} from './basemap';
 export {default as colorBins} from './style/color-bins-style';
 export {default as colorCategories} from './style/color-categories-style';
 export {default as colorContinuous} from './style/color-continuous-style';
-export {CartoAPIError, fetchMap, query} from './api';
+export {CartoAPIError, fetchMap, query} from './api/index';
 export type {
   APIErrorContext,
   FetchMapOptions,
@@ -32,7 +32,7 @@ export type {
   RequestType,
   QueryParameters,
   QueryOptions
-} from './api';
+} from './api/index';
 
 import {
   boundaryQuerySource,
@@ -48,7 +48,7 @@ import {
   vectorTableSource,
   vectorTilesetSource,
   SOURCE_DEFAULTS
-} from './sources';
+} from './sources/index';
 
 const CARTO_SOURCES = {
   boundaryQuerySource,
@@ -98,4 +98,4 @@ export type {
   VectorTilesetSourceOptions,
   GeojsonResult,
   JsonResult
-} from './sources';
+} from './sources/index';

modules/carto/src/sources/boundary-query-source.ts

@@ -1,4 +1,4 @@
-import {QueryParameters} from '../api';
+import {QueryParameters} from '../api/index';
 import {baseSource} from './base-source';
 import type {SourceOptions, TilejsonResult} from './types';
 

modules/carto/tsconfig.json

@@ -5,7 +5,7 @@
   "compilerOptions": {
     "composite": true,
     "rootDir": "src",
-    "outDir": "typed"
+    "outDir": "dist"
   },
   "references": [
     {"path": "../core"},

modules/core/bundle/debug.ts

@@ -1,11 +1,7 @@
-import {getLoggers} from '../src/debug/loggers';
+// @ts-nocheck
+import {getLoggers} from '@deck.gl/core/debug/loggers';
 
-/* global deck */
-declare global {
-  const deck: any;
-}
-
-const loggers = getLoggers(deck.log);
-deck._registerLoggers(loggers);
+const loggers = getLoggers(globalThis.deck.log);
+globalThis.deck._registerLoggers(loggers);
 
 export {loggers};

modules/core/bundle/index.ts

@@ -1,14 +1,19 @@
-// We use `require` here because luma and deck core must be imported before `global`
-import * as LumaGL from '../src/scripting/lumagl';
-import * as LoadersGL from '../src/scripting/loadersgl';
+// @ts-nocheck
+// Luma and deck core must be imported before `global`
+/* eslint-disable import/no-extraneous-dependencies */
+import * as LumaGL from '@deck.gl/core/scripting/lumagl';
+import * as LoadersGL from '@deck.gl/core/scripting/loadersgl';
 
 globalThis.luma = globalThis.luma || {};
 globalThis.loaders = globalThis.loaders || {};
 
 Object.assign(globalThis.luma, LumaGL);
 Object.assign(globalThis.loaders, LoadersGL);
 
-export * from '../src';
-export {register as _registerLoggers} from '../src/debug';
+// Import from package name instead of relative path
+// This will be resolved to src or dist by esbuild depending on bundle settings
+// dist has TS transformers applied
+export * from '@deck.gl/core';
+export {register as _registerLoggers} from '@deck.gl/core/debug';
 
-export {default as DeckGL} from '../src/scripting/deckgl';
+export {default as DeckGL} from '@deck.gl/core/scripting/deckgl';