wip

.ocularrc.js

@@ -1,12 +1,12 @@
-const {resolve} = require('path');
+import {resolve} from 'path';
 
-const config = {
+export default {
   lint: {
     paths: ['src', 'test', 'examples']
   },
 
   typescript: {
-    project: 'tsconfig.json'
+    project: 'tsconfig.build.json'
   },
 
   aliases: {
@@ -24,5 +24,3 @@ const config = {
     size: ['test/size/all.js', 'test/size/map.js']
   }
 };
-
-module.exports = config;

maplibre/package.json

@@ -1,6 +1,6 @@
 {
   "internal": true,
-  "main": "../dist/es5/exports-maplibre.js",
-  "module": "../dist/esm/exports-maplibre.js",
-  "types": "../dist/esm/exports-maplibre.d.ts"
+  "main": "../dist/exports-maplibre.cjs",
+  "module": "../dist/exports-maplibre.js",
+  "types": "../dist/exports-maplibre.d.ts"
 }

package.json

@@ -14,9 +14,22 @@
     "url": "https://github.com/visgl/react-map-gl.git"
   },
   "license": "MIT",
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/es5/index.js",
-  "module": "dist/esm/index.js",
+  "type": "module",
+  "types": "dist/index.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts"
+    },
+    "./maplibre": {
+      "import": "./dist/exports-maplibre.js",
+      "require": "./dist/exports-maplibre.cjs",
+      "types": "./dist/exports-maplibre.d.ts"
+    }
+  },
   "files": [
     "src",
     "dist",
@@ -26,7 +39,7 @@
   "scripts": {
     "typecheck": "tsc -p tsconfig.esm.json --noEmit",
     "bootstrap": "PUPPETEER_SKIP_DOWNLOAD=true yarn && ocular-bootstrap",
-    "build": "ocular-clean && tsc -b tsconfig.esm.json && tsc -b tsconfig.es5.json",
+    "build": "ocular-clean && ocular-build",
     "lint": "ocular-lint",
     "cover": "ocular-test cover",
     "publish-prod": "ocular-publish prod",

src/types/style-spec-maplibre.ts

@@ -20,7 +20,7 @@ import type {
   RasterDEMSourceSpecification as RasterDemSource
 } from '@maplibre/maplibre-gl-style-spec';
 
-import {CanvasSourceSpecification as CanvasSourceRaw} from 'maplibre-gl';
+import type {CanvasSourceSpecification as CanvasSourceRaw} from 'maplibre-gl';
 
 // Layers
 export type {
@@ -47,7 +47,7 @@ export type AnyLayer =
   | SymbolLayer;
 
 // Sources
-export {
+export type {
   GeoJSONSourceRaw,
   VideoSourceRaw,
   ImageSourceRaw,

tsconfig.esm.json → tsconfig.build.json

@@ -7,7 +7,7 @@
     "module": "ES2020",
     "declaration": true,
     "sourceMap": true,
-    "outDir": "./dist/esm"
+    "outDir": "./dist"
   },
   "include":[
     "src/**/*"