Merge 94c1d1c into e3b313a

visgl · Mar 7, 2024 · 98e2379 · 98e2379
2 parents e3b313a + 94c1d1c
commit 98e2379
Show file tree

Hide file tree

Showing 33 changed files with 1,572 additions and 896 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -1,8 +1,11 @@
 const {getESLintConfig} = require('ocular-dev-tools/configuration');
 
 module.exports = getESLintConfig({
-  react: '16.8.2',
-  overrides: {
+  overrides: {parser: '',
+    parserOptions: {
+      project: ['./tsconfig.json'],
+      ecmaVersion: 2020
+    },
     env: {
       browser: true,
       es2020: true,

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16, 18, 20]
+        node-version: [18, 20]
 
     steps:
       - uses: actions/checkout@v3.0.2

diff --git a/.ocularrc.js b/.ocularrc.js
@@ -6,12 +6,10 @@ export default {
     // extensions: ['js', 'md']
   },
 
-  babel: {
-    // extensions: ['.js']
-  },
+  babel: false,
 
   typescript: {
-    project: 'tsconfig.modules.json'
+    project: 'tsconfig.build.json'
   },
 
   aliases: {

diff --git a/babel.config.cjs b/babel.config.cjs
diff --git a/modules/core/package.json b/modules/core/package.json
@@ -45,7 +45,6 @@
     "./src/lib/common.js"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0",
     "@math.gl/types": "4.0.0"
   },
   "gitHead": "e1a95300cb225a90da6e90333d4adf290f7ba501"

diff --git a/modules/core/tsconfig.json b/modules/core/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/culling/package.json b/modules/culling/package.json
@@ -42,7 +42,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0",
     "@math.gl/core": "4.0.0"
   },
   "gitHead": "e1a95300cb225a90da6e90333d4adf290f7ba501"

diff --git a/modules/culling/tsconfig.json b/modules/culling/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/dggs-geohash/package.json b/modules/dggs-geohash/package.json
@@ -34,7 +34,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0",
     "@math.gl/web-mercator": "4.0.0"
   }
 }
diff --git a/modules/dggs-geohash/tsconfig.json b/modules/dggs-geohash/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/dggs-quadkey/package.json b/modules/dggs-quadkey/package.json
@@ -34,7 +34,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0",
     "@math.gl/web-mercator": "4.0.0"
   }
 }
diff --git a/modules/dggs-quadkey/tsconfig.json b/modules/dggs-quadkey/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/dggs-s2/package.json b/modules/dggs-s2/package.json
@@ -34,7 +34,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0",
     "long": "^5.2.1"
   },
   "devDependencies": {

diff --git a/modules/dggs-s2/tsconfig.json b/modules/dggs-s2/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/geoid/package.json b/modules/geoid/package.json
@@ -40,7 +40,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0",
     "@math.gl/core": "4.0.0"
   },
   "gitHead": "e1a95300cb225a90da6e90333d4adf290f7ba501"

diff --git a/modules/geoid/tsconfig.json b/modules/geoid/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/geospatial/package.json b/modules/geospatial/package.json
@@ -39,7 +39,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0",
     "@math.gl/core": "4.0.0"
   },
   "gitHead": "e1a95300cb225a90da6e90333d4adf290f7ba501"

diff --git a/modules/geospatial/tsconfig.json b/modules/geospatial/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/main/tsconfig.json b/modules/main/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/polygon/tsconfig.json b/modules/polygon/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/proj4/package.json b/modules/proj4/package.json
@@ -41,7 +41,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0",
     "@math.gl/core": "4.0.0",
     "@types/proj4": "^2.5.0",
     "proj4": "2.6.2"

diff --git a/modules/proj4/tsconfig.json b/modules/proj4/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/sun/package.json b/modules/sun/package.json
@@ -34,6 +34,5 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0"
   }
 }
