Merge remote-tracking branch 'origin/main' into HEAD

* origin/main:
  Refactored some files
  Update typescript
  Fixed storybook dark mode theming
  Update to simpler Storybook config

.gitignore

@@ -38,4 +38,4 @@ storybook-static
 # (e.g. https://github.com/UW-Macrostrat/web).
 yarn.lock
 
-packages/*/dist
+packages/*/dist

.prettierrc.json

@@ -0,0 +1,3 @@
+{
+  "proseWrap": "always"
+}

.yarnrc.yml

@@ -1,7 +1,4 @@
 packageExtensions:
-  "@storybook/core-common@*":
-    dependencies:
-      "@storybook/react-webpack5": "*"
   [email protected]:
     dependencies:
       "#ansi-styles": "npm:[email protected]"
@@ -17,4 +14,4 @@ pnpFallbackMode: all
 
 pnpMode: loose
 
-yarnPath: .yarn/releases/yarn-4.1.1.cjs
+yarnPath: .yarn/releases/yarn-4.5.0.cjs

package.json

@@ -1,21 +1,11 @@
 {
   "name": "@macrostrat/web-components",
-  "version": "1.0.0",
   "description": "Web components for stratigraphy and geologic mapping managed by Macrostrat",
   "private": true,
   "repository": "https://github.com/UW-Macrostrat/web-components.git",
   "scripts": {
-    "dev:legacy": "npm-run-all -l -p dev watch:**",
-    "watch:map": "npm --prefix packages/map-components run watch:main",
-    "watch:ui": "npm --prefix packages/ui-components run dev",
-    "watch:column": "npm --prefix packages/column-components run watch",
-    "watch:timescale": "npm --prefix packages/timescale run watch",
-    "deploy": "./scripts/deploy-steno",
-    "dev": "./scripts/run-dev-server",
-    "clean": "rm -rf .cache dist",
-    "dev:storybook": "yarn workspace @macrostrat/storybook run dev",
-    "build:storybook": "yarn workspace @macrostrat/storybook run build",
-    "dev:concepts": "yarn workspace concept-apps run dev",
+    "dev": "yarn workspace @macrostrat/storybook run dev",
+    "build": "yarn workspace @macrostrat/storybook run build",
     "publish": "node ./scripts/publish.mjs"
   },
   "author": "Daven Quinn",
@@ -25,28 +15,24 @@
     "@macrostrat/map-components": "./packages/map-components/src",
     "@macrostrat/api-views": "./packages/api-views/src",
     "@macrostrat/timescale": "./packages/timescale/src",
-    "@macrostrat/mapbox-styles": "./packages/mapbox-styles/src"
+    "@macrostrat/mapbox-styles": "./packages/mapbox-styles/src",
+    "@macrostrat/ui-components": "./packages/ui-components/src",
+    "@macrostrat/column-components": "./packages/column-components/src"
   },
   "devDependencies": {
     "@babel/core": "^7.18.10",
     "@babel/preset-env": "^7.21.4",
     "@babel/preset-typescript": "^7.21.4",
-    "@parcel/packager-ts": "2.9.3",
-    "@parcel/transformer-sass": "^2.9.3",
-    "@parcel/transformer-stylus": "^2.9.3",
-    "@parcel/transformer-typescript-types": "^2.9.3",
-    "@types/pg": "^8",
     "axios": "^0.27.2",
     "chalk": "^5.0.1",
     "concurrently": "^7.2.2",
     "geologic-patterns": "^2.0.0-dev1",
     "husky": "^4.3.5",
     "lerna": "^4.0.0",
     "node-fetch": "^3.2.9",
-    "parcel": "^2.9.3",
     "prettier": "^2.7.1",
     "sass": "^1.62.0",
-    "typescript": "^4.7.4"
+    "typescript": "^5.6.2"
   },
   "publishedPackages": [
     "ui-components",
@@ -60,8 +46,7 @@
     "storybook",
     "toolchain/*"
   ],
