diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ca57d333..27cfbc62 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -24,6 +24,7 @@ *.json @quinn-dougherty @Hazelfire @OAGr *.y*ml @quinn-dougherty @OAGr *.config.js @Hazelfire @OAGr +netlify.toml @quinn-dougherty @OAGr @Hazelfire # Documentation *.md @quinn-dougherty @OAGr @Hazelfire diff --git a/.github/ISSUE_TEMPLATE/ops-testing.md b/.github/ISSUE_TEMPLATE/ops-testing.md index 1edb148b..96ca08f3 100644 --- a/.github/ISSUE_TEMPLATE/ops-testing.md +++ b/.github/ISSUE_TEMPLATE/ops-testing.md @@ -6,7 +6,6 @@ labels: "ops & testing" # Description: - # The OS and version, yarn version, etc. in which this came up diff --git a/README.md b/README.md index d1b85bb6..108720fc 100644 --- a/README.md +++ b/README.md @@ -42,17 +42,6 @@ yarn See `packages/*/README.md` to work with whatever project you're interested in. -## `codium` for `rescript` - -If you have `nix` installed with `flakes` enabled, you can build a `codium` in this repo for `rescript` development, if you don't want to pollute your machine's global editor with another mode/extension. - -```sh -nix develop -codium -``` - -The `nix develop` shell also provides `yarn`. - # Contributing See `CONTRIBUTING.md`. diff --git a/flake-compat.nix b/flake-compat.nix deleted file mode 100644 index dab420bb..00000000 --- a/flake-compat.nix +++ /dev/null @@ -1,9 +0,0 @@ -let - lock = builtins.fromJSON (builtins.readFile ./flake.lock); - inherit (lock.nodes.flake-compat.locked) owner repo rev narHash; - flake-compat = builtins.fetchTarball { - url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; - sha256 = narHash; - }; -in -import flake-compat { src = ./.; } diff --git a/flake.lock b/flake.lock deleted file mode 100644 index ee618311..00000000 --- a/flake.lock +++ /dev/null @@ -1,44 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1647893727, - "narHash": "sha256-pOi7VdCb+s5Cwh5CS7YEZVRgH9uCmE87J5W7iXv29Ck=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1ec61dd4167f04be8d05c45780818826132eea0d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index d39ba79a..00000000 --- a/flake.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - description = "Building codium for rescript development"; - - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; - }; - - outputs = - { self - , nixpkgs - , flake-compat - }: - let - # Generate a user-friendly version number. - version = builtins.substring 0 8 self.lastModifiedDate; - # System types to support. - supportedSystems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; - # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. - forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - # Nixpkgs instantiated for supported system types. - nixpkgsFor = forAllSystems (system: - import nixpkgs { - inherit system; - overlays = [ self.overlay ]; - }); - in - { - overlay = final: prev: { }; - # the default devShell used when running `nix develop` - devShell = forAllSystems (system: self.devShells.${system}.defaultShell); - devShells = forAllSystems (system: - let - pkgs = nixpkgsFor."${system}"; - in - { - # In case we don't want to provide an editor, this defaultShell will provide only coq packages we need. - defaultShell = pkgs.mkShell { - buildInputs = with pkgs; [ - yarn - yarn2nix - nodePackages.npm - nodejs - patchelf - (pkgs.vscode-with-extensions.override { - vscode = pkgs.vscodium; - vscodeExtensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "rescript-vscode"; - publisher = "chenglou92"; - version = "1.2.1"; - sha256 = "sha256-7/YakKtJ4WhgAR4rZltrq8g4TtM5QZ2spbrEUrNoXVg="; - } - { - name = "vim"; - publisher = "vscodevim"; - version = "1.22.2"; - sha256 = "sha256-dtIlgODzRdoMKnG9050ZcCX3w15A/R3FaMc+ZylvBbU="; - } - { - name = "vscode-typescript-next"; - publisher = "ms-vscode"; - version = "4.7.20220323"; - sha256 = "sha256-mjiBCyg5As/XAU9I5k6jEZWGJA3P6P5o1roe2bS7aUI="; - } - { - name = "nix-ide"; - publisher = "jnoortheen"; - version = "0.1.20"; - sha256 = "sha256-Q6X41I68m0jaCXaQGEFOoAbSUrr/wFhfCH5KrduOtZo="; - } - { - name = "json"; - publisher = "ZainChen"; - version = "2.0.2"; - sha256 = "sha256-nC3Q8KuCtn/jg1j/NaAxWGvnKe/ykrPm2PUjfsJz8aI="; - } - { - name = "prettier-vscode"; - publisher = "esbenp"; - version = "9.3.0"; - sha256 = "sha256-hJgPjWf7a8+ltjmXTK8U/MwqgIZqBjmcCfHsAk2G3PA="; - } - ]; - }) - ]; - }; - } - ); - }; -} diff --git a/packages/components/netlify.toml b/packages/components/netlify.toml new file mode 100644 index 00000000..33f923b9 --- /dev/null +++ b/packages/components/netlify.toml @@ -0,0 +1,8 @@ +[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' && gt diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../squiggle-lang" + +[build.environment] + NETLIFY_USE_YARN = "true" \ No newline at end of file diff --git a/packages/website/netlify.toml b/packages/website/netlify.toml new file mode 100644 index 00000000..fce0febf --- /dev/null +++ b/packages/website/netlify.toml @@ -0,0 +1,8 @@ +[build] + base = "packages/website/" + command = "cd ../squiggle-lang && yarn build && cd ../website && yarn build" + publish = "build/" + ignore = "node -e 'process.exitCode = process.env.BRANCH.includes(\"dependabot\") ? 0 : 1' && gt diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../" + +[build.environment] + NETLIFY_USE_YARN = "true" \ No newline at end of file