Skip to content

Commit bbd0507

Browse files
committed
use a shared npm package for org constants
1 parent 8a366c6 commit bbd0507

File tree

12 files changed

+18
-41
lines changed

12 files changed

+18
-41
lines changed

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@acm-uiuc:registry=https://npm.pkg.github.com

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
"test:e2e": "playwright test",
2828
"test:e2e-ui": "playwright test --ui"
2929
},
30-
"dependencies": {},
30+
"dependencies": {
31+
"@acm-uiuc/js-shared": "^1.0.1"
32+
},
3133
"devDependencies": {
3234
"@eslint/compat": "^1.2.8",
3335
"@eslint/eslintrc": "^3.3.1",
@@ -87,4 +89,4 @@
8789
"resolutions": {
8890
"pdfjs-dist": "^4.8.69"
8991
}
90-
}
92+
}

src/api/routes/events.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import "zod-openapi/extend";
22
import { FastifyPluginAsync, FastifyRequest } from "fastify";
33
import { AppRoles } from "../../common/roles.js";
44
import { z } from "zod";
5-
import { OrganizationList } from "../../common/orgs.js";
5+
import { OrganizationList } from "@acm-uiuc/js-shared";
66
import {
77
DeleteItemCommand,
88
GetItemCommand,

src/api/routes/ics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import ical, {
1414
} from "ical-generator";
1515
import moment from "moment";
1616
import { getVtimezoneComponent } from "@touch4it/ical-timezones";
17-
import { OrganizationList } from "../../common/orgs.js";
17+
import { OrganizationList } from "@acm-uiuc/js-shared";
1818
import { CLIENT_HTTP_CACHE_POLICY, EventRepeatOptions } from "./events.js";
1919
import rateLimiter from "api/plugins/rateLimiter.js";
2020
import { getCacheCounter } from "api/functions/cache.js";

src/api/routes/organizations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { FastifyPluginAsync } from "fastify";
2-
import { OrganizationList } from "../../common/orgs.js";
2+
import { OrganizationList } from "@acm-uiuc/js-shared";
33
import fastifyCaching from "@fastify/caching";
44
import rateLimiter from "api/plugins/rateLimiter.js";
55
import { withTags } from "api/components/index.js";

src/common/orgs.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/common/policies/events.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { z } from "zod";
22
import { createPolicy } from "./evaluator.js";
3-
import { OrganizationList } from "../orgs.js";
3+
import { OrganizationList } from "@acm-uiuc/js-shared";
44
import { FastifyRequest } from "fastify";
55

66
export const hostRestrictionPolicy = createPolicy(

src/common/types/roomRequest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { z } from "zod";
2-
import { OrganizationList } from "../orgs.js";
2+
import { OrganizationList } from "@acm-uiuc/js-shared";
33

44
export const eventThemeOptions = [
55
"Arts & Music",

src/ui/pages/events/ManageEvent.page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { useNavigate, useParams } from "react-router-dom";
2020
import { z } from "zod";
2121
import { AuthGuard } from "@ui/components/AuthGuard";
2222
import { useApi } from "@ui/util/api";
23-
import { OrganizationList as orgList } from "@common/orgs";
23+
import { OrganizationList as orgList } from "@acm-uiuc/js-shared";
2424
import { AppRoles } from "@common/roles";
2525
import { EVENT_CACHED_DURATION } from "@common/config";
2626
import { IconPlus, IconTrash } from "@tabler/icons-react";

src/ui/pages/roomRequest/NewRoomRequest.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
} from "@mantine/core";
1919
import { useForm, zodResolver } from "@mantine/form";
2020
import { DateInput, DateTimePicker } from "@mantine/dates";
21-
import { OrganizationList } from "@common/orgs";
21+
import { OrganizationList } from "@acm-uiuc/js-shared";
2222
import {
2323
eventThemeOptions,
2424
spaceTypeOptions,

tests/live/ical.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { expect, test } from "vitest";
2-
import { describe } from "node:test";
3-
import { OrganizationList } from "../../src/common/orgs.js";
2+
import { OrganizationList } from "@acm-uiuc/js-shared";
43
import ical from "node-ical";
54
const baseEndpoint = `https://core.aws.qa.acmuiuc.org`;
65

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
# yarn lockfile v1
33

44

5+
"@acm-uiuc/js-shared@^1.0.1":
6+
version "1.0.1"
7+
resolved "https://npm.pkg.github.com/download/@acm-uiuc/js-shared/1.0.1/61e681d8120236760d506245a367c751bec4bc7d#61e681d8120236760d506245a367c751bec4bc7d"
8+
integrity sha512-BocoPsuLeTaUwA3HZjJ1zbIRAvRm7ekh9GcF0EYhqoau8JHoPCKjKEuy7N+dkkgX/S1EusYUwcqPA869fnuR0A==
9+
510
"@adobe/css-tools@^4.4.0":
611
version "4.4.1"
712
resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.1.tgz#2447a230bfe072c1659e6815129c03cf170710e3"

0 commit comments

Comments
 (0)