diff --git a/modules/sun/tsconfig.json b/modules/sun/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/types/tsconfig.json b/modules/types/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/web-mercator/package.json b/modules/web-mercator/package.json
@@ -34,7 +34,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.12.0"
   },
   "devDependencies": {
     "mock-browser": "^0.92.14"

diff --git a/modules/web-mercator/tsconfig.json b/modules/web-mercator/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/package.json b/package.json
@@ -13,33 +13,23 @@
     "examples/*"
   ],
   "scripts": {
-    "bootstrap": "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true yarn && ocular-bootstrap",
+    "bootstrap": "yarn && ocular-bootstrap",
     "clean": "ocular-clean",
     "build": "npm run clean && time ocular-build",
     "cover": "ocular-test cover",
     "lint": "tsc && ocular-lint",
     "metrics": "ocular-metrics",
     "publish": "ocular-publish",
-    "test": "ocular-test",
-    "test-size-explicit": "npm run build && webpack --config test/webpack.config.js --env.import-vec4-mat4-explicit",
-    "test-size": "npm run build && webpack --config test/webpack.config.js --env.import-nothing"
+    "test": "ocular-test"
   },
   "dependencies": {},
   "devDependencies": {
     "@probe.gl/bench": "^4.0.0",
     "@turf/destination": "^6.0.1",
     "@types/tape-promise": "^4.0.1",
-    "babel-plugin-transform-builtin-extend": "^1.1.2",
-    "ocular-dev-tools": "2.0.0-alpha.9",
-    "pre-commit": "^1.2.2"
-  },
-  "resolutions_notes": [
-    "Note: tape 4.12 and higher no longer compares 0 and -0 equally...",
-    "es-abstract breaks on Node 18"
-  ],
-  "resolutions": {
-    "tape": "4.11.0",
-    "es-abstract": "^1.21.1"
+    "ocular-dev-tools": "2.0.0-alpha.28",
+    "pre-commit": "^1.2.2",
+    "puppeteer": "^22.0.0"
   },
   "volta": {
     "node": "18.18.1",

diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -2,15 +2,26 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "build": true,
-    "target": "es2020",
-    "module": "es2020",
-    "esModuleInterop": true,
-    "declaration": true,
-    "declarationMap": true,
-    "noEmit": false,
-    "emitDeclarationOnly": true
+    "build": true
     // Uncomment to debug
     // "listEmittedFiles": true
-  }
+  },
+  // Monorepo setup. All modules need to be listed here
+  "references": [
+    {"path": "modules/core"},
+    {"path": "modules/culling"},
+    {"path": "modules/dggs-geohash"},
+    {"path": "modules/dggs-s2"},
+    {"path": "modules/dggs-quadkey"},
+    {"path": "modules/geoid"},
+    {"path": "modules/geospatial"},
+    {"path": "modules/main"},
+    {"path": "modules/polygon"},
+    {"path": "modules/proj4"},
+    {"path": "modules/sun"},
+    {"path": "modules/web-mercator"}
+  ],
+  "include": [
+    "modules/*/src"
+  ]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,9 +5,8 @@
   },
 
   "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "jsx": "react",
+    "target": "es2020",
+    "module": "es2020",
     "allowJs": true,
     "checkJs": false,
     "moduleResolution": "node",

diff --git a/tsconfig.module.json b/tsconfig.module.json
@@ -0,0 +1,26 @@
+// This is the monorepo build config
+// needs to be a separate file to avoid importing references into packages
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "build": true,
+    "esModuleInterop": true,
+    "declaration": true,
+    "noEmit": false,
+    "useDefineForClassFields": false,
+    // Uncomment to debug
+    "listEmittedFiles": true,
+    "plugins": [
+      {
+        "transform": "ocular-dev-tools/ts-transform-append-extension",
+        "extensions": [".js"],
+        "after": true
+      },
+      {
+        "transform": "ocular-dev-tools/ts-transform-append-extension",
+        "extensions": [".js"],
+        "afterDeclarations": true
+      }
+    ]
+  }
+}
diff --git a/tsconfig.modules.json b/tsconfig.modules.json