Skip to content

Commit 37684ec

Browse files
author
William Luke
committed
add prettier and husky
1 parent b2c9e6c commit 37684ec

File tree

9 files changed

+387
-68
lines changed

9 files changed

+387
-68
lines changed

Diff for: .github/workflows/publish-engines.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v2
15-
15+
1616
- uses: actions/setup-node@v2
1717
with:
1818
node-version: '12'
19-
19+
2020
- run: bash .github/workflows/setup.sh
2121
env:
2222
CI: true
2323
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
24-
24+
2525
- run: pnpm run publish-all
2626
env:
2727
CI: true
2828
GITHUB_EVENT_CLIENT_PAYLOAD: ${{ toJson(github.event.client_payload) }}
29-
29+
3030
- uses: stefanzweifel/git-auto-commit-action@v4
3131
with:
3232
# Optional but recommended, defaults to "Apply automatic changes"

Diff for: .prettierrc.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tabWidth: 2
2+
trailingComma: all
3+
singleQuote: true
4+
semi: false
5+
printWidth: 80

Diff for: package.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
"arg": "^4.1.3",
1111
"chalk": "^4.1.0",
1212
"execa": "^4.0.3",
13+
"husky": "4.3.8",
1314
"node-fetch": "^2.6.1",
15+
"prettier": "^2.2.1",
1416
"ts-node": "^9.0.0",
1517
"typescript": "^4.0.3"
1618
},
1719
"scripts": {
20+
"format": "prettier --ignore-path .gitignore --write .",
1821
"publish-all": "ts-node scripts/publish.ts",
1922
"dry": "ts-node scripts/publish.ts --dry"
2023
},
@@ -26,5 +29,11 @@
2629
"url": "https://github.com/prisma/engines-wrapper/issues"
2730
},
2831
"homepage": "https://github.com/prisma/engines-wrapper#readme",
29-
"dependencies": {}
32+
"dependencies": {
33+
},
34+
"husky": {
35+
"hooks": {
36+
"pre-commit": "pnpm format"
37+
}
38+
}
3039
}

Diff for: packages/engines-version/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
export const enginesVersion: string = require('./package.json').prisma.enginesVersion
1+
export const enginesVersion: string = require('./package.json').prisma
2+
.enginesVersion

Diff for: packages/engines-version/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
"noImplicitAny": false,
1010
"declaration": true,
1111
"incremental": true
12-
},
12+
}
1313
}

Diff for: packages/engines/src/index.ts

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
import { enginesVersion } from "@prisma/engines-version";
2-
import { download } from "@prisma/fetch-engine";
3-
import path from "path";
1+
import { enginesVersion } from '@prisma/engines-version'
2+
import { download } from '@prisma/fetch-engine'
3+
import path from 'path'
44

55
export function getEnginesPath() {
6-
return path.join(__dirname, "../");
6+
return path.join(__dirname, '../')
77
}
88

99
export async function ensureBinariesExist() {
10-
const binaryDir = path.join(__dirname, "../");
11-
let binaryTargets = undefined;
10+
const binaryDir = path.join(__dirname, '../')
11+
let binaryTargets = undefined
1212
if (process.env.PRISMA_CLI_BINARY_TARGETS) {
13-
binaryTargets = process.env.PRISMA_CLI_BINARY_TARGETS.split(",");
13+
binaryTargets = process.env.PRISMA_CLI_BINARY_TARGETS.split(',')
1414
}
1515
await download({
1616
binaries: {
17-
"query-engine": binaryDir,
18-
"migration-engine": binaryDir,
19-
"introspection-engine": binaryDir,
20-
"prisma-fmt": binaryDir,
17+
'query-engine': binaryDir,
18+
'migration-engine': binaryDir,
19+
'introspection-engine': binaryDir,
20+
'prisma-fmt': binaryDir,
2121
},
2222
showProgress: true,
2323
version: enginesVersion,
2424
failSilent: false,
2525
binaryTargets,
26-
});
26+
})
2727
}
2828

29-
export { enginesVersion } from "@prisma/engines-version";
29+
export { enginesVersion } from '@prisma/engines-version'
3030

3131
/**
3232
* This annotation is used for `node-file-trace`
@@ -35,33 +35,33 @@ export { enginesVersion } from "@prisma/engines-version";
3535
* And needed for https://github.com/vercel/pkg#detecting-assets-in-source-code
3636
*/
3737

