Merge branch 'develop' into May-tailwind-refactor

* develop: (22 commits)
  Formatted
  Added tailwindcss to docusaurus config
  First attempt at adding tailwind
  Change import to import type when needed
  ⬆️ Bump @docusaurus/core from 2.0.0-beta.20 to 2.0.0-beta.21
  ⬆️ Bump @types/react-dom from 18.0.4 to 18.0.5
  ⬆️ Bump gentype from 4.3.0 to 4.4.0
  ⬆️ Bump mathjs from 10.5.2 to 10.6.0
  ⬆️ Bump typescript from 4.6.4 to 4.7.2
  ⬆️ Bump @storybook/builder-webpack5 from 6.5.4 to 6.5.6
  ⬆️ Bump react-hook-form from 7.31.2 to 7.31.3
  ⬆️ Bump @docusaurus/preset-classic
  ⬆️ Bump reanalyze from 2.19.0 to 2.22.0
  ⬆️ Bump @storybook/addon-links from 6.5.4 to 6.5.6
  ⬆️ Bump @storybook/react from 6.5.4 to 6.5.6
  ⬆️ Bump @storybook/addon-essentials from 6.5.4 to 6.5.6
  ⬆️ Bump @storybook/manager-webpack5 from 6.5.4 to 6.5.6
  ⬆️ Bump peggy from 1.2.0 to 2.0.0
  ⬆️ Bump @storybook/node-logger from 6.5.4 to 6.5.6
  ⬆️ Bump @storybook/addon-actions from 6.5.4 to 6.5.6
  ...

packages/components/package.json

@@ -13,7 +13,7 @@
     "react": "^18.1.0",
     "react-ace": "^10.1.0",
     "react-dom": "^18.1.0",
-    "react-hook-form": "^7.31.2",
+    "react-hook-form": "^7.31.3",
     "react-use": "^17.4.0",
     "react-vega": "^7.5.1",
     "vega": "^5.22.1",
@@ -23,22 +23,22 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
-    "@storybook/addon-actions": "^6.5.3",
+    "@storybook/addon-actions": "^6.5.6",
-    "@storybook/addon-essentials": "^6.5.4",
+    "@storybook/addon-essentials": "^6.5.6",
-    "@storybook/addon-links": "^6.5.4",
+    "@storybook/addon-links": "^6.5.6",
-    "@storybook/builder-webpack5": "^6.5.4",
+    "@storybook/builder-webpack5": "^6.5.6",
-    "@storybook/manager-webpack5": "^6.5.4",
+    "@storybook/manager-webpack5": "^6.5.6",
-    "@storybook/node-logger": "^6.5.4",
+    "@storybook/node-logger": "^6.5.6",
     "@storybook/preset-create-react-app": "^4.1.1",
-    "@storybook/react": "^6.5.4",
+    "@storybook/react": "^6.5.6",
     "@testing-library/jest-dom": "^5.16.4",
-    "@testing-library/react": "^13.2.0",
+    "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^14.2.0",
     "@types/jest": "^27.5.0",
     "@types/lodash": "^4.14.182",
-    "@types/node": "^17.0.35",
+    "@types/node": "^17.0.36",
     "@types/react": "^18.0.9",
-    "@types/react-dom": "^18.0.4",
+    "@types/react-dom": "^18.0.5",
     "@types/styled-components": "^5.1.24",
     "@types/webpack": "^5.28.0",
     "cross-env": "^7.0.3",
@@ -47,7 +47,7 @@
     "tailwindcss": "^3.0.24",
     "ts-loader": "^9.3.0",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
-    "typescript": "^4.6.3",
+    "typescript": "^4.7.2",
     "web-vitals": "^2.1.4",
     "webpack": "^5.72.1",
     "webpack-cli": "^4.9.2",

packages/squiggle-lang/package.json

