Skip to content

refactor: organize project #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 2 additions & 19 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,2 @@
[dependencies]
atty = "*"
clap = { version = "*", features = ["cargo"] }
indoc = "*"
rand = "*"
rayon = "*"
rnix = "*"
termion = "*"
tui = { version = "*", default-features = false, features = ["termion"] }
rowan = "0.12.6" # follows rnix
walkdir = "*"

[package]
authors = ["Kevin Amado <[email protected]>"]
description = "The Uncompromising Nix Code Formatter"
edition = "2021"
name = "alejandra"
repository = "https://github.com/kamadorueda/alejandra"
version = "0.3.1"
[workspace]
members = ["src/*"]
10 changes: 5 additions & 5 deletions buildkite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ steps:
- echo +++ Derivations count
- grep -c drvPath= closure-after.txt

- label: flake check
command:
- echo +++
- nix flake check

- label: lint
if: build.branch != "main"
command:
Expand All @@ -87,3 +82,8 @@ steps:
- eval "$(direnv export bash)"
- echo +++ Run Linter
- cargo clippy

- label: flake check
command:
- echo +++
- nix flake check
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
cargo-bloat
cargo-license
cargo-tarpaulin
clippy
jq
nodejs
nodePackages.prettier
Expand Down
170 changes: 8 additions & 162 deletions front/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions front/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[dependencies]
alejandra = { "path" = "../." }
alejandra_engine = { "path" = "../src/alejandra_engine" }
console_error_panic_hook = "*"
getrandom = { version = "*", features = ["js"] }
wasm-bindgen = "*"
Expand All @@ -12,6 +12,8 @@ crate-type = ["cdylib"]
authors = ["Kevin Amado <[email protected]>"]
description = "The Uncompromising Nix Code Formatter"
edition = "2021"
name = "alejandra-front"
name = "alejandra_front"
repository = "https://github.com/kamadorueda/alejandra"
version = "0.3.1"

[workspace]
2 changes: 1 addition & 1 deletion front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
]
},
"dependencies": {
"alejandra-front": "file:pkg/",
"alejandra_front": "file:pkg/",
"codemirror": "*",
"react": "*",
"react-codemirror2": "*",
Expand Down
8 changes: 8 additions & 0 deletions front/serve
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#! /usr/bin/env bash

set -euo pipefail

wasm-pack build --target web
rm -rf node_modules/
yarn install
yarn start
2 changes: 1 addition & 1 deletion front/src/SideBySide.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import react from "react";
import ReactDiffViewer from "react-diff-viewer";
import * as wasm from "alejandra-front";
import * as wasm from "alejandra_front";
import { Editor } from "./Editor";
import { get, randomPath } from "./nixpkgs";

Expand Down
Loading