38-
path.join(__dirname, "../query-engine-darwin");
39-
path.join(__dirname, "../introspection-engine-darwin");
40-
path.join(__dirname, "../prisma-fmt-darwin");
38+
path.join(__dirname, '../query-engine-darwin')
39+
path.join(__dirname, '../introspection-engine-darwin')
40+
path.join(__dirname, '../prisma-fmt-darwin')
4141

42-
path.join(__dirname, "../query-engine-debian-openssl-1.0.x");
43-
path.join(__dirname, "../introspection-engine-debian-openssl-1.0.x");
44-
path.join(__dirname, "../prisma-fmt-debian-openssl-1.0.x");
42+
path.join(__dirname, '../query-engine-debian-openssl-1.0.x')
43+
path.join(__dirname, '../introspection-engine-debian-openssl-1.0.x')
44+
path.join(__dirname, '../prisma-fmt-debian-openssl-1.0.x')
4545

46-
path.join(__dirname, "../query-engine-debian-openssl-1.1.x");
47-
path.join(__dirname, "../introspection-engine-debian-openssl-1.1.x");
48-
path.join(__dirname, "../prisma-fmt-debian-openssl-1.1.x");
46+
path.join(__dirname, '../query-engine-debian-openssl-1.1.x')
47+
path.join(__dirname, '../introspection-engine-debian-openssl-1.1.x')
48+
path.join(__dirname, '../prisma-fmt-debian-openssl-1.1.x')
4949

50-
path.join(__dirname, "../query-engine-rhel-openssl-1.0.x");
51-
path.join(__dirname, "../introspection-engine-rhel-openssl-1.0.x");
52-
path.join(__dirname, "../prisma-fmt-rhel-openssl-1.0.x");
50+
path.join(__dirname, '../query-engine-rhel-openssl-1.0.x')
51+
path.join(__dirname, '../introspection-engine-rhel-openssl-1.0.x')
52+
path.join(__dirname, '../prisma-fmt-rhel-openssl-1.0.x')
5353

54-
path.join(__dirname, "../query-engine-rhel-openssl-1.1.x");
55-
path.join(__dirname, "../introspection-engine-rhel-openssl-1.1.x");
56-
path.join(__dirname, "../prisma-fmt-rhel-openssl-1.1.x");
54+
path.join(__dirname, '../query-engine-rhel-openssl-1.1.x')
55+
path.join(__dirname, '../introspection-engine-rhel-openssl-1.1.x')
56+
path.join(__dirname, '../prisma-fmt-rhel-openssl-1.1.x')
5757

5858
// NAPI
59-
path.join(__dirname, "../libquery_engine_napi-darwin.dylib.node");
60-
path.join(__dirname, "../libquery_engine_napi-debian-openssl-1.0.x.so.node");
61-
path.join(__dirname, "../libquery_engine_napi-debian-openssl-1.1.x.so.node");
62-
path.join(__dirname, "../libquery_engine_napi-linux-arm-openssl-1.0.x.so.node");
63-
path.join(__dirname, "../libquery_engine_napi-linux-arm-openssl-1.1.x.so.node");
64-
path.join(__dirname, "../libquery_engine_napi-linux-musl.so.node");
65-
path.join(__dirname, "../libquery_engine_napi-rhel-openssl-1.0.x.so.node");
66-
path.join(__dirname, "../libquery_engine_napi-rhel-openssl-1.1.x.so.node");
67-
path.join(__dirname, "../query_engine_napi-windows.dll.node");
59+
path.join(__dirname, '../libquery_engine_napi-darwin.dylib.node')
60+
path.join(__dirname, '../libquery_engine_napi-debian-openssl-1.0.x.so.node')
61+
path.join(__dirname, '../libquery_engine_napi-debian-openssl-1.1.x.so.node')
62+
path.join(__dirname, '../libquery_engine_napi-linux-arm-openssl-1.0.x.so.node')
63+
path.join(__dirname, '../libquery_engine_napi-linux-arm-openssl-1.1.x.so.node')
64+
path.join(__dirname, '../libquery_engine_napi-linux-musl.so.node')
65+
path.join(__dirname, '../libquery_engine_napi-rhel-openssl-1.0.x.so.node')
66+
path.join(__dirname, '../libquery_engine_napi-rhel-openssl-1.1.x.so.node')
67+
path.join(__dirname, '../query_engine_napi-windows.dll.node')

0 commit comments

Comments
 (0)