Skip to content

Commit 0696c8d

Browse files
pauldraperpauldraper
authored
Merge pull request #10 from rivethealth/pauldraper/prettier
Upgrade to Prettier 3
2 parents 4253b79 + 9dd9702 commit 0696c8d

File tree

34 files changed

+328
-107
lines changed

34 files changed

+328
-107
lines changed

‎BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ js_library(
4343
srcs = ["prettierrc.yml"],
4444
root = ":root",
4545
visibility = [":__subpackages__"],
46+
deps = ["@npm//prettier-plugin-organize-imports:lib"],
4647
)
4748

4849
alias(
@@ -66,6 +67,7 @@ test_suite(
6667
"//jest:test",
6768
"//nodejs:test",
6869
"//npm:test",
70+
"//prettier:test",
6971
"//rollup:test",
7072
# "//ts-proto/test",
7173
"//typescript:test",

‎angular/test/bazel/material/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html>
33
<head>
44
<meta charset="utf-8" />

‎bazel/worker/src/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ export async function workerMain(workerFactory: WorkerFactory) {
125125
error instanceof CliError
126126
? error.message
127127
: error instanceof Error
128-
? error.stack
129-
: String(error),
128+
? error.stack
129+
: String(error),
130130
);
131131
process.exit(1);
132132
}

‎nodejs/fs-linker/src/fs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ function writeFileSync(
975975

976976
export function patchFs(
977977
vfs: Vfs,
978-
delegate: { -readonly [K in keyof typeof fs]: typeof fs[K] },
978+
delegate: { -readonly [K in keyof typeof fs]: (typeof fs)[K] },
979979
) {
980980
delegate.access = access(vfs, delegate.access);
981981
delegate.accessSync = accessSync(vfs, delegate.accessSync);

‎nodejs/runner.sh.tpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export NODE_PACKAGE_MANIFEST="$RUNFILES_DIR"/%{package_manifest}
2626
exec -a "$0" "$RUNFILES_DIR"/%{node} \
2727
-r "$(abspath "$RUNFILES_DIR"/%{runtime})" \
2828
-r "$(abspath "$RUNFILES_DIR"/%{module_linker})" \
29+
--experimental-import-meta-resolve \
2930
--experimental-loader "$(abspath "$RUNFILES_DIR"/%{esm_loader})" \
3031
--experimental-specifier-resolution=node \
3132
--preserve-symlinks \

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"@angular/platform-browser-dynamic": "^16",
1313
"@babel/core": "7.18.13",
1414
"@babel/plugin-transform-modules-commonjs": "7.18.6",
15+
"@prettier/plugin-xml": "^3",
1516
"@rollup/plugin-commonjs": "~16.0.0",
1617
"@rollup/plugin-node-resolve": "^15.0.0",
1718
"@typescript-eslint/eslint-plugin": "^5.59.0",
@@ -33,8 +34,8 @@
3334
"long": "~4.0.0",
3435
"node-fetch": "^2.0.0",
3536
"npm-registry-fetch": "~14.0.2",
36-
"prettier": "~2.5.0",
37-
"prettier-plugin-organize-imports": "^3.0.0",
37+
"prettier": "^3",
38+
"prettier-plugin-organize-imports": "^3",
3839
"protobufjs": "~6.11.2",
3940
"reflect-metadata": "0.1.13",
4041
"rollup": "^2.78.0",
@@ -52,7 +53,6 @@
5253
"@types/long": "~4.0.0",
5354
"@types/node": "^18",
5455
"@types/node-fetch": "^2.0.0",
55-
"@types/prettier": "~2.4.0",
5656
"@types/react": "~15.0.0",
5757
"@types/tar-stream": "~2.2.0"
5858
},

‎prettier/BUILD.bazel‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,9 @@ alias(
2727
actual = "@better_rules_javascript_npm//prettier:lib",
2828
visibility = ["//visibility:public"],
2929
)
30+
31+
test_suite(
32+
name = "test",
33+
tests = ["//angular/test"],
34+
visibility = ["//:__subpackages__"],
35+
)

‎prettier/format/BUILD.bazel‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,26 @@ js_library(
1515
deps = ["//tools/typescript:tsconfig"],
1616
)
1717

18+
js_library(
19+
name = "lib_js",
20+
srcs = glob([
21+
"src/**/*.js",
22+
"src/**/*.mjs",
23+
]),
24+
root = ":root",
25+
)
26+
1827
ts_library(
1928
name = "lib",
2029
srcs = glob(["src/**/*.ts"]),
21-
compile_deps = ["@better_rules_javascript_npm//@types/prettier:lib"],
30+
compile_deps = ["@better_rules_javascript_npm//prettier:lib"],
2231
compiler = "@better_rules_javascript//typescript:tsc",
2332
config = "tsconfig.json",
2433
config_dep = ":tsconfig",
2534
root = ":root",
2635
visibility = ["//visibility:public"],
2736
deps = [
37+
":lib_js",
2838
"@better_rules_javascript//bazel/worker:lib",
2939
"@better_rules_javascript_npm//@types/argparse:lib",
3040
"@better_rules_javascript_npm//@types/node:lib",

‎prettier/format/src/import.d.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function load(specifier: string): Promise<any>;
2+
3+
export function resolve(specifier: string, parent?: URL): Promise<string>;

‎prettier/format/src/import.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
async function load() {
2+
const { load } = await import("./import.mjs");
3+
return Reflect.apply(load, this, arguments);
4+
}
5+
6+
async function resolve() {
7+
const { resolve } = await import("./import.mjs");
8+
return Reflect.apply(resolve, this, arguments);
9+
}
10+
11+
module.exports = { load, resolve };

0 commit comments

Comments
 (0)