-  "prettier": {},
-  "packageManager": "[email protected]",
+  "packageManager": "[email protected]",
   "dependenciesMeta": {
     "[email protected]": {
       "unplugged": true

packages/api-views/package.json

@@ -8,9 +8,6 @@
   },
   "author": "Daven Quinn",
   "license": "ISC",
-  "devDependencies": {
-    "typescript": "^4.2.3"
-  },
   "dependencies": {
     "@macrostrat/hyper": "^2.2.1",
     "@macrostrat/ui-components": "workspace:*"

packages/auth-components/package.json

@@ -7,13 +7,10 @@
   "license": "ISC",
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
-    "@macrostrat/hyper": "^1.2.12",
+    "@macrostrat/hyper": "^2.0.0",
     "classnames": "^2.3.1",
     "react": "^18"
   },
-  "devDependencies": {
-    "typescript": "^4.2.3"
-  },
   "exports": {
     ".": {
       "typescript": "./src",

packages/color-utils/package.json

@@ -11,9 +11,6 @@
   "dependencies": {
     "chroma-js": "^2.4.2"
   },
-  "devDependencies": {
-    "typescript": "^4.2.3"
-  },
   "exports": {
     ".": {
       "typescript": "./src",

packages/column-components/package.json

@@ -9,9 +9,11 @@
     "data-visualization"
   ],
   "main": "./dist/cjs",
-  "module": "./dist/esm",
+  "module": "./src/index.ts",
   "exports": {
-    "typescript": "./src/index.ts"
+    ".": {
+      "typescript": "./src/index.ts"
+    }
   },
   "style": "./dist/esm/index.css",
   "typings": "./dist/types/index.d.ts",

packages/data-components/package.json

@@ -34,8 +34,7 @@
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.49.0",
-    "typescript": "^4.5.5"
+    "sass": "^1.49.0"
   },
   "peerDependencies": {
     "@blueprintjs/core": "^4.3.0",

packages/data-sheet/package.json

@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
-    "@macrostrat/hyper": "^1.2.12",
+    "@macrostrat/hyper": "^2.0.0",
     "chroma-js": "^2.4.2",
     "classnames": "^2.3.1",
     "d3-array": "^2.12.1",
@@ -23,7 +23,7 @@
     "react-draggable": "^4.4.3"
   },
   "devDependencies": {
-    "typescript": "^4.2.3"
+    "typescript": "^5.6.2"
   },
   "exports": {
     ".": {

packages/data-sheet2/package.json

@@ -11,15 +11,15 @@
   "dependencies": {
     "@blueprintjs/core": "^5.10.2",
     "@blueprintjs/table": "^5.1.4",
-    "@macrostrat/hyper": "^1.2.12",
+    "@macrostrat/hyper": "^2.0.0",
     "chroma-js": "^2.4.2",
     "classnames": "^2.3.1",
     "immutability-helper": "^3.1.1",
     "react": "^17.0.2||^18",
     "react-color": "^2.19.3"
   },
   "devDependencies": {
-    "typescript": "^4.2.3"
+    "typescript": "^5.6.2"
   },
   "exports": {
     ".": {

packages/feedback-components/package.json

@@ -15,9 +15,6 @@
     "react-arborist": "^3.4.0",
     "react-text-annotate-blend": "^1.2.0"
   },
-  "devDependencies": {
-    "typescript": "^4.2.3||^5"
-  },
   "exports": {
     ".": {
       "typescript": "./src",

packages/form-components/package.json

@@ -32,8 +32,7 @@
     "rollup-plugin-dts": "^4.1.0",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.5.5"
+    "rollup-plugin-terser": "^7.0.2"
   },
   "peerDependencies": {
     "react": "^17.0.2||^18"

packages/map-components/package.json

@@ -63,6 +63,7 @@
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@types/jest": "^26.0.10",
     "@types/node": "^14.6.0",
+    "@types/topojson-client": "^3",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.3.6",
     "prettier": "^2.0.5",
@@ -92,7 +93,8 @@
     "d3-selection": "^1.4.1",
     "d3-zoom": "^1.8.3",
     "kld-intersections": "^0.7.0",
-    "kld-path-parser": "^0.2.1"
+    "kld-path-parser": "^0.2.1",
+    "topojson-client": "^3.1.0"
   },
   "peerDependencies": {
     "react": "^16.11.0||^17.0.0||^18.0.0",

packages/style-system/.npmignore

@@ -1 +1 @@
-vite.config.js
+vite.config.ts

packages/timescale/package.json

@@ -32,7 +32,7 @@
     "rollup": "^2.38.1",
     "rollup-plugin-postcss": "^3.1.6",
     "stylus": "^0.59.0",
-    "typescript": "^4.0.2"
+    "typescript": "^5.6.2"
   },
   "dependencies": {
     "@macrostrat/column-components": "workspace:*",

packages/ui-components/package.json

@@ -61,7 +61,7 @@
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
     "sass": "^1.50.0",
-    "typescript": "^4.4.4"
+    "typescript": "^5.6.2"
   },
   "exports": {
     ".": {