scouting: Migrate to using npm-style packages for deps
Using the npm style for tracking dependencies makes it easier to write
common modules that our existing modules can import.
I was trying to set up a shared `Pipe` class for some modules and
couldn't work around this issue:
scouting/www/entry/entry.module.ts:10:13 - error NG3004: Unable to import class PipeModule.
The file /dev/shm/bazel-sandbox.62240ff599163761312fdbd652f7452abc23edc253dee6214f406f29dde5568b/linux-sandbox/192/execroot/org_frc971/bazel-out/k8-fastbuild/bin/scouting/www/pipes/pipes.module.d.ts is outside of the configured 'rootDir'.
10 exports: [PipeModule, EntryComponent],
The simplest way to work around it is by using npm modules everywhere.
This meant that I had to convert the existing fbs messages into an npm
module too.
There should be no functional changes.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: I4813fd304302a8bd664443023ef21aa147b80d2e
diff --git a/scouting/webserver/requests/messages/BUILD b/scouting/webserver/requests/messages/BUILD
index d0534a51..6dee54d 100644
--- a/scouting/webserver/requests/messages/BUILD
+++ b/scouting/webserver/requests/messages/BUILD
@@ -1,3 +1,4 @@
+load("@aspect_rules_js//npm:defs.bzl", "npm_package")
load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_go_library")
load("@com_github_google_flatbuffers//:typescript.bzl", "flatbuffer_ts_library")
@@ -60,3 +61,14 @@
visibility = ["//visibility:public"],
),
) for name in FILE_NAMES]
+
+npm_package(
+ name = "messages",
+ srcs = [
+ ":package.json",
+ ] + [
+ ":{}_ts_fbs_ts".format(lib)
+ for lib in FILE_NAMES
+ ],
+ visibility = ["//visibility:public"],
+)
diff --git a/scouting/webserver/requests/messages/package.json b/scouting/webserver/requests/messages/package.json
new file mode 100644
index 0000000..323b3c4
--- /dev/null
+++ b/scouting/webserver/requests/messages/package.json
@@ -0,0 +1,6 @@
+{
+ "name": "@org_frc971/scouting/webserver/requests/messages",
+ "private": true,
+ "dependencies": {
+ }
+}
diff --git a/scouting/www/BUILD b/scouting/www/BUILD
index a6ca0a1..46742e3 100644
--- a/scouting/www/BUILD
+++ b/scouting/www/BUILD
@@ -36,16 +36,7 @@
"assets/971_144.png",
],
deps = [
- "//:node_modules/@angular/animations",
- "//:node_modules/@angular/service-worker",
- "//scouting/www/driver_ranking",
- "//scouting/www/entry",
- "//scouting/www/match_list",
- "//scouting/www/notes",
- "//scouting/www/pit_scouting",
- "//scouting/www/scan",
- "//scouting/www/shift_schedule",
- "//scouting/www/view",
+ ":node_modules",
],
)
diff --git a/scouting/www/app/app.module.ts b/scouting/www/app/app.module.ts
index decd1f3..fdbf6fa 100644
--- a/scouting/www/app/app.module.ts
+++ b/scouting/www/app/app.module.ts
@@ -4,14 +4,14 @@
import {ServiceWorkerModule} from '@angular/service-worker';
import {App} from './app';
-import {EntryModule} from '../entry';
-import {MatchListModule} from '../match_list';
-import {NotesModule} from '../notes';
-import {ShiftScheduleModule} from '../shift_schedule';
-import {ViewModule} from '../view';
-import {DriverRankingModule} from '../driver_ranking';
-import {PitScoutingModule} from '../pit_scouting';
-import {ScanModule} from '../scan';
+import {EntryModule} from '@org_frc971/scouting/www/entry';
+import {MatchListModule} from '@org_frc971/scouting/www/match_list';
+import {NotesModule} from '@org_frc971/scouting/www/notes';
+import {ShiftScheduleModule} from '@org_frc971/scouting/www/shift_schedule';
+import {ViewModule} from '@org_frc971/scouting/www/view';
+import {DriverRankingModule} from '@org_frc971/scouting/www/driver_ranking';
+import {PitScoutingModule} from '@org_frc971/scouting/www/pit_scouting';
+import {ScanModule} from '@org_frc971/scouting/www/scan';
@NgModule({
declarations: [App],
diff --git a/scouting/www/driver_ranking/BUILD b/scouting/www/driver_ranking/BUILD
index a934ffe..1565dad 100644
--- a/scouting/www/driver_ranking/BUILD
+++ b/scouting/www/driver_ranking/BUILD
@@ -9,9 +9,7 @@
"//scouting/www:app_common_css",
],
deps = [
- ":node_modules/@angular/forms",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "//scouting/webserver/requests/messages:submit_driver_ranking_ts_fbs",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/driver_ranking/driver_ranking.component.ts b/scouting/www/driver_ranking/driver_ranking.component.ts
index 09f62c2..2148b63 100644
--- a/scouting/www/driver_ranking/driver_ranking.component.ts
+++ b/scouting/www/driver_ranking/driver_ranking.component.ts
@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {SubmitDriverRanking} from '../../webserver/requests/messages/submit_driver_ranking_generated';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
+import {SubmitDriverRanking} from '@org_frc971/scouting/webserver/requests/messages/submit_driver_ranking_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
// TeamSelection: Display form to input which
// teams to rank and the match number.
diff --git a/scouting/www/driver_ranking/package.json b/scouting/www/driver_ranking/package.json
index 38d9358..73b6f6b 100644
--- a/scouting/www/driver_ranking/package.json
+++ b/scouting/www/driver_ranking/package.json
@@ -2,6 +2,7 @@
"name": "@org_frc971/scouting/www/driver_ranking",
"private": true,
"dependencies": {
- "@angular/forms": "v16-lts"
+ "@angular/forms": "v16-lts",
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*"
}
}
diff --git a/scouting/www/entry/BUILD b/scouting/www/entry/BUILD
index 48732f9..6bffbf8 100644
--- a/scouting/www/entry/BUILD
+++ b/scouting/www/entry/BUILD
@@ -9,15 +9,7 @@
"//scouting/www:app_common_css",
],
deps = [
- ":node_modules/@angular/forms",
- "//:node_modules/@angular/platform-browser",
- "//:node_modules/@types/pako",
- "//:node_modules/angularx-qrcode",
- "//:node_modules/pako",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_matches_response_ts_fbs",
- "//scouting/webserver/requests/messages:submit_2024_actions_ts_fbs",
- "//scouting/www/rpc",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/entry/entry.component.ts b/scouting/www/entry/entry.component.ts
index 21fd474..b1d84b7 100644
--- a/scouting/www/entry/entry.component.ts
+++ b/scouting/www/entry/entry.component.ts
@@ -9,7 +9,7 @@
} from '@angular/core';
import {FormsModule} from '@angular/forms';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
import {
StartMatchAction,
ScoreType,
@@ -23,9 +23,9 @@
EndMatchAction,
ActionType,
Action,
-} from '../../webserver/requests/messages/submit_2024_actions_generated';
-import {Match} from '../../webserver/requests/messages/request_all_matches_response_generated';
-import {MatchListRequestor} from '../rpc';
+} from '@org_frc971/scouting/webserver/requests/messages/submit_2024_actions_generated';
+import {Match} from '@org_frc971/scouting/webserver/requests/messages/request_all_matches_response_generated';
+import {MatchListRequestor} from '@org_frc971/scouting/www/rpc';
import * as pako from 'pako';
type Section =
diff --git a/scouting/www/entry/entry.module.ts b/scouting/www/entry/entry.module.ts
index bcba4ee..df92042 100644
--- a/scouting/www/entry/entry.module.ts
+++ b/scouting/www/entry/entry.module.ts
@@ -1,4 +1,4 @@
-import {NgModule, Pipe, PipeTransform} from '@angular/core';
+import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {EntryComponent} from './entry.component';
diff --git a/scouting/www/entry/package.json b/scouting/www/entry/package.json
index 4d30551..39479f4 100644
--- a/scouting/www/entry/package.json
+++ b/scouting/www/entry/package.json
@@ -2,8 +2,12 @@
"name": "@org_frc971/scouting/www/entry",
"private": true,
"dependencies": {
+ "angularx-qrcode": "^16.0.2",
"pako": "2.1.0",
+ "@angular/forms": "v16-lts",
+ "@angular/platform-browser": "v16-lts",
"@types/pako": "2.0.3",
- "@angular/forms": "v16-lts"
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*",
+ "@org_frc971/scouting/www/rpc": "workspace:*"
}
}
diff --git a/scouting/www/match_list/BUILD b/scouting/www/match_list/BUILD
index b2128db..2ff4fee 100644
--- a/scouting/www/match_list/BUILD
+++ b/scouting/www/match_list/BUILD
@@ -9,11 +9,7 @@
"//scouting/www:app_common_css",
],
deps = [
- ":node_modules/@angular/forms",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_matches_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_matches_ts_fbs",
- "//scouting/www/rpc",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/match_list/match_list.component.ts b/scouting/www/match_list/match_list.component.ts
index 8fafdce..35165d5 100644
--- a/scouting/www/match_list/match_list.component.ts
+++ b/scouting/www/match_list/match_list.component.ts
@@ -1,13 +1,13 @@
import {Component, EventEmitter, OnInit, Output} from '@angular/core';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
-import {RequestAllMatches} from '../../webserver/requests/messages/request_all_matches_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
+import {RequestAllMatches} from '@org_frc971/scouting/webserver/requests/messages/request_all_matches_generated';
import {
Match,
RequestAllMatchesResponse,
-} from '../../webserver/requests/messages/request_all_matches_response_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_all_matches_response_generated';
-import {MatchListRequestor} from '../rpc';
+import {MatchListRequestor} from '@org_frc971/scouting/www/rpc';
type TeamInMatch = {
teamNumber: string;
diff --git a/scouting/www/match_list/package.json b/scouting/www/match_list/package.json
index 00977c5..77d2dc5 100644
--- a/scouting/www/match_list/package.json
+++ b/scouting/www/match_list/package.json
@@ -2,6 +2,7 @@
"name": "@org_frc971/scouting/www/match_list",
"private": true,
"dependencies": {
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*",
"@org_frc971/scouting/www/rpc": "workspace:*",
"@angular/forms": "v16-lts"
}
diff --git a/scouting/www/notes/BUILD b/scouting/www/notes/BUILD
index 64e4ae7..59c508e 100644
--- a/scouting/www/notes/BUILD
+++ b/scouting/www/notes/BUILD
@@ -9,12 +9,7 @@
"//scouting/www:app_common_css",
],
deps = [
- ":node_modules/@angular/forms",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_notes_for_team_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_notes_for_team_ts_fbs",
- "//scouting/webserver/requests/messages:submit_notes_response_ts_fbs",
- "//scouting/webserver/requests/messages:submit_notes_ts_fbs",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/notes/notes.component.ts b/scouting/www/notes/notes.component.ts
index 431ec71..6263d37 100644
--- a/scouting/www/notes/notes.component.ts
+++ b/scouting/www/notes/notes.component.ts
@@ -1,13 +1,13 @@
import {Component, HostListener} from '@angular/core';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
-import {RequestNotesForTeam} from '../../webserver/requests/messages/request_notes_for_team_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
+import {RequestNotesForTeam} from '@org_frc971/scouting/webserver/requests/messages/request_notes_for_team_generated';
import {
Note as NoteFb,
RequestNotesForTeamResponse,
-} from '../../webserver/requests/messages/request_notes_for_team_response_generated';
-import {SubmitNotes} from '../../webserver/requests/messages/submit_notes_generated';
-import {SubmitNotesResponse} from '../../webserver/requests/messages/submit_notes_response_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_notes_for_team_response_generated';
+import {SubmitNotes} from '@org_frc971/scouting/webserver/requests/messages/submit_notes_generated';
+import {SubmitNotesResponse} from '@org_frc971/scouting/webserver/requests/messages/submit_notes_response_generated';
/*
For new games, the keywords being used will likely need to be updated.
diff --git a/scouting/www/notes/package.json b/scouting/www/notes/package.json
index f1ad3ae..5961469 100644
--- a/scouting/www/notes/package.json
+++ b/scouting/www/notes/package.json
@@ -2,6 +2,7 @@
"name": "@org_frc971/scouting/www/notes",
"private": true,
"dependencies": {
- "@angular/forms": "v16-lts"
+ "@angular/forms": "v16-lts",
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*"
}
}
diff --git a/scouting/www/package.json b/scouting/www/package.json
index 3ab0035..80fa5c9 100644
--- a/scouting/www/package.json
+++ b/scouting/www/package.json
@@ -1,4 +1,15 @@
{
"private": true,
- "dependencies": {}
+ "dependencies": {
+ "@angular/animations": "v16-lts",
+ "@angular/service-worker": "v16-lts",
+ "@org_frc971/scouting/www/driver_ranking": "workspace:*",
+ "@org_frc971/scouting/www/entry": "workspace:*",
+ "@org_frc971/scouting/www/match_list": "workspace:*",
+ "@org_frc971/scouting/www/notes": "workspace:*",
+ "@org_frc971/scouting/www/pit_scouting": "workspace:*",
+ "@org_frc971/scouting/www/scan": "workspace:*",
+ "@org_frc971/scouting/www/shift_schedule": "workspace:*",
+ "@org_frc971/scouting/www/view": "workspace:*"
+ }
}
diff --git a/scouting/www/pit_scouting/BUILD b/scouting/www/pit_scouting/BUILD
index 740dee1..cfaf5d4 100644
--- a/scouting/www/pit_scouting/BUILD
+++ b/scouting/www/pit_scouting/BUILD
@@ -9,10 +9,7 @@
"//scouting/www:app_common_css",
],
deps = [
- ":node_modules/@angular/forms",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "//scouting/webserver/requests/messages:submit_pit_image_response_ts_fbs",
- "//scouting/webserver/requests/messages:submit_pit_image_ts_fbs",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/pit_scouting/package.json b/scouting/www/pit_scouting/package.json
index f41150f..2eb2783 100644
--- a/scouting/www/pit_scouting/package.json
+++ b/scouting/www/pit_scouting/package.json
@@ -2,6 +2,7 @@
"name": "@org_frc971/scouting/www/pit_scouting",
"private": true,
"dependencies": {
- "@angular/forms": "v16-lts"
+ "@angular/forms": "v16-lts",
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*"
}
}
diff --git a/scouting/www/pit_scouting/pit_scouting.component.ts b/scouting/www/pit_scouting/pit_scouting.component.ts
index 7bb884c..294eca2 100644
--- a/scouting/www/pit_scouting/pit_scouting.component.ts
+++ b/scouting/www/pit_scouting/pit_scouting.component.ts
@@ -6,8 +6,8 @@
ViewChildren,
} from '@angular/core';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
-import {SubmitPitImage} from '../../webserver/requests/messages/submit_pit_image_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
+import {SubmitPitImage} from '@org_frc971/scouting/webserver/requests/messages/submit_pit_image_generated';
type Section = 'TeamSelection' | 'Data';
diff --git a/scouting/www/rpc/BUILD b/scouting/www/rpc/BUILD
index 592735c..66cba8d 100644
--- a/scouting/www/rpc/BUILD
+++ b/scouting/www/rpc/BUILD
@@ -10,18 +10,7 @@
],
generate_public_api = False,
deps = [
- "//:node_modules/dexie",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_2024_data_scouting_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_2024_data_scouting_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_driver_rankings_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_driver_rankings_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_matches_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_matches_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_notes_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_notes_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_pit_images_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_pit_images_ts_fbs",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/rpc/match_list_requestor.ts b/scouting/www/rpc/match_list_requestor.ts
index 0a812ce..97ed0b0 100644
--- a/scouting/www/rpc/match_list_requestor.ts
+++ b/scouting/www/rpc/match_list_requestor.ts
@@ -1,11 +1,11 @@
import {Injectable} from '@angular/core';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
-import {RequestAllMatches} from '../../webserver/requests/messages/request_all_matches_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
+import {RequestAllMatches} from '@org_frc971/scouting/webserver/requests/messages/request_all_matches_generated';
import {
Match,
RequestAllMatchesResponse,
-} from '../../webserver/requests/messages/request_all_matches_response_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_all_matches_response_generated';
import {db, MatchListData} from './db';
const MATCH_TYPE_ORDERING = ['qm', 'ef', 'qf', 'sf', 'f'];
@Injectable({providedIn: 'root'})
diff --git a/scouting/www/rpc/package.json b/scouting/www/rpc/package.json
index 6d1369a..bc9a662 100644
--- a/scouting/www/rpc/package.json
+++ b/scouting/www/rpc/package.json
@@ -1,4 +1,8 @@
{
"name": "@org_frc971/scouting/www/rpc",
- "private": true
+ "private": true,
+ "dependencies": {
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*",
+ "dexie": "^3.2.5"
+ }
}
diff --git a/scouting/www/rpc/view_data_requestor.ts b/scouting/www/rpc/view_data_requestor.ts
index 74fc212..606eef1 100644
--- a/scouting/www/rpc/view_data_requestor.ts
+++ b/scouting/www/rpc/view_data_requestor.ts
@@ -1,26 +1,26 @@
import {Injectable} from '@angular/core';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
-import {RequestAllNotes} from '../../webserver/requests/messages/request_all_notes_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
+import {RequestAllNotes} from '@org_frc971/scouting/webserver/requests/messages/request_all_notes_generated';
import {
Note,
RequestAllNotesResponse,
-} from '../../webserver/requests/messages/request_all_notes_response_generated';
-import {RequestAllDriverRankings} from '../../webserver/requests/messages/request_all_driver_rankings_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_all_notes_response_generated';
+import {RequestAllDriverRankings} from '@org_frc971/scouting/webserver/requests/messages/request_all_driver_rankings_generated';
import {
Ranking,
RequestAllDriverRankingsResponse,
-} from '../../webserver/requests/messages/request_all_driver_rankings_response_generated';
-import {Request2024DataScouting} from '../../webserver/requests/messages/request_2024_data_scouting_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_all_driver_rankings_response_generated';
+import {Request2024DataScouting} from '@org_frc971/scouting/webserver/requests/messages/request_2024_data_scouting_generated';
import {
PitImage,
RequestAllPitImagesResponse,
-} from '../../webserver/requests/messages/request_all_pit_images_response_generated';
-import {RequestAllPitImages} from '../../webserver/requests/messages/request_all_pit_images_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_all_pit_images_response_generated';
+import {RequestAllPitImages} from '@org_frc971/scouting/webserver/requests/messages/request_all_pit_images_generated';
import {
Stats2024,
Request2024DataScoutingResponse,
-} from '../../webserver/requests/messages/request_2024_data_scouting_response_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_2024_data_scouting_response_generated';
@Injectable({providedIn: 'root'})
export class ViewDataRequestor {
diff --git a/scouting/www/scan/BUILD b/scouting/www/scan/BUILD
index 88b2822..ee44b1f 100644
--- a/scouting/www/scan/BUILD
+++ b/scouting/www/scan/BUILD
@@ -9,10 +9,7 @@
"//scouting/www:app_common_css",
],
deps = [
- ":node_modules/@angular/forms",
- ":node_modules/@types/pako",
- ":node_modules/pako",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/scan/package.json b/scouting/www/scan/package.json
index a5950c3..7fa3990 100644
--- a/scouting/www/scan/package.json
+++ b/scouting/www/scan/package.json
@@ -4,6 +4,7 @@
"dependencies": {
"pako": "2.1.0",
"@types/pako": "2.0.3",
- "@angular/forms": "v16-lts"
+ "@angular/forms": "v16-lts",
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*"
}
}
diff --git a/scouting/www/scan/scan.component.ts b/scouting/www/scan/scan.component.ts
index 98a7b61..4a1c9c8 100644
--- a/scouting/www/scan/scan.component.ts
+++ b/scouting/www/scan/scan.component.ts
@@ -1,5 +1,5 @@
import {Component, NgZone, OnInit, ViewChild, ElementRef} from '@angular/core';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
import {Builder, ByteBuffer} from 'flatbuffers';
import * as pako from 'pako';
diff --git a/scouting/www/shift_schedule/BUILD b/scouting/www/shift_schedule/BUILD
index 3afb557..747ff98 100644
--- a/scouting/www/shift_schedule/BUILD
+++ b/scouting/www/shift_schedule/BUILD
@@ -9,10 +9,7 @@
"//scouting/www:app_common_css",
],
deps = [
- ":node_modules/@angular/forms",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_matches_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_matches_ts_fbs",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/shift_schedule/package.json b/scouting/www/shift_schedule/package.json
index f2d6d7e..a2ce384 100644
--- a/scouting/www/shift_schedule/package.json
+++ b/scouting/www/shift_schedule/package.json
@@ -2,6 +2,7 @@
"name": "@org_frc971/scouting/www/shift_schedule",
"private": true,
"dependencies": {
- "@angular/forms": "v16-lts"
+ "@angular/forms": "v16-lts",
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*"
}
}
diff --git a/scouting/www/shift_schedule/shift_schedule.component.ts b/scouting/www/shift_schedule/shift_schedule.component.ts
index de0b2e1..316830c 100644
--- a/scouting/www/shift_schedule/shift_schedule.component.ts
+++ b/scouting/www/shift_schedule/shift_schedule.component.ts
@@ -1,6 +1,6 @@
import {Component, OnInit} from '@angular/core';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
@Component({
selector: 'shift-schedule',
diff --git a/scouting/www/view/BUILD b/scouting/www/view/BUILD
index 738ea00..d967882 100644
--- a/scouting/www/view/BUILD
+++ b/scouting/www/view/BUILD
@@ -9,17 +9,7 @@
"//scouting/www:app_common_css",
],
deps = [
- ":node_modules/@angular/forms",
- "//scouting/webserver/requests/messages:delete_2024_data_scouting_response_ts_fbs",
- "//scouting/webserver/requests/messages:delete_2024_data_scouting_ts_fbs",
- "//scouting/webserver/requests/messages:error_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_2024_data_scouting_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_2024_data_scouting_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_driver_rankings_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_driver_rankings_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_notes_response_ts_fbs",
- "//scouting/webserver/requests/messages:request_all_notes_ts_fbs",
- "//scouting/www/rpc",
- "@com_github_google_flatbuffers//ts:flatbuffers_ts",
+ ":node_modules",
+ "//:node_modules/flatbuffers",
],
)
diff --git a/scouting/www/view/package.json b/scouting/www/view/package.json
index d214f6f..efcbd8a 100644
--- a/scouting/www/view/package.json
+++ b/scouting/www/view/package.json
@@ -2,6 +2,8 @@
"name": "@org_frc971/scouting/www/view",
"private": true,
"dependencies": {
- "@angular/forms": "v16-lts"
+ "@angular/forms": "v16-lts",
+ "@org_frc971/scouting/webserver/requests/messages": "workspace:*",
+ "@org_frc971/scouting/www/rpc": "workspace:*"
}
}
diff --git a/scouting/www/view/view.component.ts b/scouting/www/view/view.component.ts
index ea9a61f..8aa3784 100644
--- a/scouting/www/view/view.component.ts
+++ b/scouting/www/view/view.component.ts
@@ -1,28 +1,31 @@
import {Component, OnInit} from '@angular/core';
import {Builder, ByteBuffer} from 'flatbuffers';
-import {ErrorResponse} from '../../webserver/requests/messages/error_response_generated';
+import {ErrorResponse} from '@org_frc971/scouting/webserver/requests/messages/error_response_generated';
import {
Ranking,
RequestAllDriverRankingsResponse,
-} from '../../webserver/requests/messages/request_all_driver_rankings_response_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_all_driver_rankings_response_generated';
import {
Stats2024,
Request2024DataScoutingResponse,
-} from '../../webserver/requests/messages/request_2024_data_scouting_response_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_2024_data_scouting_response_generated';
import {
PitImage,
RequestAllPitImagesResponse,
-} from '../../webserver/requests/messages/request_all_pit_images_response_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_all_pit_images_response_generated';
import {
Note,
RequestAllNotesResponse,
-} from '../../webserver/requests/messages/request_all_notes_response_generated';
-import {Delete2024DataScouting} from '../../webserver/requests/messages/delete_2024_data_scouting_generated';
-import {Delete2024DataScoutingResponse} from '../../webserver/requests/messages/delete_2024_data_scouting_response_generated';
+} from '@org_frc971/scouting/webserver/requests/messages/request_all_notes_response_generated';
+import {Delete2024DataScouting} from '@org_frc971/scouting/webserver/requests/messages/delete_2024_data_scouting_generated';
+import {Delete2024DataScoutingResponse} from '@org_frc971/scouting/webserver/requests/messages/delete_2024_data_scouting_response_generated';
-import {ViewDataRequestor} from '../rpc';
+import {
+ MatchListRequestor,
+ ViewDataRequestor,
+} from '@org_frc971/scouting/www/rpc';
type Source = 'Notes' | 'Stats2024' | 'PitImages' | 'DriverRanking';