Merge branch 'develop' into reducer-dev

.github/CODEOWNERS

@@ -9,21 +9,21 @@
 # This also holds true for GitHub teams.
 
 # Rescript 
-*.res @Hazelfire @OAGr @quinn-dougherty
+*.res @OAGr @quinn-dougherty
-*.resi @Hazelfire @OAGr @quinn-dougherty
+*.resi @OAGr @quinn-dougherty
 
 # Typescript 
 *.tsx @Hazelfire @OAGr
 *.ts @Hazelfire @OAGr
 
 # Javascript
-*.js @Hazelfire
+*.js @Hazelfire @OAGr
 
 # Any opsy files
-.github/* @quinn-dougherty
+.github/** @quinn-dougherty @OAGr
-*.json @quinn-dougherty @Hazelfire
+*.json @quinn-dougherty @Hazelfire @OAGr
-*.y*ml @quinn-dougherty
+*.y*ml @quinn-dougherty @OAGr
-*.config.js @Hazelfire
+*.config.js @Hazelfire @OAGr
 
 # Documentation
 *.md @quinn-dougherty @OAGr @Hazelfire

.github/workflows/ci.yml

@@ -25,17 +25,17 @@ jobs:
     steps:
       - id: skip_lang_check
         name: Check if the changes are about squiggle-lang src files
-        uses: fkirc/skip-duplicate-actions@master
+        uses: fkirc/skip-duplicate-actions@v3.4.1
         with:
           paths: '["packages/squiggle-lang/**"]'
       - id: skip_components_check
         name: Check if the changes are about components src files
-        uses: fkirc/skip-duplicate-actions@master
+        uses: fkirc/skip-duplicate-actions@v3.4.1
         with:
           paths: '["packages/components/**"]'
       - id: skip_website_check
         name: Check if the changes are about website src files
-        uses: fkirc/skip-duplicate-actions@master
+        uses: fkirc/skip-duplicate-actions@v3.4.1
         with:
           paths: '["packages/website/**"]'
 
@@ -58,7 +58,7 @@ jobs:
         uses: creyD/prettier_action@v4.2
         with:
           dry: true
-          prettier_options: --check .
+          prettier_options: --check packages/squiggle-lang
 
   lang-build-test-bundle:
     name: Language build, test, and bundle
@@ -97,7 +97,7 @@ jobs:
         uses: creyD/prettier_action@v4.2
         with:
           dry: true
-          prettier_options: --check .
+          prettier_options: --check packages/components
 
   components-bundle-build:
     name: Components bundle and build
@@ -134,7 +134,7 @@ jobs:
         uses: creyD/prettier_action@v4.2
         with:
           dry: true
-          prettier_options: --check .
+          prettier_options: --check packages/website
 
   website-build:
     name: Website build

CONTRIBUTING.md

@@ -51,7 +51,13 @@ See [here](https://github.com/NixOS/nixpkgs/issues/107375)
 
 # Pull request protocol
 
-Please work against `staging` branch. **Do not** work against `master`. Please do not merge without approval from some subset of Quinn, Sam, and Ozzie; they will be auto-pinged. 
+Please work against `develop` branch. **Do not** work against `master`. 
+
+- For rescript code: Quinn and Ozzie are reviewers
+- For js or typescript code: Sam and Ozzie are reviewers
+- For ops code (i.e. yaml, package.json): Quinn and Sam are reviewers
+
+Autopings are set up: if you are not autopinged, you are welcome to comment, but please do not use the formal review feature, send approvals, rejections, or merges.
 
 # Code Quality
 - Aim for at least 8/10* quality in ``/packages/squiggle-lang``, and 7/10 quality in ``/packages/components``. 

packages/components/package.json

@@ -75,7 +75,7 @@
     "@storybook/preset-create-react-app": "^4.1.0",
     "@storybook/react": "^6.4.20",
     "@types/styled-components": "^5.1.24",
-    "@types/webpack": "^4.41.32",
+    "@types/webpack": "^5.28.0",
     "react-codejar": "^1.1.2",
     "style-loader": "^3.3.1",
     "ts-loader": "^9.2.8",

yarn.lock

@@ -4142,7 +4142,7 @@
     "@types/source-list-map" "*"
     source-map "^0.7.3"
 
-"@types/webpack@^4.41.26", "@types/webpack@^4.41.32", "@types/webpack@^4.41.8":
+"@types/webpack@^4.41.26", "@types/webpack@^4.41.8":
   version "4.41.32"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.32.tgz#a7bab03b72904070162b2f169415492209e94212"
   integrity sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==
@@ -4154,6 +4154,15 @@
     anymatch "^3.0.0"
     source-map "^0.6.0"
 
+"@types/webpack@^5.28.0":
+  version "5.28.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03"
+  integrity sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==
+  dependencies:
+    "@types/node" "*"
+    tapable "^2.2.0"
+    webpack "^5"
+
 "@types/ws@^8.5.1":
   version "8.5.3"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d"
@@ -17499,7 +17508,7 @@ webpack@4:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-webpack@^5.64.4, webpack@^5.70.0, webpack@^5.72.0, webpack@^5.9.0:
+webpack@^5, webpack@^5.64.4, webpack@^5.70.0, webpack@^5.72.0, webpack@^5.9.0:
   version "5.72.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28"
   integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==