diff --git a/BUILD.bazel b/BUILD.bazel
index 65ae8b42..ce15ea86 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -43,6 +43,7 @@ js_library(
srcs = ["prettierrc.yml"],
root = ":root",
visibility = [":__subpackages__"],
+ deps = ["@npm//prettier-plugin-organize-imports:lib"],
)
alias(
@@ -66,6 +67,7 @@ test_suite(
"//jest:test",
"//nodejs:test",
"//npm:test",
+ "//prettier:test",
"//rollup:test",
# "//ts-proto/test",
"//typescript:test",
diff --git a/angular/test/bazel/material/index.html b/angular/test/bazel/material/index.html
index b9bf0bba..5eaf71d4 100644
--- a/angular/test/bazel/material/index.html
+++ b/angular/test/bazel/material/index.html
@@ -1,4 +1,4 @@
-
+
diff --git a/bazel/worker/src/index.ts b/bazel/worker/src/index.ts
index fa01b191..8947c8a1 100644
--- a/bazel/worker/src/index.ts
+++ b/bazel/worker/src/index.ts
@@ -125,8 +125,8 @@ export async function workerMain(workerFactory: WorkerFactory) {
error instanceof CliError
? error.message
: error instanceof Error
- ? error.stack
- : String(error),
+ ? error.stack
+ : String(error),
);
process.exit(1);
}
diff --git a/nodejs/fs-linker/src/fs.ts b/nodejs/fs-linker/src/fs.ts
index 5315bece..f24d6052 100644
--- a/nodejs/fs-linker/src/fs.ts
+++ b/nodejs/fs-linker/src/fs.ts
@@ -975,7 +975,7 @@ function writeFileSync(
export function patchFs(
vfs: Vfs,
- delegate: { -readonly [K in keyof typeof fs]: typeof fs[K] },
+ delegate: { -readonly [K in keyof typeof fs]: (typeof fs)[K] },
) {
delegate.access = access(vfs, delegate.access);
delegate.accessSync = accessSync(vfs, delegate.accessSync);
diff --git a/nodejs/runner.sh.tpl b/nodejs/runner.sh.tpl
index d5fc09df..bf58dcf2 100644
--- a/nodejs/runner.sh.tpl
+++ b/nodejs/runner.sh.tpl
@@ -26,6 +26,7 @@ export NODE_PACKAGE_MANIFEST="$RUNFILES_DIR"/%{package_manifest}
exec -a "$0" "$RUNFILES_DIR"/%{node} \
-r "$(abspath "$RUNFILES_DIR"/%{runtime})" \
-r "$(abspath "$RUNFILES_DIR"/%{module_linker})" \
+ --experimental-import-meta-resolve \
--experimental-loader "$(abspath "$RUNFILES_DIR"/%{esm_loader})" \
--experimental-specifier-resolution=node \
--preserve-symlinks \
diff --git a/package.json b/package.json
index acbc03e6..fdd37bed 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
"@angular/platform-browser-dynamic": "^16",
"@babel/core": "7.18.13",
"@babel/plugin-transform-modules-commonjs": "7.18.6",
+ "@prettier/plugin-xml": "^3",
"@rollup/plugin-commonjs": "~16.0.0",
"@rollup/plugin-node-resolve": "^15.0.0",
"@typescript-eslint/eslint-plugin": "^5.59.0",
@@ -33,8 +34,8 @@
"long": "~4.0.0",
"node-fetch": "^2.0.0",
"npm-registry-fetch": "~14.0.2",
- "prettier": "~2.5.0",
- "prettier-plugin-organize-imports": "^3.0.0",
+ "prettier": "^3",
+ "prettier-plugin-organize-imports": "^3",
"protobufjs": "~6.11.2",
"reflect-metadata": "0.1.13",
"rollup": "^2.78.0",
@@ -52,7 +53,6 @@
"@types/long": "~4.0.0",
"@types/node": "^18",
"@types/node-fetch": "^2.0.0",
- "@types/prettier": "~2.4.0",
"@types/react": "~15.0.0",
"@types/tar-stream": "~2.2.0"
},
diff --git a/prettier/BUILD.bazel b/prettier/BUILD.bazel
index 0d0c09e0..4b629f3e 100644
--- a/prettier/BUILD.bazel
+++ b/prettier/BUILD.bazel
@@ -27,3 +27,9 @@ alias(
actual = "@better_rules_javascript_npm//prettier:lib",
visibility = ["//visibility:public"],
)
+
+test_suite(
+ name = "test",
+ tests = ["//angular/test"],
+ visibility = ["//:__subpackages__"],
+)
diff --git a/prettier/format/BUILD.bazel b/prettier/format/BUILD.bazel
index 97d5ff0a..e930dc67 100644
--- a/prettier/format/BUILD.bazel
+++ b/prettier/format/BUILD.bazel
@@ -15,16 +15,26 @@ js_library(
deps = ["//tools/typescript:tsconfig"],
)
+js_library(
+ name = "lib_js",
+ srcs = glob([
+ "src/**/*.js",
+ "src/**/*.mjs",
+ ]),
+ root = ":root",
+)
+
ts_library(
name = "lib",
srcs = glob(["src/**/*.ts"]),
- compile_deps = ["@better_rules_javascript_npm//@types/prettier:lib"],
+ compile_deps = ["@better_rules_javascript_npm//prettier:lib"],
compiler = "@better_rules_javascript//typescript:tsc",
config = "tsconfig.json",
config_dep = ":tsconfig",
root = ":root",
visibility = ["//visibility:public"],
deps = [
+ ":lib_js",
"@better_rules_javascript//bazel/worker:lib",
"@better_rules_javascript_npm//@types/argparse:lib",
"@better_rules_javascript_npm//@types/node:lib",
diff --git a/prettier/format/src/import.d.ts b/prettier/format/src/import.d.ts
new file mode 100644
index 00000000..8be483ba
--- /dev/null
+++ b/prettier/format/src/import.d.ts
@@ -0,0 +1,3 @@
+export function load(specifier: string): Promise;
+
+export function resolve(specifier: string, parent?: URL): Promise;
diff --git a/prettier/format/src/import.js b/prettier/format/src/import.js
new file mode 100644
index 00000000..472da669
--- /dev/null
+++ b/prettier/format/src/import.js
@@ -0,0 +1,11 @@
+async function load() {
+ const { load } = await import("./import.mjs");
+ return Reflect.apply(load, this, arguments);
+}
+
+async function resolve() {
+ const { resolve } = await import("./import.mjs");
+ return Reflect.apply(resolve, this, arguments);
+}
+
+module.exports = { load, resolve };
diff --git a/prettier/format/src/import.mjs b/prettier/format/src/import.mjs
new file mode 100644
index 00000000..731729ac
--- /dev/null
+++ b/prettier/format/src/import.mjs
@@ -0,0 +1,7 @@
+export function load(specifier) {
+ return import(specifier);
+}
+
+export function resolve(specifier, parent) {
+ return import.meta.resolve(specifier, parent);
+}
diff --git a/prettier/format/src/index.ts b/prettier/format/src/index.ts
index 70ea6f5b..e6ff3586 100644
--- a/prettier/format/src/index.ts
+++ b/prettier/format/src/index.ts
@@ -1,22 +1,47 @@
import { workerMain } from "@better-rules-javascript/bazel-worker";
import { ArgumentParser } from "argparse";
-import prettier from "prettier";
+import { dirname } from "node:path";
+import { pathToFileURL } from "node:url";
+import { Options } from "prettier";
+import { load, resolve } from "./import";
+
+interface Args {
+ config?: string;
+}
workerMain(async (a) => {
- const parser = new ArgumentParser();
- parser.add_argument("--config");
- const args = parser.parse_args(a);
+ const parser = new ArgumentParser({ prog: "prettier-format" });
+ parser.add_argument("--config", { help: "Configuration path" });
+ const args: Args = parser.parse_args(a);
+ const { resolveConfig } = await import("prettier");
const { PrettierWorker } = await import("./worker");
- const options =
- args.config &&
- prettier.resolveConfig.sync(args.config, { config: args.config });
+ const options: Options | undefined =
+ args.config === undefined
+ ? undefined
+ : (await resolveConfig(args.config, { config: args.config })) ||
+ undefined;
+ if (options?.plugins) {
+ const contextUrl = pathToFileURL(dirname(args.config!));
+ options.plugins = await Promise.all(
+ options.plugins.map(async (plugin) => {
+ // in theory, should be able to just resolve the path, but for some reason
+ // that dereferences symlinks
+ if (typeof plugin === "string") {
+ const path = await resolve(plugin, contextUrl);
+ const p = await load(path);
+ plugin = p.default ?? p;
+ }
+ return plugin;
+ }),
+ );
+ }
const worker = new PrettierWorker(options);
return async (a) => {
try {
- worker.run(a);
+ await worker.run(a);
} catch (error) {
return {
exitCode: 1,
diff --git a/prettier/format/src/worker.ts b/prettier/format/src/worker.ts
index 7cdfff38..f1aa8de9 100644
--- a/prettier/format/src/worker.ts
+++ b/prettier/format/src/worker.ts
@@ -1,20 +1,20 @@
import { ArgumentParser } from "argparse";
-import * as fs from "node:fs";
-import prettier from "prettier";
+import { readFile, writeFile } from "node:fs/promises";
+import { Options, format } from "prettier";
export class PrettierWorker {
- constructor(private readonly options: any) {}
+ constructor(private readonly options: Options | undefined) {}
- run(a: string[]) {
+ async run(a: string[]) {
const parser = new ArgumentParser();
parser.add_argument("input");
parser.add_argument("output");
const args = parser.parse_args(a);
- const input = fs.readFileSync(args.input, "utf8");
- const output = prettier.format(input, {
+ const input = await readFile(args.input, "utf8");
+ const output = await format(input, {
...this.options,
filepath: args.input,
});
- fs.writeFileSync(args.output, output, "utf8");
+ await writeFile(args.output, output, "utf8");
}
}
diff --git a/prettier/format/tsconfig.json b/prettier/format/tsconfig.json
index 7219c503..a58409d0 100644
--- a/prettier/format/tsconfig.json
+++ b/prettier/format/tsconfig.json
@@ -1,6 +1,6 @@
{
"compilerOptions": {
- "esModuleInterop": true
+ "module": "es2020"
},
"extends": "@better-rules-javascript/tools-typescript/tsconfig.common.json"
}
diff --git a/prettier/rules.bzl b/prettier/rules.bzl
index 63ab2094..a91d0eb3 100644
--- a/prettier/rules.bzl
+++ b/prettier/rules.bzl
@@ -5,18 +5,11 @@ load("//javascript:rules.bzl", "js_export")
load("//nodejs:rules.bzl", "nodejs_binary")
load("//util:path.bzl", "runfile_path")
-def configure_prettier(name, config, config_dep, dep = "@better_rules_javascript//prettier:prettier_lib", plugins = [], visibility = None):
- js_export(
- name = "%s.prettier" % name,
- dep = dep,
- deps = plugins,
- visibility = ["//visibility:private"],
- )
-
+def configure_prettier(name, config, config_dep, dep = "@better_rules_javascript//prettier:prettier_lib", visibility = None):
js_export(
name = "%s.main" % name,
dep = "@better_rules_javascript//prettier/format:lib",
- deps = [":%s.prettier" % name],
+ deps = [dep],
extra_deps = [config_dep],
visibility = ["//visibility:private"],
)
diff --git a/prettier/test/BUILD.bazel b/prettier/test/BUILD.bazel
new file mode 100644
index 00000000..9c468d09
--- /dev/null
+++ b/prettier/test/BUILD.bazel
@@ -0,0 +1,50 @@
+load("//commonjs:rules.bzl", "cjs_root")
+load("//javascript:rules.bzl", "js_library")
+load("//jest:rules.bzl", "jest_test")
+load("//typescript:rules.bzl", "ts_library")
+
+js_library(
+ name = "jest_config",
+ srcs = ["jest.config.js"],
+ root = ":root",
+ deps = ["//test:lib"],
+)
+
+cjs_root(
+ name = "root",
+ package_name = "@better-rules-javascript/prettier-test",
+)
+
+jest_test(
+ name = "test",
+ size = "large",
+ config = "jest.config.js",
+ config_dep = ":jest_config",
+ data = glob(["bazel/**/*"]) + ["@files//:common"],
+ dep = ":test_lib",
+ jest = "@npm//jest:lib",
+ node = "@better_rules_javascript//tools/nodejs",
+ tags = ["local"],
+ visibility = ["//visibility:public"],
+)
+
+ts_library(
+ name = "test_lib",
+ srcs = glob(["src/**/*.ts"]),
+ compiler = "//typescript:tsc",
+ config = "tsconfig.json",
+ config_dep = ":tsconfig",
+ root = ":root",
+ deps = [
+ "//test:lib",
+ "@npm//@types/jest:lib",
+ "@npm//@types/node:lib",
+ ],
+)
+
+js_library(
+ name = "tsconfig",
+ srcs = ["tsconfig.json"],
+ root = ":root",
+ deps = ["//tools/typescript:tsconfig"],
+)
diff --git a/prettier/test/bazel/WORKSPACE.bazel b/prettier/test/bazel/WORKSPACE.bazel
new file mode 100644
index 00000000..e7e9d72c
--- /dev/null
+++ b/prettier/test/bazel/WORKSPACE.bazel
@@ -0,0 +1,16 @@
+workspace(name = "better_rules_javascript_test")
+
+# JavaScript
+
+local_repository(
+ name = "better_rules_javascript",
+ path = "../../../external/files/files",
+)
+
+load("@better_rules_javascript//test:workspace0.bzl", "test_repositories0")
+
+test_repositories0()
+
+load("@better_rules_javascript//test:workspace1.bzl", "test_repositories1")
+
+test_repositories1()
diff --git a/prettier/test/bazel/plugin/BUILD.bazel b/prettier/test/bazel/plugin/BUILD.bazel
new file mode 100644
index 00000000..681cf5bd
--- /dev/null
+++ b/prettier/test/bazel/plugin/BUILD.bazel
@@ -0,0 +1,30 @@
+load("@better_rules_javascript//commonjs:rules.bzl", "cjs_root")
+load("@better_rules_javascript//javascript:rules.bzl", "js_library")
+load("@better_rules_javascript//prettier:rules.bzl", "configure_prettier")
+load("@rules_file//generate:rules.bzl", "format")
+
+format(
+ name = "format",
+ srcs = ["example.xml"],
+ formatter = ":prettier",
+)
+
+js_library(
+ name = "prettier_config",
+ srcs = ["prettierrc.yml"],
+ root = "root",
+ deps = ["@npm//@prettier/plugin-xml:lib"],
+)
+
+cjs_root(
+ name = "root",
+ package_name = "@better-rules-javascript-test/prettier-plugin",
+ descriptors = ["package.json"],
+)
+
+configure_prettier(
+ name = "prettier",
+ config = "prettierrc.yml",
+ config_dep = ":prettier_config",
+ dep = "@npm//prettier:lib",
+)
diff --git a/prettier/test/plugin/example.xml b/prettier/test/bazel/plugin/example.xml
similarity index 100%
rename from prettier/test/plugin/example.xml
rename to prettier/test/bazel/plugin/example.xml
diff --git a/prettier/test/bazel/plugin/package.json b/prettier/test/bazel/plugin/package.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/prettier/test/bazel/plugin/package.json
@@ -0,0 +1 @@
+{}
diff --git a/prettier/test/plugin/prettierrc.yml b/prettier/test/bazel/plugin/prettierrc.yml
similarity index 100%
rename from prettier/test/plugin/prettierrc.yml
rename to prettier/test/bazel/plugin/prettierrc.yml
diff --git a/prettier/test/jest.config.js b/prettier/test/jest.config.js
new file mode 100644
index 00000000..deb8f52b
--- /dev/null
+++ b/prettier/test/jest.config.js
@@ -0,0 +1,3 @@
+const { jestConfig } = require("@better-rules-javascript/test/jest-config");
+
+module.exports = jestConfig();
diff --git a/prettier/test/plugin/BUILD.bazel b/prettier/test/plugin/BUILD.bazel
deleted file mode 100644
index bc764ff7..00000000
--- a/prettier/test/plugin/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-load("@better_rules_javascript//prettier:rules.bzl", "configure_prettier")
-load("@rules_format//format:rules.bzl", "format")
-
-configure_prettier(
- name = "prettier",
- config = "prettierrc.yml",
- dep = "@npm//prettier:lib",
- plugins = ["@npm//@prettier/plugin-xml:lib"],
-)
-
-format(
- name = "format",
- srcs = ["example.xml"],
- formatter = ":prettier",
-)
diff --git a/prettier/test/src/plugin.spec.ts b/prettier/test/src/plugin.spec.ts
new file mode 100644
index 00000000..5b4419fe
--- /dev/null
+++ b/prettier/test/src/plugin.spec.ts
@@ -0,0 +1,11 @@
+import { spawnOptions } from "@better-rules-javascript/test";
+import * as childProcess from "node:child_process";
+
+test("Format", () => {
+ const result = childProcess.spawnSync("bazel", ["run", "plugin:format"], {
+ cwd: "prettier/test/bazel",
+ stdio: "inherit",
+ ...spawnOptions(),
+ });
+ expect(result.status).toBe(0);
+});
diff --git a/prettier/test/tsconfig.json b/prettier/test/tsconfig.json
new file mode 100644
index 00000000..78429e96
--- /dev/null
+++ b/prettier/test/tsconfig.json
@@ -0,0 +1,3 @@
+{
+ "extends": "@better-rules-javascript/tools-typescript/tsconfig.common.json"
+}
diff --git a/rules/npm_data.bzl b/rules/npm_data.bzl
index 79302b62..3794258d 100644
--- a/rules/npm_data.bzl
+++ b/rules/npm_data.bzl
@@ -1367,15 +1367,6 @@ PACKAGES = {
"name": "@types/node",
"url": "https://registry.npmjs.org/@types/node/-/node-17.0.17.tgz",
},
- "@types/prettier@2.4.4": {
- "deps": [
- ],
- "extra_deps": {
- },
- "integrity": "sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA==",
- "name": "@types/prettier",
- "url": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz",
- },
"@types/qs@6.9.7": {
"deps": [
],
@@ -11162,14 +11153,14 @@ PACKAGES = {
"name": "prelude-ls",
"url": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
},
- "prettier@2.8.1": {
+ "prettier@3.1.1": {
"deps": [
],
"extra_deps": {
},
- "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==",
+ "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
"name": "prettier",
- "url": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz",
+ "url": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
},
"pretty-bytes@5.6.0": {
"deps": [
@@ -14103,10 +14094,6 @@ ROOTS = [
"id": "@types/node@16.11.24",
"name": "@types/node",
},
- {
- "id": "@types/prettier@2.4.4",
- "name": "@types/prettier",
- },
{
"id": "@types/tar-stream@2.2.2",
"name": "@types/tar-stream",
@@ -14160,7 +14147,7 @@ ROOTS = [
"name": "npm",
},
{
- "id": "prettier@2.8.1",
+ "id": "prettier@3.1.1",
"name": "prettier",
},
{
diff --git a/rules/package.json b/rules/package.json
index c00fcd28..5bfe8302 100644
--- a/rules/package.json
+++ b/rules/package.json
@@ -8,7 +8,6 @@
"@types/long": "~4.0.0",
"@types/node": "~16.11.0",
"@types/node-fetch": "^2.0.0",
- "@types/prettier": "~2.4.0",
"@types/tar-stream": "~2.2.0",
"@yarnpkg/cli": "^3.0.0",
"@yarnpkg/cli-dist": "^3.0.0",
@@ -22,7 +21,7 @@
"long": "~4.0.0",
"node-fetch": "^2.0.0",
"npm": "^9",
- "prettier": "^2.0.0",
+ "prettier": "^3",
"protobufjs": "~7.1.0",
"rollup": "~3.21.0",
"rxjs": "~7.5.0",
diff --git a/rules/yarn.lock b/rules/yarn.lock
index 83a1f99e..6de4dec0 100644
--- a/rules/yarn.lock
+++ b/rules/yarn.lock
@@ -901,13 +901,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/prettier@npm:~2.4.0":
- version: 2.4.4
- resolution: "@types/prettier@npm:2.4.4"
- checksum: 2c2cc57efd49c7d8907415a72f96c84a6dd8696dd3bf8aa4ca3a667427bebf71cbfbc912673624bdfc935d272d1c008c639cf155f6449315990a4dc110f0d216
- languageName: node
- linkType: hard
-
"@types/qs@npm:*":
version: 6.9.7
resolution: "@types/qs@npm:6.9.7"
@@ -5797,12 +5790,12 @@ __metadata:
languageName: node
linkType: hard
-"prettier@npm:^2.0.0":
- version: 2.8.1
- resolution: "prettier@npm:2.8.1"
+"prettier@npm:^3":
+ version: 3.1.1
+ resolution: "prettier@npm:3.1.1"
bin:
- prettier: bin-prettier.js
- checksum: 4f21a0f1269f76fb36f54e9a8a1ea4c11e27478958bf860661fb4b6d7ac69aac1581f8724fa98ea3585e56d42a2ea317a17ff6e3324f40cb11ff9e20b73785cc
+ prettier: bin/prettier.cjs
+ checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e
languageName: node
linkType: hard
@@ -6276,7 +6269,6 @@ __metadata:
"@types/long": ~4.0.0
"@types/node": ~16.11.0
"@types/node-fetch": ^2.0.0
- "@types/prettier": ~2.4.0
"@types/tar-stream": ~2.2.0
"@yarnpkg/cli": ^3.0.0
"@yarnpkg/cli-dist": ^3.0.0
@@ -6290,7 +6282,7 @@ __metadata:
long: ~4.0.0
node-fetch: ^2.0.0
npm: ^9
- prettier: ^2.0.0
+ prettier: ^3
protobufjs: ~7.1.0
rollup: ~3.21.0
rxjs: ~7.5.0
diff --git a/test/src/jest-config.ts b/test/src/jest-config.ts
index 59d514df..d99100a3 100644
--- a/test/src/jest-config.ts
+++ b/test/src/jest-config.ts
@@ -1,5 +1,6 @@
export function jestConfig() {
return {
+ modulePathIgnorePatterns: [`${process.env.JEST_ROOT}/bazel/`],
testPathIgnorePatterns: [`${process.env.JEST_ROOT}/bazel/`],
testTimeout: 60 * 1000,
};
diff --git a/tools/bazel/deleted.bazelrc b/tools/bazel/deleted.bazelrc
index 3fbc0d6a..0dd80a75 100644
--- a/tools/bazel/deleted.bazelrc
+++ b/tools/bazel/deleted.bazelrc
@@ -1,3 +1,3 @@
# Generated by bazel run @//tools/bazel:bazelrc
-build --deleted_packages=//angular/test/bazel,//angular/test/bazel/basic,//angular/test/bazel/material,//commonjs/test/bazel/directory,//javascript/test/bazel/directory,//javascript/test/bazel/system-lib,//jest/test/bazel,//jest/test/bazel/basic,//jest/test/bazel/dep,//jest/test/bazel/shard,//jest/test/bazel/snapshot,//jest/test/bazel/tools,//jest/test/bazel/transform,//nodejs/test/bazel/binary-archive,//nodejs/test/bazel/binary,//nodejs/test/bazel/dep,//nodejs/test/bazel/dep/other,//nodejs/test/bazel/dep/process,//nodejs/test/bazel/esm,//nodejs/test/bazel/gen,//nodejs/test/bazel/module-details,//nodejs/test/bazel/modules-binary,//npm/test/bazel/alias,//npm/test/bazel/audit,//npm/test/bazel/yarn,//rollup/test/bazel/basic,//ts-proto/test/bazel,//ts-proto/test/bazel/basic,//typescript/test/bazel,//typescript/test/bazel/ambiant,//typescript/test/bazel/basic,//typescript/test/bazel/directory,//typescript/test/bazel/json,//typescript/test/bazel/jsx,//typescript/test/bazel/paths,//typescript/test/bazel/reference,//typescript/test/bazel/source-map,//typescript/test/bazel/tslib,//webpack/test/bazel/basic,//webpack/test/bazel/server,@files//files,@files//files/angular,@files//files/angular/doc,@files//files/angular/js-compiler,@files//files/angular/resource-compiler,@files//files/angular/test,@files//files/angular/test/bazel,@files//files/angular/test/bazel/basic,@files//files/angular/test/bazel/material,@files//files/bazel,@files//files/bazel/runfiles,@files//files/bazel/worker,@files//files/commonjs,@files//files/commonjs/doc,@files//files/commonjs/manifest,@files//files/commonjs/package,@files//files/commonjs/test,@files//files/commonjs/test/bazel/directory,@files//files/eslint,@files//files/eslint/doc,@files//files/eslint/linter,@files//files/ibazel/notification,@files//files/javascript,@files//files/javascript/doc,@files//files/javascript/test,@files//files/javascript/test/bazel/directory,@files//files/javascript/test/bazel/system-lib,@files//files/jest,@files//files/jest/config,@files//files/jest/doc,@files//files/jest/test,@files//files/jest/test/bazel,@files//files/jest/test/bazel/basic,@files//files/jest/test/bazel/dep,@files//files/jest/test/bazel/shard,@files//files/jest/test/bazel/snapshot,@files//files/jest/test/bazel/tools,@files//files/jest/test/bazel/transform,@files//files/nodejs,@files//files/nodejs/default,@files//files/nodejs/doc,@files//files/nodejs/esm-linker,@files//files/nodejs/fs-linker,@files//files/nodejs/module-linker,@files//files/nodejs/resolve,@files//files/nodejs/runtime,@files//files/nodejs/test,@files//files/nodejs/test/bazel/binary,@files//files/nodejs/test/bazel/binary-archive,@files//files/nodejs/test/bazel/dep,@files//files/nodejs/test/bazel/dep/other,@files//files/nodejs/test/bazel/dep/process,@files//files/nodejs/test/bazel/esm,@files//files/nodejs/test/bazel/gen,@files//files/nodejs/test/bazel/module-details,@files//files/nodejs/test/bazel/modules-binary,@files//files/npm,@files//files/npm/doc,@files//files/npm/test,@files//files/npm/test/bazel/alias,@files//files/npm/test/bazel/audit,@files//files/npm/test/bazel/yarn,@files//files/npm/yarn-resolve,@files//files/prettier,@files//files/prettier/doc,@files//files/prettier/format,@files//files/prettier/test/plugin,@files//files/protobuf,@files//files/protobuf/doc,@files//files/protobuf/test/basic,@files//files/protobufjs,@files//files/protobufjs/doc,@files//files/protobufjs/test/basic,@files//files/rollup,@files//files/rollup/config,@files//files/rollup/doc,@files//files/rollup/test,@files//files/rollup/test/bazel/basic,@files//files/rules,@files//files/rules/doc,@files//files/test,@files//files/third-party,@files//files/tools/bazel,@files//files/tools/buildifier,@files//files/tools/doc,@files//files/tools/eslint,@files//files/tools/file,@files//files/tools/javascript,@files//files/tools/lint,@files//files/tools/nodejs,@files//files/tools/npm,@files//files/tools/prettier,@files//files/tools/stardoc,@files//files/tools/typescript,@files//files/ts-proto,@files//files/ts-proto/doc,@files//files/ts-proto/test,@files//files/ts-proto/test/bazel,@files//files/ts-proto/test/bazel/basic,@files//files/typescript,@files//files/typescript/config,@files//files/typescript/default,@files//files/typescript/doc,@files//files/typescript/js-compiler,@files//files/typescript/test,@files//files/typescript/test/bazel,@files//files/typescript/test/bazel/ambiant,@files//files/typescript/test/bazel/basic,@files//files/typescript/test/bazel/directory,@files//files/typescript/test/bazel/json,@files//files/typescript/test/bazel/jsx,@files//files/typescript/test/bazel/paths,@files//files/typescript/test/bazel/reference,@files//files/typescript/test/bazel/source-map,@files//files/typescript/test/bazel/tslib,@files//files/util,@files//files/util/cache,@files//files/util/json,@files//files/util/starlark,@files//files/util/util,@files//files/webpack,@files//files/webpack/config,@files//files/webpack/default,@files//files/webpack/doc,@files//files/webpack/load-config,@files//files/webpack/runtime,@files//files/webpack/server,@files//files/webpack/test,@files//files/webpack/test/bazel/basic,@files//files/webpack/test/bazel/server
-query --deleted_packages=//angular/test/bazel,//angular/test/bazel/basic,//angular/test/bazel/material,//commonjs/test/bazel/directory,//javascript/test/bazel/directory,//javascript/test/bazel/system-lib,//jest/test/bazel,//jest/test/bazel/basic,//jest/test/bazel/dep,//jest/test/bazel/shard,//jest/test/bazel/snapshot,//jest/test/bazel/tools,//jest/test/bazel/transform,//nodejs/test/bazel/binary-archive,//nodejs/test/bazel/binary,//nodejs/test/bazel/dep,//nodejs/test/bazel/dep/other,//nodejs/test/bazel/dep/process,//nodejs/test/bazel/esm,//nodejs/test/bazel/gen,//nodejs/test/bazel/module-details,//nodejs/test/bazel/modules-binary,//npm/test/bazel/alias,//npm/test/bazel/audit,//npm/test/bazel/yarn,//rollup/test/bazel/basic,//ts-proto/test/bazel,//ts-proto/test/bazel/basic,//typescript/test/bazel,//typescript/test/bazel/ambiant,//typescript/test/bazel/basic,//typescript/test/bazel/directory,//typescript/test/bazel/json,//typescript/test/bazel/jsx,//typescript/test/bazel/paths,//typescript/test/bazel/reference,//typescript/test/bazel/source-map,//typescript/test/bazel/tslib,//webpack/test/bazel/basic,//webpack/test/bazel/server,@files//files,@files//files/angular,@files//files/angular/doc,@files//files/angular/js-compiler,@files//files/angular/resource-compiler,@files//files/angular/test,@files//files/angular/test/bazel,@files//files/angular/test/bazel/basic,@files//files/angular/test/bazel/material,@files//files/bazel,@files//files/bazel/runfiles,@files//files/bazel/worker,@files//files/commonjs,@files//files/commonjs/doc,@files//files/commonjs/manifest,@files//files/commonjs/package,@files//files/commonjs/test,@files//files/commonjs/test/bazel/directory,@files//files/eslint,@files//files/eslint/doc,@files//files/eslint/linter,@files//files/ibazel/notification,@files//files/javascript,@files//files/javascript/doc,@files//files/javascript/test,@files//files/javascript/test/bazel/directory,@files//files/javascript/test/bazel/system-lib,@files//files/jest,@files//files/jest/config,@files//files/jest/doc,@files//files/jest/test,@files//files/jest/test/bazel,@files//files/jest/test/bazel/basic,@files//files/jest/test/bazel/dep,@files//files/jest/test/bazel/shard,@files//files/jest/test/bazel/snapshot,@files//files/jest/test/bazel/tools,@files//files/jest/test/bazel/transform,@files//files/nodejs,@files//files/nodejs/default,@files//files/nodejs/doc,@files//files/nodejs/esm-linker,@files//files/nodejs/fs-linker,@files//files/nodejs/module-linker,@files//files/nodejs/resolve,@files//files/nodejs/runtime,@files//files/nodejs/test,@files//files/nodejs/test/bazel/binary,@files//files/nodejs/test/bazel/binary-archive,@files//files/nodejs/test/bazel/dep,@files//files/nodejs/test/bazel/dep/other,@files//files/nodejs/test/bazel/dep/process,@files//files/nodejs/test/bazel/esm,@files//files/nodejs/test/bazel/gen,@files//files/nodejs/test/bazel/module-details,@files//files/nodejs/test/bazel/modules-binary,@files//files/npm,@files//files/npm/doc,@files//files/npm/test,@files//files/npm/test/bazel/alias,@files//files/npm/test/bazel/audit,@files//files/npm/test/bazel/yarn,@files//files/npm/yarn-resolve,@files//files/prettier,@files//files/prettier/doc,@files//files/prettier/format,@files//files/prettier/test/plugin,@files//files/protobuf,@files//files/protobuf/doc,@files//files/protobuf/test/basic,@files//files/protobufjs,@files//files/protobufjs/doc,@files//files/protobufjs/test/basic,@files//files/rollup,@files//files/rollup/config,@files//files/rollup/doc,@files//files/rollup/test,@files//files/rollup/test/bazel/basic,@files//files/rules,@files//files/rules/doc,@files//files/test,@files//files/third-party,@files//files/tools/bazel,@files//files/tools/buildifier,@files//files/tools/doc,@files//files/tools/eslint,@files//files/tools/file,@files//files/tools/javascript,@files//files/tools/lint,@files//files/tools/nodejs,@files//files/tools/npm,@files//files/tools/prettier,@files//files/tools/stardoc,@files//files/tools/typescript,@files//files/ts-proto,@files//files/ts-proto/doc,@files//files/ts-proto/test,@files//files/ts-proto/test/bazel,@files//files/ts-proto/test/bazel/basic,@files//files/typescript,@files//files/typescript/config,@files//files/typescript/default,@files//files/typescript/doc,@files//files/typescript/js-compiler,@files//files/typescript/test,@files//files/typescript/test/bazel,@files//files/typescript/test/bazel/ambiant,@files//files/typescript/test/bazel/basic,@files//files/typescript/test/bazel/directory,@files//files/typescript/test/bazel/json,@files//files/typescript/test/bazel/jsx,@files//files/typescript/test/bazel/paths,@files//files/typescript/test/bazel/reference,@files//files/typescript/test/bazel/source-map,@files//files/typescript/test/bazel/tslib,@files//files/util,@files//files/util/cache,@files//files/util/json,@files//files/util/starlark,@files//files/util/util,@files//files/webpack,@files//files/webpack/config,@files//files/webpack/default,@files//files/webpack/doc,@files//files/webpack/load-config,@files//files/webpack/runtime,@files//files/webpack/server,@files//files/webpack/test,@files//files/webpack/test/bazel/basic,@files//files/webpack/test/bazel/server
+build --deleted_packages=//angular/test/bazel,//angular/test/bazel/basic,//angular/test/bazel/material,//commonjs/test/bazel/directory,//javascript/test/bazel/directory,//javascript/test/bazel/system-lib,//jest/test/bazel,//jest/test/bazel/basic,//jest/test/bazel/dep,//jest/test/bazel/shard,//jest/test/bazel/snapshot,//jest/test/bazel/tools,//jest/test/bazel/transform,//nodejs/test/bazel/binary-archive,//nodejs/test/bazel/binary,//nodejs/test/bazel/dep,//nodejs/test/bazel/dep/other,//nodejs/test/bazel/dep/process,//nodejs/test/bazel/esm,//nodejs/test/bazel/gen,//nodejs/test/bazel/module-details,//nodejs/test/bazel/modules-binary,//npm/test/bazel/alias,//npm/test/bazel/audit,//npm/test/bazel/yarn,//prettier/test/bazel/plugin,//rollup/test/bazel/basic,//ts-proto/test/bazel,//ts-proto/test/bazel/basic,//typescript/test/bazel,//typescript/test/bazel/ambiant,//typescript/test/bazel/basic,//typescript/test/bazel/directory,//typescript/test/bazel/json,//typescript/test/bazel/jsx,//typescript/test/bazel/paths,//typescript/test/bazel/reference,//typescript/test/bazel/source-map,//typescript/test/bazel/tslib,//webpack/test/bazel/basic,//webpack/test/bazel/server,@files//files,@files//files/angular,@files//files/angular/doc,@files//files/angular/js-compiler,@files//files/angular/resource-compiler,@files//files/angular/test,@files//files/angular/test/bazel,@files//files/angular/test/bazel/basic,@files//files/angular/test/bazel/material,@files//files/bazel,@files//files/bazel/runfiles,@files//files/bazel/worker,@files//files/commonjs,@files//files/commonjs/doc,@files//files/commonjs/manifest,@files//files/commonjs/package,@files//files/commonjs/test,@files//files/commonjs/test/bazel/directory,@files//files/eslint,@files//files/eslint/doc,@files//files/eslint/linter,@files//files/ibazel/notification,@files//files/javascript,@files//files/javascript/doc,@files//files/javascript/test,@files//files/javascript/test/bazel/directory,@files//files/javascript/test/bazel/system-lib,@files//files/jest,@files//files/jest/config,@files//files/jest/doc,@files//files/jest/test,@files//files/jest/test/bazel,@files//files/jest/test/bazel/basic,@files//files/jest/test/bazel/dep,@files//files/jest/test/bazel/shard,@files//files/jest/test/bazel/snapshot,@files//files/jest/test/bazel/tools,@files//files/jest/test/bazel/transform,@files//files/nodejs,@files//files/nodejs/default,@files//files/nodejs/doc,@files//files/nodejs/esm-linker,@files//files/nodejs/fs-linker,@files//files/nodejs/module-linker,@files//files/nodejs/resolve,@files//files/nodejs/runtime,@files//files/nodejs/test,@files//files/nodejs/test/bazel/binary,@files//files/nodejs/test/bazel/binary-archive,@files//files/nodejs/test/bazel/dep,@files//files/nodejs/test/bazel/dep/other,@files//files/nodejs/test/bazel/dep/process,@files//files/nodejs/test/bazel/esm,@files//files/nodejs/test/bazel/gen,@files//files/nodejs/test/bazel/module-details,@files//files/nodejs/test/bazel/modules-binary,@files//files/npm,@files//files/npm/doc,@files//files/npm/test,@files//files/npm/test/bazel/alias,@files//files/npm/test/bazel/audit,@files//files/npm/test/bazel/yarn,@files//files/npm/yarn-resolve,@files//files/prettier,@files//files/prettier/doc,@files//files/prettier/format,@files//files/prettier/test,@files//files/prettier/test/bazel/plugin,@files//files/protobuf,@files//files/protobuf/doc,@files//files/protobuf/test/basic,@files//files/protobufjs,@files//files/protobufjs/doc,@files//files/protobufjs/test/basic,@files//files/rollup,@files//files/rollup/config,@files//files/rollup/doc,@files//files/rollup/test,@files//files/rollup/test/bazel/basic,@files//files/rules,@files//files/rules/doc,@files//files/test,@files//files/third-party,@files//files/tools/bazel,@files//files/tools/buildifier,@files//files/tools/doc,@files//files/tools/eslint,@files//files/tools/file,@files//files/tools/javascript,@files//files/tools/lint,@files//files/tools/nodejs,@files//files/tools/npm,@files//files/tools/prettier,@files//files/tools/stardoc,@files//files/tools/typescript,@files//files/ts-proto,@files//files/ts-proto/doc,@files//files/ts-proto/test,@files//files/ts-proto/test/bazel,@files//files/ts-proto/test/bazel/basic,@files//files/typescript,@files//files/typescript/config,@files//files/typescript/default,@files//files/typescript/doc,@files//files/typescript/js-compiler,@files//files/typescript/test,@files//files/typescript/test/bazel,@files//files/typescript/test/bazel/ambiant,@files//files/typescript/test/bazel/basic,@files//files/typescript/test/bazel/directory,@files//files/typescript/test/bazel/json,@files//files/typescript/test/bazel/jsx,@files//files/typescript/test/bazel/paths,@files//files/typescript/test/bazel/reference,@files//files/typescript/test/bazel/source-map,@files//files/typescript/test/bazel/tslib,@files//files/util,@files//files/util/cache,@files//files/util/json,@files//files/util/starlark,@files//files/util/util,@files//files/webpack,@files//files/webpack/config,@files//files/webpack/default,@files//files/webpack/doc,@files//files/webpack/load-config,@files//files/webpack/runtime,@files//files/webpack/server,@files//files/webpack/test,@files//files/webpack/test/bazel/basic,@files//files/webpack/test/bazel/server
+query --deleted_packages=//angular/test/bazel,//angular/test/bazel/basic,//angular/test/bazel/material,//commonjs/test/bazel/directory,//javascript/test/bazel/directory,//javascript/test/bazel/system-lib,//jest/test/bazel,//jest/test/bazel/basic,//jest/test/bazel/dep,//jest/test/bazel/shard,//jest/test/bazel/snapshot,//jest/test/bazel/tools,//jest/test/bazel/transform,//nodejs/test/bazel/binary-archive,//nodejs/test/bazel/binary,//nodejs/test/bazel/dep,//nodejs/test/bazel/dep/other,//nodejs/test/bazel/dep/process,//nodejs/test/bazel/esm,//nodejs/test/bazel/gen,//nodejs/test/bazel/module-details,//nodejs/test/bazel/modules-binary,//npm/test/bazel/alias,//npm/test/bazel/audit,//npm/test/bazel/yarn,//prettier/test/bazel/plugin,//rollup/test/bazel/basic,//ts-proto/test/bazel,//ts-proto/test/bazel/basic,//typescript/test/bazel,//typescript/test/bazel/ambiant,//typescript/test/bazel/basic,//typescript/test/bazel/directory,//typescript/test/bazel/json,//typescript/test/bazel/jsx,//typescript/test/bazel/paths,//typescript/test/bazel/reference,//typescript/test/bazel/source-map,//typescript/test/bazel/tslib,//webpack/test/bazel/basic,//webpack/test/bazel/server,@files//files,@files//files/angular,@files//files/angular/doc,@files//files/angular/js-compiler,@files//files/angular/resource-compiler,@files//files/angular/test,@files//files/angular/test/bazel,@files//files/angular/test/bazel/basic,@files//files/angular/test/bazel/material,@files//files/bazel,@files//files/bazel/runfiles,@files//files/bazel/worker,@files//files/commonjs,@files//files/commonjs/doc,@files//files/commonjs/manifest,@files//files/commonjs/package,@files//files/commonjs/test,@files//files/commonjs/test/bazel/directory,@files//files/eslint,@files//files/eslint/doc,@files//files/eslint/linter,@files//files/ibazel/notification,@files//files/javascript,@files//files/javascript/doc,@files//files/javascript/test,@files//files/javascript/test/bazel/directory,@files//files/javascript/test/bazel/system-lib,@files//files/jest,@files//files/jest/config,@files//files/jest/doc,@files//files/jest/test,@files//files/jest/test/bazel,@files//files/jest/test/bazel/basic,@files//files/jest/test/bazel/dep,@files//files/jest/test/bazel/shard,@files//files/jest/test/bazel/snapshot,@files//files/jest/test/bazel/tools,@files//files/jest/test/bazel/transform,@files//files/nodejs,@files//files/nodejs/default,@files//files/nodejs/doc,@files//files/nodejs/esm-linker,@files//files/nodejs/fs-linker,@files//files/nodejs/module-linker,@files//files/nodejs/resolve,@files//files/nodejs/runtime,@files//files/nodejs/test,@files//files/nodejs/test/bazel/binary,@files//files/nodejs/test/bazel/binary-archive,@files//files/nodejs/test/bazel/dep,@files//files/nodejs/test/bazel/dep/other,@files//files/nodejs/test/bazel/dep/process,@files//files/nodejs/test/bazel/esm,@files//files/nodejs/test/bazel/gen,@files//files/nodejs/test/bazel/module-details,@files//files/nodejs/test/bazel/modules-binary,@files//files/npm,@files//files/npm/doc,@files//files/npm/test,@files//files/npm/test/bazel/alias,@files//files/npm/test/bazel/audit,@files//files/npm/test/bazel/yarn,@files//files/npm/yarn-resolve,@files//files/prettier,@files//files/prettier/doc,@files//files/prettier/format,@files//files/prettier/test,@files//files/prettier/test/bazel/plugin,@files//files/protobuf,@files//files/protobuf/doc,@files//files/protobuf/test/basic,@files//files/protobufjs,@files//files/protobufjs/doc,@files//files/protobufjs/test/basic,@files//files/rollup,@files//files/rollup/config,@files//files/rollup/doc,@files//files/rollup/test,@files//files/rollup/test/bazel/basic,@files//files/rules,@files//files/rules/doc,@files//files/test,@files//files/third-party,@files//files/tools/bazel,@files//files/tools/buildifier,@files//files/tools/doc,@files//files/tools/eslint,@files//files/tools/file,@files//files/tools/javascript,@files//files/tools/lint,@files//files/tools/nodejs,@files//files/tools/npm,@files//files/tools/prettier,@files//files/tools/stardoc,@files//files/tools/typescript,@files//files/ts-proto,@files//files/ts-proto/doc,@files//files/ts-proto/test,@files//files/ts-proto/test/bazel,@files//files/ts-proto/test/bazel/basic,@files//files/typescript,@files//files/typescript/config,@files//files/typescript/default,@files//files/typescript/doc,@files//files/typescript/js-compiler,@files//files/typescript/test,@files//files/typescript/test/bazel,@files//files/typescript/test/bazel/ambiant,@files//files/typescript/test/bazel/basic,@files//files/typescript/test/bazel/directory,@files//files/typescript/test/bazel/json,@files//files/typescript/test/bazel/jsx,@files//files/typescript/test/bazel/paths,@files//files/typescript/test/bazel/reference,@files//files/typescript/test/bazel/source-map,@files//files/typescript/test/bazel/tslib,@files//files/util,@files//files/util/cache,@files//files/util/json,@files//files/util/starlark,@files//files/util/util,@files//files/webpack,@files//files/webpack/config,@files//files/webpack/default,@files//files/webpack/doc,@files//files/webpack/load-config,@files//files/webpack/runtime,@files//files/webpack/server,@files//files/webpack/test,@files//files/webpack/test/bazel/basic,@files//files/webpack/test/bazel/server
diff --git a/tools/npm/npm.bzl b/tools/npm/npm.bzl
index b7fb932c..53ebf60d 100644
--- a/tools/npm/npm.bzl
+++ b/tools/npm/npm.bzl
@@ -4753,6 +4753,21 @@ PACKAGES = {
"name": "@npmcli/move-file",
"url": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
},
+ "@prettier/plugin-xml@3.2.2-dc3fc578": {
+ "deps": [
+ {
+ "id": "@xml-tools/parser@1.0.11",
+ },
+ {
+ "id": "prettier@3.1.1",
+ },
+ ],
+ "extra_deps": {
+ },
+ "integrity": "sha512-SoE70SQF1AKIvK7LVK80JcdAe6wrDcbodFFjcoqb1FkOqV0G0oSlgAFDwoRXPqkUE5p/YF2nGsnUbnfm6471sw==",
+ "name": "@prettier/plugin-xml",
+ "url": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-3.2.2.tgz",
+ },
"@protobufjs/aspromise@1.1.2": {
"deps": [
],
@@ -5746,6 +5761,18 @@ PACKAGES = {
"name": "@typescript-eslint/visitor-keys",
"url": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz",
},
+ "@xml-tools/parser@1.0.11": {
+ "deps": [
+ {
+ "id": "chevrotain@7.1.1",
+ },
+ ],
+ "extra_deps": {
+ },
+ "integrity": "sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==",
+ "name": "@xml-tools/parser",
+ "url": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.11.tgz",
+ },
"@yarnpkg/cli@3.3.0": {
"deps": [
{
@@ -9808,6 +9835,18 @@ PACKAGES = {
"name": "character-reference-invalid",
"url": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
},
+ "chevrotain@7.1.1": {
+ "deps": [
+ {
+ "id": "regexp-to-ast@0.5.0",
+ },
+ ],
+ "extra_deps": {
+ },
+ "integrity": "sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==",
+ "name": "chevrotain",
+ "url": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.1.1.tgz",
+ },
"chevrotain@9.1.0": {
"deps": [
{
@@ -15275,13 +15314,10 @@ PACKAGES = {
"name": "prelude-ls",
"url": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
},
- "prettier-plugin-organize-imports@3.2.1-dc3fc578": {
+ "prettier-plugin-organize-imports@3.2.4-dc3fc578": {
"deps": [
{
- "id": "@types/prettier@2.4.2",
- },
- {
- "id": "prettier@2.5.1",
+ "id": "prettier@3.1.1",
},
{
"id": "typescript@5.0.4-6832550a",
@@ -15289,9 +15325,9 @@ PACKAGES = {
],
"extra_deps": {
},
- "integrity": "sha512-bty7C2Ecard5EOXirtzeCAqj4FU4epeuWrQt/Z+sh8UVEpBlBZ3m3KNPz2kFu7KgRTQx/C9o4/TdquPD1jOqjQ==",
+ "integrity": "sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==",
"name": "prettier-plugin-organize-imports",
- "url": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.1.tgz",
+ "url": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz",
},
"prettier@2.5.1": {
"deps": [
@@ -15302,6 +15338,15 @@ PACKAGES = {
"name": "prettier",
"url": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
},
+ "prettier@3.1.1": {
+ "deps": [
+ ],
+ "extra_deps": {
+ },
+ "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
+ "name": "prettier",
+ "url": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+ },
"pretty-bytes@5.6.0": {
"deps": [
],
@@ -17719,6 +17764,10 @@ ROOTS = [
"id": "@babel/plugin-transform-modules-commonjs@7.18.6-dc3fc578",
"name": "@babel/plugin-transform-modules-commonjs",
},
+ {
+ "id": "@prettier/plugin-xml@3.2.2-dc3fc578",
+ "name": "@prettier/plugin-xml",
+ },
{
"id": "@rollup/plugin-commonjs@16.0.0-dc3fc578",
"name": "@rollup/plugin-commonjs",
@@ -17751,10 +17800,6 @@ ROOTS = [
"id": "@types/node@18.16.3",
"name": "@types/node",
},
- {
- "id": "@types/prettier@2.4.2",
- "name": "@types/prettier",
- },
{
"id": "@types/react@15.0.39",
"name": "@types/react",
@@ -17840,11 +17885,11 @@ ROOTS = [
"name": "npm-registry-fetch",
},
{
- "id": "prettier-plugin-organize-imports@3.2.1-dc3fc578",
+ "id": "prettier-plugin-organize-imports@3.2.4-dc3fc578",
"name": "prettier-plugin-organize-imports",
},
{
- "id": "prettier@2.5.1",
+ "id": "prettier@3.1.1",
"name": "prettier",
},
{
diff --git a/tools/prettier/BUILD.bazel b/tools/prettier/BUILD.bazel
index 4f5574dd..71930767 100644
--- a/tools/prettier/BUILD.bazel
+++ b/tools/prettier/BUILD.bazel
@@ -4,6 +4,5 @@ configure_prettier(
name = "prettier",
config = "prettierrc.yml",
config_dep = "//:prettier_config",
- plugins = ["@npm//prettier-plugin-organize-imports:lib"],
visibility = ["//:__subpackages__"],
)
diff --git a/util/starlark/src/index.ts b/util/starlark/src/index.ts
index 6b58fc29..e1fb4a7a 100644
--- a/util/starlark/src/index.ts
+++ b/util/starlark/src/index.ts
@@ -25,7 +25,10 @@ export class StarlarkVariable {
}
export class StarlarkEqualStatement {
- constructor(readonly left: StarlarkVariable, readonly right: StarlarkValue) {}
+ constructor(
+ readonly left: StarlarkVariable,
+ readonly right: StarlarkValue,
+ ) {}
}
export type StarlarkStatement = StarlarkEqualStatement;
diff --git a/yarn.lock b/yarn.lock
index f9b9582f..1cbf7d8e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2474,6 +2474,17 @@ __metadata:
languageName: node
linkType: hard
+"@prettier/plugin-xml@npm:^3":
+ version: 3.2.2
+ resolution: "@prettier/plugin-xml@npm:3.2.2"
+ dependencies:
+ "@xml-tools/parser": ^1.0.11
+ peerDependencies:
+ prettier: ^3.0.0
+ checksum: 90200a554bb00042240560b1982f1a7e2314ec68ae21fbbe0dd12a5dc3fe0e716a42127386231ee3e032129a34ac4053541ac54b4696b14678f6c1934297805b
+ languageName: node
+ linkType: hard
+
"@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2":
version: 1.1.2
resolution: "@protobufjs/aspromise@npm:1.1.2"
@@ -2920,7 +2931,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/prettier@npm:^2.1.5, @types/prettier@npm:~2.4.0":
+"@types/prettier@npm:^2.1.5":
version: 2.4.2
resolution: "@types/prettier@npm:2.4.2"
checksum: 76e230b2d11028af11fe12e09b2d5b10b03738e9abf819ae6ebb0f78cac13d39f860755ce05ac3855b608222518d956628f5d00322dc206cc6d1f2d8d1519f1e
@@ -3124,6 +3135,15 @@ __metadata:
languageName: node
linkType: hard
+"@xml-tools/parser@npm:^1.0.11":
+ version: 1.0.11
+ resolution: "@xml-tools/parser@npm:1.0.11"
+ dependencies:
+ chevrotain: 7.1.1
+ checksum: 79f32386ef935c1ba65d421e36b556fb14593c7b7e5ca99160ec8ec6dba912a00be6c32d0ab8bad35f82cb5640c05f1a8cfd1d227d563aed20ecc57d678ceab2
+ languageName: node
+ linkType: hard
+
"@yarnpkg/cli@npm:*, @yarnpkg/cli@npm:^3.0.0":
version: 3.3.0
resolution: "@yarnpkg/cli@npm:3.3.0"
@@ -4248,6 +4268,15 @@ __metadata:
languageName: node
linkType: hard
+"chevrotain@npm:7.1.1":
+ version: 7.1.1
+ resolution: "chevrotain@npm:7.1.1"
+ dependencies:
+ regexp-to-ast: 0.5.0
+ checksum: 3ba268b745b89674712930f5d5b212f0bae6218309a05e1f89301384a9a2e8482429c83b9c52f38e536c38bb1940a53c2c0e6149e15277ea6bc6a1307528474d
+ languageName: node
+ linkType: hard
+
"chevrotain@npm:^9.1.0":
version: 9.1.0
resolution: "chevrotain@npm:9.1.0"
@@ -7791,9 +7820,9 @@ __metadata:
languageName: node
linkType: hard
-"prettier-plugin-organize-imports@npm:^3.0.0":
- version: 3.2.1
- resolution: "prettier-plugin-organize-imports@npm:3.2.1"
+"prettier-plugin-organize-imports@npm:^3":
+ version: 3.2.4
+ resolution: "prettier-plugin-organize-imports@npm:3.2.4"
peerDependencies:
"@volar/vue-language-plugin-pug": ^1.0.4
"@volar/vue-typescript": ^1.0.4
@@ -7804,11 +7833,11 @@ __metadata:
optional: true
"@volar/vue-typescript":
optional: true
- checksum: 57d0539e26ed6a1f5de6bdf390f8371a5637824bf6bb269d3a50c5c77ed4bdc3cdb97a797243baf6c2d65aa1bbda0b2307e55ab67dc639331c187b8d183bcdaa
+ checksum: 57ae97d7e403445e650ae92b7da586761d1d88a47e46b3ea274baeb96782165bebd0132db9c652081e185c41b50701ba1d30d615ad1c9000300cc0c67eb12b7a
languageName: node
linkType: hard
-"prettier@npm:^2.0.2, prettier@npm:~2.5.0":
+"prettier@npm:^2.0.2":
version: 2.5.1
resolution: "prettier@npm:2.5.1"
bin:
@@ -7817,6 +7846,15 @@ __metadata:
languageName: node
linkType: hard
+"prettier@npm:^3":
+ version: 3.1.1
+ resolution: "prettier@npm:3.1.1"
+ bin:
+ prettier: bin/prettier.cjs
+ checksum: e386855e3a1af86a748e16953f168be555ce66d6233f4ba54eb6449b88eb0c6b2ca79441b11eae6d28a7f9a5c96440ce50864b9d5f6356d331d39d6bb66c648e
+ languageName: node
+ linkType: hard
+
"pretty-bytes@npm:^5.1.0":
version: 5.6.0
resolution: "pretty-bytes@npm:5.6.0"
@@ -8307,6 +8345,7 @@ __metadata:
"@angular/platform-browser-dynamic": ^16
"@babel/core": 7.18.13
"@babel/plugin-transform-modules-commonjs": 7.18.6
+ "@prettier/plugin-xml": ^3
"@rollup/plugin-commonjs": ~16.0.0
"@rollup/plugin-node-resolve": ^15.0.0
"@types/argparse": ~2.0.0
@@ -8315,7 +8354,6 @@ __metadata:
"@types/long": ~4.0.0
"@types/node": ^18
"@types/node-fetch": ^2.0.0
- "@types/prettier": ~2.4.0
"@types/react": ~15.0.0
"@types/tar-stream": ~2.2.0
"@typescript-eslint/eslint-plugin": ^5.59.0
@@ -8337,8 +8375,8 @@ __metadata:
long: ~4.0.0
node-fetch: ^2.0.0
npm-registry-fetch: ~14.0.2
- prettier: ~2.5.0
- prettier-plugin-organize-imports: ^3.0.0
+ prettier: ^3
+ prettier-plugin-organize-imports: ^3
protobufjs: ~6.11.2
reflect-metadata: 0.1.13
rollup: ^2.78.0