Upgrade dev tools (#26)

visgl · Aug 27, 2024 · 78c0ee4 · 78c0ee4
1 parent eecad0d
commit 78c0ee4
Show file tree

Hide file tree

Showing 26 changed files with 177 additions and 1,911 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -3,3 +3,4 @@ dist/
 coverage/
 test/
 *.md
+**/wip/
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -1,17 +1,12 @@
-const {getESLintConfig} = require('ocular-dev-tools/configuration');
+const {getESLintConfig} = require('@vis.gl/dev-tools/configuration');
 
 module.exports = getESLintConfig({
-  overrides: {parser: '',
-    parserOptions: {
-      project: ['./tsconfig.json'],
-      ecmaVersion: 2020
-    },
+  overrides: {
     env: {
       browser: true,
       es2020: true,
       node: true
     },
-
     overrides: [
       {
         // scripts use devDependencies
@@ -26,7 +21,6 @@ module.exports = getESLintConfig({
         files: ['modules/**/*.ts', 'modules/**/*.js'],
         rules: {
           'no-use-before-define': 0,
-          'import/no-unresolved': 0,
           'import/named': 0,
           '@typescript-eslint/ban-ts-comment': 0 // We do need our ts-ignores
         }

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,15 +10,11 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20]
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: volta-cli/action@2d68418f32546fd191eb666e232b321d5726484d # v4.1.1
         with:
-          node-version: ${{ matrix.node-version }}
           cache: 'yarn'
 
       - name: Install dependencies
@@ -34,6 +30,7 @@ jobs:
       - name: Run tests
         run: |
           yarn test ci
+          yarn lint
 
       - name: Coveralls
         uses: coverallsapp/github-action@09b709cf6a16e30b0808ba050c7a6e8a5ef13f8d # v1.2.5

diff --git a/.ocularrc.js b/.ocularrc.js
@@ -2,14 +2,8 @@ import {resolve} from 'path';
 
 export default {
   lint: {
-    paths: ['dev-docs', 'docs', 'modules', 'examples', 'test'] // 'website'
-    // extensions: ['js', 'md']
-  },
-
-  babel: false,
-
-  typescript: {
-    project: 'tsconfig.build.json'
+    paths: ['dev-docs', 'docs', 'modules', 'examples', 'test'], // 'website'
+    extensions: ['js', 'mjs', 'jsx', 'ts', 'tsx', 'd.ts', 'md']
   },
 
   aliases: {

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

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

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

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

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

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

diff --git a/modules/geospatial/tsconfig.json b/modules/geospatial/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../tsconfig.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.module.json",
+  "extends": "../../tsconfig.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.module.json",
+  "extends": "../../tsconfig.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

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

diff --git a/modules/sun/tsconfig.json b/modules/sun/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../tsconfig.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.module.json",
+  "extends": "../../tsconfig.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/web-mercator/tsconfig.json b/modules/web-mercator/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../tsconfig.module.json",
+  "extends": "../../tsconfig.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {
-    "noImplicitAny": false, // gl-matrix is a mess...
+    "noImplicitAny": false,
     "composite": true,
     "rootDir": "src",
     "outDir": "dist"

diff --git a/package.json b/package.json
@@ -13,21 +13,22 @@
     "examples/*"
   ],
   "scripts": {
-    "bootstrap": "ocular-bootstrap",
-    "clean": "ocular-clean",
-    "build": "npm run clean && time ocular-build",
+    "bootstrap": "yarn && ocular-bootstrap && npm run build",
+    "build": "ocular-clean && time ocular-build",
     "cover": "ocular-test cover",
     "lint": "ocular-lint",
     "metrics": "ocular-metrics",
-    "publish-beta": "ocular-publish beta",
-    "publish-prod": "ocular-publish prod",
-    "test": "ocular-test"
+    "publish-beta": "ocular-publish version-only-beta",
+    "publish-prod": "ocular-publish version-only-prod",
+    "test": "ocular-test",
+    "test-pre-commit": "ocular-lint pre-commit && ocular-test node"
   },
   "devDependencies": {
     "@probe.gl/bench": "^4.0.0",
     "@turf/destination": "^6.0.1",
     "@types/tape-promise": "^4.0.1",
-    "ocular-dev-tools": "2.0.0-alpha.34",
+    "@vis.gl/dev-tools": "1.0.0-alpha.9",
+    "@vis.gl/ts-plugins": "1.0.0-alpha.9",
     "pre-commit": "^1.2.2",
     "puppeteer": "^22.0.0",
     "tap-spec": "^5.0.0"
@@ -38,5 +39,8 @@
   "volta": {
     "node": "20.15.1",
     "yarn": "4.3.1"
-  }
+  },
+  "pre-commit": [
+    "test-pre-commit"
+  ]
 }
diff --git a/scripts/add-js-to-imports.sh b/scripts/add-js-to-imports.sh
diff --git a/tsconfig.build.json b/tsconfig.build.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,8 +12,8 @@
     "moduleResolution": "node",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
-    "noEmit": true,
     "baseUrl": ".",
+    "useDefineForClassFields": false,
 
     // BEGIN TYPE CHECK SETTINGS
     "skipLibCheck": true,
@@ -64,7 +64,19 @@
       "@math.gl/web-mercator/*": ["modules/web-mercator/src/*"],
       "@math.gl/web-mercator/test/*": ["modules/web-mercator/test/*"],
       "test/*": ["test/*"]
-    }
+    },
+    "plugins": [
+      {
+        "transform": "@vis.gl/ts-plugins/ts-transform-append-extension",
+        "extensions": [".js"],
+        "after": true
+      },
+      {
+        "transform": "@vis.gl/ts-plugins/ts-transform-append-extension",
+        "extensions": [".js"],
+        "afterDeclarations": true
+      }
+    ]
   },
   "include":[
     "modules/*/src",

diff --git a/tsconfig.module.json b/tsconfig.module.json