From 7a160ad4450b2b81c6bb1438bc2a925b5b953504 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 10:40:56 +0000 Subject: [PATCH 1/9] Bump @types/webpack from 4.41.32 to 5.28.0 Bumps [@types/webpack](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/webpack) from 4.41.32 to 5.28.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/webpack) --- updated-dependencies: - dependency-name: "@types/webpack" dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 2cef6bee..333b785d 100644 --- a/packages/components/package.json +++ b/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", diff --git a/yarn.lock b/yarn.lock index c7b42e3c..c084a73f 100644 --- a/yarn.lock +++ b/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== From f8fa47e9237042a433dfd7830ce1913599ebca94 Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 12 Apr 2022 09:50:13 -0400 Subject: [PATCH 2/9] hotfix: `working_directory` in prettier action jobs were triggering too much. --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2926ee85..8b679a84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,6 +59,7 @@ jobs: with: dry: true prettier_options: --check . + working_directory: packages/squiggle-lang lang-build-test-bundle: name: Language build, test, and bundle @@ -98,6 +99,7 @@ jobs: with: dry: true prettier_options: --check . + working_directory: packages/components components-bundle-build: name: Components bundle and build @@ -135,6 +137,7 @@ jobs: with: dry: true prettier_options: --check . + working_directory: packages/website website-build: name: Website build From e7e51d9582807b0b6436dbb74764e01b95b0c35d Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 12 Apr 2022 09:54:57 -0400 Subject: [PATCH 3/9] hotfix: debugging workingdirectory --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b679a84..5c1dca23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: with: dry: true prettier_options: --check . - working_directory: packages/squiggle-lang + # working_directory: packages/squiggle-lang lang-build-test-bundle: name: Language build, test, and bundle @@ -91,7 +91,7 @@ jobs: defaults: run: shell: bash - working-directory: packages/components + # working-directory: packages/components steps: - uses: actions/checkout@v2 - name: Check javascript, typescript, and markdown lint @@ -129,7 +129,7 @@ jobs: defaults: run: shell: bash - working-directory: packages/website + # working-directory: packages/website steps: - uses: actions/checkout@v2 - name: Check javascript, typescript, and markdown lint From d45b5f3d72908e56083b7129e3c7ddf30ba87f49 Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 12 Apr 2022 10:03:15 -0400 Subject: [PATCH 4/9] hotfix: working directory in lint jobs https://github.com/creyD/prettier_action/issues/90 --- .github/workflows/ci.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c1dca23..1358c2a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,8 +58,7 @@ jobs: uses: creyD/prettier_action@v4.2 with: dry: true - prettier_options: --check . - # working_directory: packages/squiggle-lang + prettier_options: --check packages/squiggle-lang lang-build-test-bundle: name: Language build, test, and bundle @@ -91,15 +90,14 @@ jobs: defaults: run: shell: bash - # working-directory: packages/components + working-directory: packages/components steps: - uses: actions/checkout@v2 - name: Check javascript, typescript, and markdown lint uses: creyD/prettier_action@v4.2 with: dry: true - prettier_options: --check . - working_directory: packages/components + prettier_options: --check packages/components components-bundle-build: name: Components bundle and build @@ -129,15 +127,14 @@ jobs: defaults: run: shell: bash - # working-directory: packages/website + working-directory: packages/website steps: - uses: actions/checkout@v2 - name: Check javascript, typescript, and markdown lint uses: creyD/prettier_action@v4.2 with: dry: true - prettier_options: --check . - working_directory: packages/website + prettier_options: --check packages/website website-build: name: Website build From 1707ae8d5ebe7b479bf163c5570fcae19fe879ba Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 12 Apr 2022 10:11:15 -0400 Subject: [PATCH 5/9] hotfix: precise version `skip-duplicate-actions` --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1358c2a1..7a17556b 100644 --- a/.github/workflows/ci.yml +++ b/.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/**"]' From 15d1e789cc13b2a3af80f3cd20d862d8d1569eb2 Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 12 Apr 2022 14:57:52 -0400 Subject: [PATCH 6/9] Update CODEOWNERS --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b7dcbd2d..531dec44 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -9,8 +9,8 @@ # This also holds true for GitHub teams. # Rescript -*.res @Hazelfire @OAGr @quinn-dougherty -*.resi @Hazelfire @OAGr @quinn-dougherty +*.res @OAGr @quinn-dougherty +*.resi @OAGr @quinn-dougherty # Typescript *.tsx @Hazelfire @OAGr From 5d8c2bfc966d1b65e26170433b72e9118b642bd7 Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 12 Apr 2022 15:00:47 -0400 Subject: [PATCH 7/9] Update CONTRIBUTING.md --- CONTRIBUTING.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cbd35bd6..155907d8 100644 --- a/CONTRIBUTING.md +++ b/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``. From d9faab26807be24e8740d19e856121ff3f590c0b Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 12 Apr 2022 15:01:22 -0400 Subject: [PATCH 8/9] Update CODEOWNERS --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 531dec44..22ba334f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -21,9 +21,9 @@ # Any opsy files .github/* @quinn-dougherty -*.json @quinn-dougherty @Hazelfire -*.y*ml @quinn-dougherty -*.config.js @Hazelfire +*.json @quinn-dougherty @Hazelfire @OAGr +*.y*ml @quinn-dougherty @OAGr +*.config.js @Hazelfire @OAGr # Documentation *.md @quinn-dougherty @OAGr @Hazelfire From 1092550c897094914ef68dfd649f0969a42ca1ac Mon Sep 17 00:00:00 2001 From: Quinn Date: Tue, 12 Apr 2022 15:18:35 -0400 Subject: [PATCH 9/9] Update CODEOWNERS --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 22ba334f..ca57d333 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -17,10 +17,10 @@ *.ts @Hazelfire @OAGr # Javascript -*.js @Hazelfire +*.js @Hazelfire @OAGr # Any opsy files -.github/* @quinn-dougherty +.github/** @quinn-dougherty @OAGr *.json @quinn-dougherty @Hazelfire @OAGr *.y*ml @quinn-dougherty @OAGr *.config.js @Hazelfire @OAGr