Skip to content

Commit f2034a4

Browse files
committed
fix(prettier-markdown): use nix to install prettier
1 parent afa7736 commit f2034a4

File tree

12 files changed

+608
-56
lines changed

12 files changed

+608
-56
lines changed

prettier-json/info.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
overrides: prettier
33
name: prettier-json
4-
command:
5-
- /app/node_modules/.bin/prettier
6-
- "--write"
74
include:
85
- "**/*.json"
96
documentation:

prettier-markdown/info.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
overrides: prettier
33
name: prettier-markdown
4-
command:
5-
- /app/node_modules/.bin/prettier
6-
- "--write"
74
include:
85
- "**/*.md"
96
- "**/*.markdown"

prettier-yaml/info.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
overrides: prettier
33
name: prettier-yaml
4-
command:
5-
- /app/node_modules/.bin/prettier
6-
- "--write"
74
include:
85
- "**/*.yml"
96
- "**/*.yaml"

prettier/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/restyler-prettier/node_modules

prettier/Dockerfile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
FROM node:22.21-slim
1+
FROM nixos/nix:2.32.1
22
LABEL maintainer="Pat Brisbin <[email protected]>"
3-
ENV LANG en_US.UTF-8
4-
RUN mkdir -p /app
5-
WORKDIR /app
6-
COPY package.json .
7-
RUN yarn install && yarn cache clean
8-
COPY install.sh /tmp
9-
RUN /tmp/install.sh
10-
RUN mkdir -p /code
3+
RUN echo "experimental-features = nix-command flakes" > /etc/nix/nix.conf
4+
5+
RUN mkdir /restyler-prettier
6+
COPY restyler-prettier /restyler-prettier
7+
RUN nix profile install '/restyler-prettier'
8+
9+
RUN mkdir /code
1110
WORKDIR /code
12-
ENTRYPOINT []
13-
CMD ["prettier", "--help"]
11+
CMD ["restyler-prettier", "--help"]

prettier/info.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
enabled: true
33
name: prettier
44
version_cmd: |
5-
prettier --version | sed 's/^/v/; s/$/-3/'
5+
restyler-prettier version
66
command:
7-
- prettier
8-
- "--write"
7+
- restyler-prettier
98
include:
109
- "**/*.js"
1110
- "**/*.jsx"

prettier/install.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

prettier/restyler-prettier/flake.lock

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
inputs = {
3+
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
4+
};
5+
6+
outputs =
7+
inputs:
8+
let
9+
system = "x86_64-linux";
10+
pkgs = inputs.nixpkgs.legacyPackages.${system};
11+
inherit (pkgs)
12+
busybox
13+
gnused
14+
importNpmLock
15+
lib
16+
nodejs
17+
writeShellScriptBin
18+
;
19+
inherit (builtins) readFile toString;
20+
21+
# https://nixos.org/manual/nixpkgs/stable/#javascript-buildNpmPackage-importNpmLock.buildNodeModules
22+
node_modules = importNpmLock.buildNodeModules {
23+
npmRoot = ./.;
24+
inherit nodejs;
25+
};
26+
27+
in
28+
{
29+
packages.${system} = {
30+
default = inputs.self.packages.${system}.restyler-prettier;
31+
32+
restyler-prettier = writeShellScriptBin "restyler-prettier" ''
33+
34+
case "$1" in
35+
help)
36+
cat ${./help}
37+
;;
38+
version)
39+
cd ${node_modules}
40+
${nodejs}/bin/node node_modules/.bin/prettier --version | ${gnused}/bin/sed 's/^/v/; s/$/-3/'
41+
;;
42+
--)
43+
targets=( $(${busybox}/bin/realpath "''\${@:2}") )
44+
cd ${node_modules}
45+
${nodejs}/bin/node node_modules/.bin/prettier --write -- "''\${targets[@]}"
46+
;;
47+
*)
48+
cat ${./help}
49+
exit 1
50+
;;
51+
esac
52+
'';
53+
};
54+
55+
checks.${system} = {
56+
inherit (inputs.self.packages.${system}) restyler-prettier;
57+
};
58+
};
59+
}

prettier/restyler-prettier/help

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Usage:
2+
restyler-prettier help
3+
restyler-prettier version
4+
restyler-prettier -- [file1] [file2] ...

0 commit comments

Comments
 (0)