aboutsummaryrefslogtreecommitdiff
path: root/pw_web
diff options
context:
space:
mode:
authorRob Mohr <mohrr@google.com>2023-09-21 18:03:37 +0000
committerCQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-09-21 18:03:37 +0000
commit2260430432a66e60ea5918322ec56824c6860e9e (patch)
tree6bb93b3af2631f4b4e8f9ca38c246ae24e6b833d /pw_web
parentcc0d6fac9ed9aa2c2dfc266cf679fe3c105bac08 (diff)
downloadpigweed-2260430432a66e60ea5918322ec56824c6860e9e.tar.gz
pw_presubmit: Add JSON formatter
Change-Id: I0d95873a340ee31eacc41e07a40ac8a246c934aa Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/171991 Reviewed-by: Wyatt Hepler <hepler@google.com> Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com> Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Diffstat (limited to 'pw_web')
-rw-r--r--pw_web/log-viewer/src/custom/log_data.json38
-rw-r--r--pw_web/log-viewer/tsconfig.json45
-rw-r--r--pw_web/webconsole/tsconfig.json16
3 files changed, 74 insertions, 25 deletions
diff --git a/pw_web/log-viewer/src/custom/log_data.json b/pw_web/log-viewer/src/custom/log_data.json
index 28d9af187..d006386d3 100644
--- a/pw_web/log-viewer/src/custom/log_data.json
+++ b/pw_web/log-viewer/src/custom/log_data.json
@@ -1,5 +1,37 @@
[
- {"message": "Sample log_data.json", "levelno": 30, "levelname": "WRN", "time": "1692302986.4599075", "time_string": "2023-08-17T13:09:46", "fields": {"module": "pigweedjs", "timestamp": "1.0"}},
- {"message": "Log message 1", "levelno": 20, "levelname": "INF", "time": "1692302986.4599075", "time_string": "2023-08-17T13:09:46", "fields": {"module": "device", "file": "sample_file.cc", "timestamp": "1.0"}},
- {"message": "Log message 2", "levelno": 20, "levelname": "INF", "time": "1692303000.1080465", "time_string": "2023-08-17T13:10:00", "fields": {"module": "device", "file": "sample_file.cc", "timestamp": "14.0"}}
+ {
+ "message": "Sample log_data.json",
+ "levelno": 30,
+ "levelname": "WRN",
+ "time": "1692302986.4599075",
+ "time_string": "2023-08-17T13:09:46",
+ "fields": {
+ "module": "pigweedjs",
+ "timestamp": "1.0"
+ }
+ },
+ {
+ "message": "Log message 1",
+ "levelno": 20,
+ "levelname": "INF",
+ "time": "1692302986.4599075",
+ "time_string": "2023-08-17T13:09:46",
+ "fields": {
+ "module": "device",
+ "file": "sample_file.cc",
+ "timestamp": "1.0"
+ }
+ },
+ {
+ "message": "Log message 2",
+ "levelno": 20,
+ "levelname": "INF",
+ "time": "1692303000.1080465",
+ "time_string": "2023-08-17T13:10:00",
+ "fields": {
+ "module": "device",
+ "file": "sample_file.cc",
+ "timestamp": "14.0"
+ }
+ }
]
diff --git a/pw_web/log-viewer/tsconfig.json b/pw_web/log-viewer/tsconfig.json
index 9d2a10f2a..bfb2b5c72 100644
--- a/pw_web/log-viewer/tsconfig.json
+++ b/pw_web/log-viewer/tsconfig.json
@@ -1,21 +1,28 @@
{
- "compilerOptions": {
- "target": "ES2021",
- "experimentalDecorators": true,
- "useDefineForClassFields": false,
- "module": "ESNext",
- "lib": ["ES2021", "DOM", "DOM.Iterable"],
- "skipLibCheck": true,
- "moduleResolution": "bundler",
- "allowImportingTsExtensions": true,
- "resolveJsonModule": true,
- "isolatedModules": true,
- "noEmit": true,
- "strict": true,
- "noUnusedLocals": true,
- "noUnusedParameters": true,
- "noFallthroughCasesInSwitch": true,
- "incremental": true
- },
- "include": ["src/**/*", "src/createLogViewer.ts"]
+ "compilerOptions": {
+ "target": "ES2021",
+ "experimentalDecorators": true,
+ "useDefineForClassFields": false,
+ "module": "ESNext",
+ "lib": [
+ "ES2021",
+ "DOM",
+ "DOM.Iterable"
+ ],
+ "skipLibCheck": true,
+ "moduleResolution": "bundler",
+ "allowImportingTsExtensions": true,
+ "resolveJsonModule": true,
+ "isolatedModules": true,
+ "noEmit": true,
+ "strict": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "noFallthroughCasesInSwitch": true,
+ "incremental": true
+ },
+ "include": [
+ "src/**/*",
+ "src/createLogViewer.ts"
+ ]
}
diff --git a/pw_web/webconsole/tsconfig.json b/pw_web/webconsole/tsconfig.json
index 99710e857..e6bb8eb43 100644
--- a/pw_web/webconsole/tsconfig.json
+++ b/pw_web/webconsole/tsconfig.json
@@ -1,7 +1,11 @@
{
"compilerOptions": {
"target": "es5",
- "lib": ["dom", "dom.iterable", "esnext"],
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "esnext"
+ ],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
@@ -15,6 +19,12 @@
"jsx": "preserve",
"incremental": true
},
- "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
- "exclude": ["node_modules"]
+ "include": [
+ "next-env.d.ts",
+ "**/*.ts",
+ "**/*.tsx"
+ ],
+ "exclude": [
+ "node_modules"
+ ]
}