From c1e67066aa9f9fdad324d9fe7e750470935be2b2 Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Fri, 7 Oct 2022 01:38:38 +0400 Subject: [PATCH 1/5] vercel.json configs --- packages/components/vercel.json | 6 ++++++ packages/website/vercel.json | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/components/vercel.json create mode 100644 packages/website/vercel.json diff --git a/packages/components/vercel.json b/packages/components/vercel.json new file mode 100644 index 00000000..1eec6c55 --- /dev/null +++ b/packages/components/vercel.json @@ -0,0 +1,6 @@ +{ + "buildCommand": "cd ../squiggle-lang && yarn build && cd ../components && yarn build", + "outputDirectory": "storybook-static", + "installCommand": "cd ../../ && yarn", + "ignoreCommand": "node -e 'process.exitCode = process.env.VERCEL_GIT_COMMIT_REF.includes(\"dependabot\") ? 0 : 1' && git diff --quiet $VERCEL_GIT_PREVIOUS_SHA $VERCEL_GIT_COMMIT_SHA . ../squiggle-lang" +} diff --git a/packages/website/vercel.json b/packages/website/vercel.json new file mode 100644 index 00000000..0350ebe1 --- /dev/null +++ b/packages/website/vercel.json @@ -0,0 +1,6 @@ +{ + "buildCommand": "cd ../squiggle-lang && yarn build && cd ../components && yarn build && cd ../website && yarn build", + "framework": "docusaurus-2", + "installCommand": "cd ../../ && yarn", + "ignoreCommand": "node -e 'process.exitCode = process.env.VERCEL_GIT_COMMIT_REF.includes(\"dependabot\") ? 0 : 1' && git diff --quiet $VERCEL_GIT_PREVIOUS_SHA $VERCEL_GIT_COMMIT_SHA ../squiggle-lang ../components ." +} From 9107b241f5089c8d0fc2542c2ac32b2aee2542ff Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Fri, 7 Oct 2022 02:09:30 +0400 Subject: [PATCH 2/5] replace netlify with vercel; update CONTRIBUTING.md --- .github/CODEOWNERS | 2 +- CONTRIBUTING.md | 8 ++++---- README.md | 8 ++++---- packages/components/netlify.toml | 8 -------- .../__tests__/Distributions/Invariants/Means_test.res | 2 +- packages/website/docs/Guides/Functions.mdx | 2 +- packages/website/docs/Integrations.md | 2 +- packages/website/docs/Overview.mdx | 2 +- packages/website/netlify.toml | 8 -------- 9 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 packages/components/netlify.toml delete mode 100644 packages/website/netlify.toml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7d618d44..13234dce 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -24,7 +24,7 @@ *.json @quinn-dougherty @Hazelfire @berekuk @OAGr *.y*ml @quinn-dougherty @berekuk @OAGr *.config.js @Hazelfire @berekuk @OAGr -netlify.toml @quinn-dougherty @OAGr @berekuk @Hazelfire +vercel.json @OAGr @berekuk @Hazelfire # Documentation *.md @quinn-dougherty @OAGr @Hazelfire diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8a3b026a..452fb0c2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ Squiggle is currently pre-alpha. # Bug reports -Anyone (with a github account) can file an issue at any time. Please allow Quinn, Sam, and Ozzie to triage, but otherwise just follow the suggestions in the issue templates. +Anyone (with a github account) can file an issue at any time. Please allow Slava, Sam, and Ozzie to triage, but otherwise just follow the suggestions in the issue templates. # Project structure @@ -28,7 +28,7 @@ Squiggle is a **monorepo** with three **packages**. # Deployment ops -We use netlify, and it should only concern Quinn, Sam, and Ozzie. +We use Vercel, and it should only concern Slava, Sam, and Ozzie. # Development environment, building, testing, dev server @@ -56,9 +56,9 @@ If you absolutely must, please prefix your commit message with `hotfix: `. Please work against `develop` branch. **Do not** work against `master`. -- For rescript code: Quinn and Ozzie are reviewers +- For rescript code: Slava 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 +- For ops code (i.e. yaml, package.json): Slava 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. diff --git a/README.md b/README.md index e182f539..9b80cf33 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,10 @@ _An estimation language_. ## Our deployments -- **website/docs prod**: https://squiggle-language.com [![Netlify Status](https://api.netlify.com/api/v1/badges/2139af5c-671d-473d-a9f6-66c96077d8a1/deploy-status)](https://app.netlify.com/sites/squiggle-documentation/deploys) -- **website/docs staging**: https://develop--squiggle-documentation.netlify.app/ -- **components storybook prod**: https://squiggle-components.netlify.app/ [![Netlify Status](https://api.netlify.com/api/v1/badges/b7f724aa-6b20-4d0e-bf86-3fcd1a3e9a70/deploy-status)](https://app.netlify.com/sites/squiggle-components/deploys) -- **components storybook staging**: https://develop--squiggle-components.netlify.app/ +- **website/docs prod**: https://squiggle-language.com +- **website/docs staging**: https://preview.squiggle-language.com +- **components storybook prod**: https://components.squiggle-language.com +- **components storybook staging**: https://preview-components.squiggle-language.com - **legacy (2020) playground**: https://playground.squiggle-language.com ## Packages diff --git a/packages/components/netlify.toml b/packages/components/netlify.toml deleted file mode 100644 index d6e5474d..00000000 --- a/packages/components/netlify.toml +++ /dev/null @@ -1,8 +0,0 @@ -[build] - base = "packages/components/" - command = "cd ../squiggle-lang && yarn build && cd ../components && yarn build" - publish = "storybook-static/" - ignore = "node -e 'process.exitCode = process.env.BRANCH.includes(\"dependabot\") ? 0 : 1' && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../squiggle-lang" - -[build.environment] - NETLIFY_USE_YARN = "true" diff --git a/packages/squiggle-lang/__tests__/Distributions/Invariants/Means_test.res b/packages/squiggle-lang/__tests__/Distributions/Invariants/Means_test.res index 99e3e5a3..84cf3ee5 100644 --- a/packages/squiggle-lang/__tests__/Distributions/Invariants/Means_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/Invariants/Means_test.res @@ -3,7 +3,7 @@ This is the most basic file in our invariants family of tests. Validate that the addition of means equals the mean of the addition, similar for subtraction and multiplication. -Details in https://develop--squiggle-documentation.netlify.app/docs/internal/invariants/ +Details in https://squiggle-language.com/docs/internal/invariants/ Note: epsilon of 1e3 means the invariants are, in general, not being satisfied. */ diff --git a/packages/website/docs/Guides/Functions.mdx b/packages/website/docs/Guides/Functions.mdx index 98208954..192abb70 100644 --- a/packages/website/docs/Guides/Functions.mdx +++ b/packages/website/docs/Guides/Functions.mdx @@ -181,7 +181,7 @@ The `sample(distribution)` samples a given distribution. ## Converting between distribution formats -Recall the [three formats of distributions](https://develop--squiggle-documentation.netlify.app/docs/Discussions/Three-Types-Of-Distributions). We can force any distribution into `SampleSet` format +Recall the [three formats of distributions](/docs/Discussions/Three-Types-Of-Distributions). We can force any distribution into `SampleSet` format diff --git a/packages/website/docs/Integrations.md b/packages/website/docs/Integrations.md index d10a7e9a..3a0242b6 100644 --- a/packages/website/docs/Integrations.md +++ b/packages/website/docs/Integrations.md @@ -22,7 +22,7 @@ Types are available for both packages. This documentation uses `@quri/squiggle-components` frequently. -We host [a storybook](https://squiggle-components.netlify.app/) with details +We host [a storybook](https://components.squiggle-language.com) with details and usage of each of the components made available. ## [Visual Studio Code Extension](https://marketplace.visualstudio.com/items?itemName=QURI.vscode-squiggle) ![npm version](https://vsmarketplacebadge.apphb.com/version/QURI.vscode-squiggle.svg) diff --git a/packages/website/docs/Overview.mdx b/packages/website/docs/Overview.mdx index d00ef749..c71b64db 100644 --- a/packages/website/docs/Overview.mdx +++ b/packages/website/docs/Overview.mdx @@ -75,7 +75,7 @@ There's a simple [VS Code extension](https://marketplace.visualstudio.com/items? Squiggle is built using [Rescript](https://rescript-lang.org/), and is accessible via a simple Typescript library. You can use this library to either run Squiggle code in full, or to call select specific functions within Squiggle (though this latter functionality is very minimal). **[React Components Library](https://www.npmjs.com/package/@quri/squiggle-components)** -All of the components used in the playground and documentation are available in a separate component NPM repo. You can see the full Storybook of components [here](https://squiggle-components.netlify.app). +All of the components used in the playground and documentation are available in a separate component NPM repo. You can see the full Storybook of components [here](https://components.squiggle-language.com). **[Observable](https://observablehq.com/@hazelfire/squiggle)** You can use Squiggle Components in Observable notebooks. Sam Nolan put together an exportable [Observable Notebook](https://observablehq.com/@hazelfire/squiggle) of the key components that you can directly import and use in your Observable notebooks. diff --git a/packages/website/netlify.toml b/packages/website/netlify.toml deleted file mode 100644 index cb064992..00000000 --- a/packages/website/netlify.toml +++ /dev/null @@ -1,8 +0,0 @@ -[build] - base = "packages/website/" - command = "cd ../squiggle-lang && yarn build && cd ../components && yarn build && cd ../website && yarn build" - publish = "build/" - ignore = "node -e 'process.exitCode = process.env.BRANCH.includes(\"dependabot\") ? 0 : 1' && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../" - -[build.environment] - NETLIFY_USE_YARN = "true" From 0ab03eca96a41778f51da62944c1a6024b74cfb3 Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Fri, 7 Oct 2022 02:20:33 +0400 Subject: [PATCH 3/5] fix broken link in docs --- packages/website/docs/Guides/Functions.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/docs/Guides/Functions.mdx b/packages/website/docs/Guides/Functions.mdx index 192abb70..5e62125f 100644 --- a/packages/website/docs/Guides/Functions.mdx +++ b/packages/website/docs/Guides/Functions.mdx @@ -181,7 +181,7 @@ The `sample(distribution)` samples a given distribution. ## Converting between distribution formats -Recall the [three formats of distributions](/docs/Discussions/Three-Types-Of-Distributions). We can force any distribution into `SampleSet` format +Recall the [three formats of distributions](/docs/Discussions/Three-Formats-Of-Distributions). We can force any distribution into `SampleSet` format From 4efd2c9e05546fc84080da7a32b7d89f02709df5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Fri, 7 Oct 2022 02:47:43 +0400 Subject: [PATCH 4/5] remove special dependabot case from ignoreCommand --- packages/components/vercel.json | 2 +- packages/website/vercel.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/vercel.json b/packages/components/vercel.json index 1eec6c55..71e5c36c 100644 --- a/packages/components/vercel.json +++ b/packages/components/vercel.json @@ -2,5 +2,5 @@ "buildCommand": "cd ../squiggle-lang && yarn build && cd ../components && yarn build", "outputDirectory": "storybook-static", "installCommand": "cd ../../ && yarn", - "ignoreCommand": "node -e 'process.exitCode = process.env.VERCEL_GIT_COMMIT_REF.includes(\"dependabot\") ? 0 : 1' && git diff --quiet $VERCEL_GIT_PREVIOUS_SHA $VERCEL_GIT_COMMIT_SHA . ../squiggle-lang" + "ignoreCommand": "git diff --quiet $VERCEL_GIT_PREVIOUS_SHA $VERCEL_GIT_COMMIT_SHA . ../squiggle-lang" } diff --git a/packages/website/vercel.json b/packages/website/vercel.json index 0350ebe1..4efc99fd 100644 --- a/packages/website/vercel.json +++ b/packages/website/vercel.json @@ -2,5 +2,5 @@ "buildCommand": "cd ../squiggle-lang && yarn build && cd ../components && yarn build && cd ../website && yarn build", "framework": "docusaurus-2", "installCommand": "cd ../../ && yarn", - "ignoreCommand": "node -e 'process.exitCode = process.env.VERCEL_GIT_COMMIT_REF.includes(\"dependabot\") ? 0 : 1' && git diff --quiet $VERCEL_GIT_PREVIOUS_SHA $VERCEL_GIT_COMMIT_SHA ../squiggle-lang ../components ." + "ignoreCommand": "git diff --quiet $VERCEL_GIT_PREVIOUS_SHA $VERCEL_GIT_COMMIT_SHA ../squiggle-lang ../components ." } From d6a48d9cb9ba9d0fdfe525e5c3c7187cdd3422f8 Mon Sep 17 00:00:00 2001 From: Vyacheslav Matyukhin Date: Fri, 7 Oct 2022 16:23:28 +0400 Subject: [PATCH 5/5] disable ignoreCommand in vercel.json for now --- packages/components/vercel.json | 3 +-- packages/website/vercel.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/components/vercel.json b/packages/components/vercel.json index 71e5c36c..24616e47 100644 --- a/packages/components/vercel.json +++ b/packages/components/vercel.json @@ -1,6 +1,5 @@ { "buildCommand": "cd ../squiggle-lang && yarn build && cd ../components && yarn build", "outputDirectory": "storybook-static", - "installCommand": "cd ../../ && yarn", - "ignoreCommand": "git diff --quiet $VERCEL_GIT_PREVIOUS_SHA $VERCEL_GIT_COMMIT_SHA . ../squiggle-lang" + "installCommand": "cd ../../ && yarn" } diff --git a/packages/website/vercel.json b/packages/website/vercel.json index 4efc99fd..7f920065 100644 --- a/packages/website/vercel.json +++ b/packages/website/vercel.json @@ -1,6 +1,5 @@ { "buildCommand": "cd ../squiggle-lang && yarn build && cd ../components && yarn build && cd ../website && yarn build", "framework": "docusaurus-2", - "installCommand": "cd ../../ && yarn", - "ignoreCommand": "git diff --quiet $VERCEL_GIT_PREVIOUS_SHA $VERCEL_GIT_COMMIT_SHA ../squiggle-lang ../components ." + "installCommand": "cd ../../ && yarn" }