@@ -38,7 +38,7 @@
   "dependencies": {
     "@stdlib/stats": "^0.0.13",
     "jstat": "^1.9.5",
-    "mathjs": "^10.5.2",
+    "mathjs": "^10.6.0",
     "pdfast": "^0.2.0",
     "rescript": "^9.1.4"
   },
@@ -51,18 +51,18 @@
     "chalk": "^5.0.1",
     "codecov": "^3.8.3",
     "fast-check": "^2.25.0",
-    "gentype": "^4.3.0",
+    "gentype": "^4.4.0",
     "jest": "^27.5.1",
     "lodash": "^4.17.21",
     "moduleserve": "^0.9.1",
     "nyc": "^15.1.0",
-    "peggy": "^1.2.0",
+    "peggy": "^2.0.0",
-    "reanalyze": "^2.19.0",
+    "reanalyze": "^2.22.0",
     "rescript-fast-check": "^1.1.1",
     "ts-jest": "^27.1.4",
     "ts-loader": "^9.3.0",
     "ts-node": "^10.8.0",
-    "typescript": "^4.6.3",
+    "typescript": "^4.7.2",
     "webpack": "^5.72.1",
     "webpack-cli": "^4.9.2"
   },

packages/squiggle-lang/src/js/index.ts

@@ -1,18 +1,22 @@
 import * as _ from "lodash";
-import {
+import type {
   environment,
+  expressionValue,
+  externalBindings,
+  errorValue,
+} from "../rescript/TypescriptInterface.gen";
+import {
   defaultEnvironment,
   evaluatePartialUsingExternalBindings,
   evaluateUsingOptions,
-  externalBindings,
-  expressionValue,
-  errorValue,
   foreignFunctionInterface,
 } from "../rescript/TypescriptInterface.gen";
 export {
   makeSampleSetDist,
   errorValueToString,
   distributionErrorToString,
+} from "../rescript/TypescriptInterface.gen";
+export type {
   distributionError,
   declarationArg,
   declaration,
@@ -30,16 +34,8 @@ import {
 import { result, resultMap, tag, tagged } from "./types";
 import { Distribution, shape } from "./distribution";
 
-export {
+export { Distribution, resultMap, defaultEnvironment };
-  Distribution,
+export type { result, shape, environment, lambdaValue, squiggleExpression };
-  squiggleExpression,
-  result,
-  resultMap,
-  shape,
-  lambdaValue,
-  environment,
-  defaultEnvironment,
-};
 
 export let defaultSamplingInputs: environment = {
   sampleCount: 10000,

packages/squiggle-lang/src/js/rescript_interop.ts

@@ -1,5 +1,5 @@
 import * as _ from "lodash";
-import {
+import type {
   expressionValue,
   mixedShape,
   sampleSetDist,

packages/website/docusaurus.config.js

@@ -20,6 +20,7 @@ const config = {
   projectName: "squiggle", // Usually your repo name.
 
   plugins: [
+    "docusaurus-tailwindcss",
     () => ({
       configureWebpack(config, isServer, utils, content) {
         return {

packages/website/package.json

@@ -12,16 +12,17 @@
     "format": "prettier --write ."
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
-    "@docusaurus/preset-classic": "2.0.0-beta.20",
+    "@docusaurus/preset-classic": "2.0.0-beta.21",
     "@quri/squiggle-components": "^0.2.20",
     "clsx": "^1.1.1",
+    "docusaurus-tailwindcss": "^0.1.0",
+    "hast-util-is-element": "2.1.2",
     "prism-react-renderer": "^1.3.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "remark-math": "^3",
     "rehype-katex": "^5",
-    "hast-util-is-element": "2.1.2"
+    "remark-math": "^3"
   },
   "browserslist": {
     "production": [

packages/website/src/css/custom.css

@@ -4,6 +4,10 @@
  * work well for content-centric websites.
  */
 
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
 /* You can override the default Infima variables here. */
 :root {
   --ifm-color-primary: #2488df;