Upgrade ocular-dev-tools

uber-web · Feb 29, 2024 · 6be3dab · 6be3dab
1 parent ed10fc8
commit 6be3dab
Show file tree

Hide file tree

Showing 26 changed files with 77 additions and 266 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,3 +2,4 @@ dist/
 node_modules/
 coverage/
 .nyc_output/
+examples/
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -3,6 +3,7 @@ const {getESLintConfig} = require('ocular-dev-tools/configuration');
 module.exports = getESLintConfig({
   react: '16.8.2',
   overrides: {
+    parser: '',
     parserOptions: {
       project: ['./tsconfig.json']
     },

diff --git a/.ocularrc.js b/.ocularrc.js
@@ -1,6 +1,9 @@
+/* @type import('ocular-dev-tools').OcularConfig */
 export default {
+  babel: false,
+
   typescript: {
-    project: 'tsconfig.modules.json'
+    project: 'tsconfig.build.json'
   },
 
   lint: {

diff --git a/babel.config.cjs b/babel.config.cjs
diff --git a/modules/bench/package.json b/modules/bench/package.json
@@ -28,7 +28,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.0.0",
     "@probe.gl/log": "4.0.6"
   },
   "gitHead": "95541d68783bfd50cbaf9b2a15b3cb41f1ff8284"

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

diff --git a/modules/env/package.json b/modules/env/package.json
@@ -33,7 +33,6 @@
     "./src/lib/globals.js"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.0.0"
   },
   "gitHead": "95541d68783bfd50cbaf9b2a15b3cb41f1ff8284"
 }
diff --git a/modules/env/tsconfig.json b/modules/env/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/log/package.json b/modules/log/package.json
@@ -33,7 +33,6 @@
   ],
   "browser": {},
   "dependencies": {
-    "@babel/runtime": "^7.0.0",
     "@probe.gl/env": "4.0.6"
   },
   "gitHead": "95541d68783bfd50cbaf9b2a15b3cb41f1ff8284"

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

diff --git a/modules/react-bench/package.json b/modules/react-bench/package.json
@@ -31,7 +31,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.0.0",
     "css-loader": "^2.1.1",
     "react-table": "^6.10.0",
     "style-loader": "^1.1.3"

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

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

diff --git a/modules/stats-widget/package.json b/modules/stats-widget/package.json
@@ -30,7 +30,6 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@babel/runtime": "^7.0.0"
   },
   "peerDependencies": {
     "@probe.gl/stats": "^4.0.0"

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

diff --git a/modules/stats/package.json b/modules/stats/package.json
@@ -31,7 +31,6 @@
     "src"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.0.0"
   },
   "gitHead": "95541d68783bfd50cbaf9b2a15b3cb41f1ff8284"
 }
diff --git a/modules/stats/tsconfig.json b/modules/stats/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.module.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules"],
   "compilerOptions": {

diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json
@@ -33,7 +33,6 @@
     "puppeteer": false
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0",
     "@probe.gl/log": "4.0.6",
     "@types/pngjs": "^6.0.1",
     "pixelmatch": "^4.0.2"

diff --git a/modules/test-utils/tsconfig.json b/modules/test-utils/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
@@ -24,18 +24,18 @@
   "scripts": {
     "bootstrap": "yarn && ocular-bootstrap",
     "clean": "ocular-clean",
-    "build": "npm run clean && time ocular-build",
-    "lint": "tsc && ocular-lint",
+    "build": "ocular-build",
+    "lint": "ocular-lint",
     "publish": "ocular-publish",
     "test": "ocular-test",
     "test-fast": "ocular-test fast",
-    "version": "ocular-build core"
+    "version": "ocular-build env"
   },
   "devDependencies": {
     "@types/tape-promise": "^4.0.1",
     "jsdoc-to-markdown": "^3.0.0",
     "jsdom": "^16.5.0",
-    "ocular-dev-tools": "2.0.0-alpha.22",
+    "ocular-dev-tools": "2.0.0-alpha.26",
     "pre-commit": "^1.2.2",
     "puppeteer": "^22.0.0",
     "react-dom": "^16.13.1",

diff --git a/tsconfig.build.json b/tsconfig.build.json
@@ -3,14 +3,22 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "build": true,
-    "target": "es2020",
-    "module": "es2020",
-    "esModuleInterop": true,
-    "declaration": true,
-    "declarationMap": true,
-    "noEmit": false,
-    "emitDeclarationOnly": true
     // Uncomment to debug
     // "listEmittedFiles": true
-  }
+  },
+  "references": [
+    {"path": "modules/bench"},
+    {"path": "modules/env"},
+    {"path": "modules/log"},
+    {"path": "modules/react-bench"},
+    {"path": "modules/seer"},
+    {"path": "modules/stats"},
+    {"path": "modules/stats-widget"},
+    {"path": "modules/test-utils"}
+  ],
+  "include": [
+    "modules/core/src"
+  ],
+  "exclude": [
+  ]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -5,7 +5,7 @@
   },
   "compilerOptions": {
     "target": "es2020",
-    "module": "esnext",
+    "module": "es2020",
     "jsx": "react",
     "allowJs": true,
     "checkJs": true,

diff --git a/tsconfig.module.json b/tsconfig.module.json
@@ -0,0 +1,24 @@
+// This is a base TS config for the individual packages, mainly for building .d.ts files
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "build": true,
+    "declaration": true,
+    "declarationMap": true,
+    "noEmit": false,
+    "useDefineForClassFields": false,
+    "plugins": [
+      {
+        "transform": "ocular-dev-tools/ts-transform-version-inline"
+      },
+      {
+        "transform": "ocular-dev-tools/ts-transform-append-extension",
+        "after": true
+      },
+      {
+        "transform": "ocular-dev-tools/ts-transform-append-extension",
+        "afterDeclarations": true
+      }
+    ]
+  }
+}
diff --git a/tsconfig.modules.json b/tsconfig.modules.json
diff --git a/webpack.config.js b/webpack.config.js