Skip to content

Commit 555d890

Browse files
committed
refactor: organize project
1 parent 4cdee48 commit 555d890

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1114
-221
lines changed

Cargo.lock

+12-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
[dependencies]
2-
atty = "*"
3-
clap = { version = "*", features = ["cargo"] }
4-
indoc = "*"
5-
rand = "*"
6-
rayon = "*"
7-
rnix = "*"
8-
termion = "*"
9-
tui = { version = "*", default-features = false, features = ["termion"] }
10-
rowan = "0.12.6" # follows rnix
11-
walkdir = "*"
12-
13-
[package]
14-
authors = ["Kevin Amado <[email protected]>"]
15-
description = "The Uncompromising Nix Code Formatter"
16-
edition = "2021"
17-
name = "alejandra"
18-
repository = "https://github.com/kamadorueda/alejandra"
19-
version = "0.3.1"
1+
[workspace]
2+
members = ["src/*"]

buildkite.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ steps:
7474
- echo +++ Derivations count
7575
- grep -c drvPath= closure-after.txt
7676

77-
- label: flake check
78-
command:
79-
- echo +++
80-
- nix flake check
81-
8277
- label: lint
8378
if: build.branch != "main"
8479
command:
@@ -87,3 +82,8 @@ steps:
8782
- eval "$(direnv export bash)"
8883
- echo +++ Run Linter
8984
- cargo clippy
85+
86+
- label: flake check
87+
command:
88+
- echo +++
89+
- nix flake check

flake.nix

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
cargo-bloat
104104
cargo-license
105105
cargo-tarpaulin
106+
clippy
106107
jq
107108
nodejs
108109
nodePackages.prettier

front/Cargo.lock

+8-162
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

front/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[dependencies]
2-
alejandra = { "path" = "../." }
2+
alejandra_engine = { "path" = "../src/alejandra_engine" }
33
console_error_panic_hook = "*"
44
getrandom = { version = "*", features = ["js"] }
55
wasm-bindgen = "*"
@@ -12,6 +12,8 @@ crate-type = ["cdylib"]
1212
authors = ["Kevin Amado <[email protected]>"]
1313
description = "The Uncompromising Nix Code Formatter"
1414
edition = "2021"
15-
name = "alejandra-front"
15+
name = "alejandra_front"
1616
repository = "https://github.com/kamadorueda/alejandra"
1717
version = "0.3.1"
18+
19+
[workspace]

front/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
]
1313
},
1414
"dependencies": {
15-
"alejandra-front": "file:pkg/",
15+
"alejandra_front": "file:pkg/",
1616
"codemirror": "*",
1717
"react": "*",
1818
"react-codemirror2": "*",

front/serve

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#! /usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
wasm-pack build --target web
6+
rm -rf node_modules/
7+
yarn install
8+
yarn start

front/src/SideBySide.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import react from "react";
22
import ReactDiffViewer from "react-diff-viewer";
3-
import * as wasm from "alejandra-front";
3+
import * as wasm from "alejandra_front";
44
import { Editor } from "./Editor";
55
import { get, randomPath } from "./nixpkgs";
66

0 commit comments

Comments
 (0)