Move classrooms out of webreg-scraping

SheepTester · SheepTester · commit 1fe122df6898 · 2023-03-17T13:39:06.000-07:00
And switch to using Deno tasks
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-dist
+/dist
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,6 +2,7 @@
   "deno.enable": true,
   "deno.lint": false,
   "deno.unstable": false,
+  "deno.config": "./deno.jsonc",
   "deno.suggest.imports.hosts": {
     "https://deno.land": true
   }
diff --git a/README.md b/README.md
@@ -49,9 +49,9 @@ from WebReg (by pasting some JS in the console, probably).
 [Live](https://sheeptester.github.io/hello-world/bookmarklet.html?../uxdy/bookmarklet/open-classes)
 
 ```sh
-# In the base directory
+# In the repo root directory
 # Build
-$ ./webreg-scraping/bookmarklet/build.sh
+$ deno task bookmarklet:build
 # Deploy built version
 $ ./scripts/deploy.sh webreg-scraping/bookmarklet/dist/ bookmarklet
 ```
@@ -78,18 +78,15 @@ import(
 [Live](https://sheeptester.github.io/uxdy/classrooms/)
 
 ```sh
-# In webreg-scraping/
-# To create cache
-$ rm cache-sp22/*.json # or mkdir cache-sp22
-$ deno run --allow-all scrape.ts <UqZBpD3n> <jlinksessionidx> SP22
+# In the repo root directory
 # Build
-$ deno run --allow-read classrooms/to-file.ts ./cache-wi22/ > classrooms/dist/classrooms-wi22.txt
-$ deno run --allow-read classrooms/to-file.ts ./cache-sp22/ > classrooms/dist/classrooms-sp22.txt
-$ ./classrooms/build.sh
+$ deno run --allow-net scheduleofclasses/scrape.ts WI23 > scheduleofclasses/terms/WI23.json
+$ deno run --allow-read classrooms/to-file.ts WI23 > classrooms/dist/classrooms-WI23.txt
+$ deno task classrooms:build
 # Develop
-$ ./classrooms/dev.sh
-# Deploy built version (run build.sh first to minify)
-$ ../scripts/deploy.sh webreg-scraping/classrooms/dist/ classrooms
+$ deno task classrooms:watch
+# Deploy built version (run classrooms:build first to minify)
+$ ./scripts/deploy.sh ./classrooms/dist/ classrooms
 ```
 
 Map image was made with [this tool](https://sheeptester.github.io/words-go-here/misc/ucsd-map.html) (zoom 16, x: -3 to 3, y: -3 to 3)
diff --git a/classrooms/.gitignore b/classrooms/.gitignore
@@ -1,3 +1,2 @@
-!dist
 dist/index.min.js
 dist/classrooms-*.txt
diff --git a/classrooms/building-locations.ts b/classrooms/building-locations.ts
diff --git a/classrooms/components/BackIcon.tsx b/classrooms/components/BackIcon.tsx
@@ -1,4 +1,4 @@
-/** @jsxImportSource https://esm.sh/preact@10.6.6 */
+/** @jsxImportSource preact */
 
 /** The Material Design Arrow Back icon. */
 export function BackIcon () {
diff --git a/classrooms/components/Building.tsx b/classrooms/components/Building.tsx
@@ -1,9 +1,9 @@
-/** @jsxImportSource https://esm.sh/preact@10.6.6 */
+/** @jsxImportSource preact */
 /// <reference no-default-lib="true"/>
 /// <reference lib="dom" />
 /// <reference lib="deno.ns" />
 
-import { useCallback } from 'https://esm.sh/preact@10.6.6/hooks'
+import { useCallback } from 'preact/hooks'
 import {
   colleges,
   latLongToPixel,
diff --git a/classrooms/components/CloseIcon.tsx b/classrooms/components/CloseIcon.tsx
@@ -1,4 +1,4 @@
-/** @jsxImportSource https://esm.sh/preact@10.6.6 */
+/** @jsxImportSource preact */
 
 /** The Material Design Close icon. */
 export function CloseIcon () {
diff --git a/classrooms/components/InfoPanel.tsx b/classrooms/components/InfoPanel.tsx
@@ -1,4 +1,4 @@
-/** @jsxImportSource https://esm.sh/preact@10.6.6 */
+/** @jsxImportSource preact */
 /// <reference no-default-lib="true"/>
 /// <reference lib="dom" />
 /// <reference lib="deno.ns" />
diff --git a/classrooms/components/RoomList.tsx b/classrooms/components/RoomList.tsx
@@ -1,10 +1,9 @@
-/** @jsxImportSource https://esm.sh/preact@10.6.6 */
+/** @jsxImportSource preact */
 /// <reference no-default-lib="true"/>
 /// <reference lib="dom" />
 /// <reference lib="deno.ns" />
 
-import { useState } from 'https://esm.sh/preact@10.6.6/hooks'
-import { meetingTypes } from '../../meeting-types.ts'
+import { useState } from 'preact/hooks'
 import { colleges } from '../building-locations.ts'
 import { Building, compareRoomNums } from '../from-file.ts'
 import { Now, used } from '../now.ts'
diff --git a/classrooms/components/Schedule.tsx b/classrooms/components/Schedule.tsx
@@ -1,10 +1,10 @@
-/** @jsxImportSource https://esm.sh/preact@10.6.6 */
+/** @jsxImportSource preact */
 /// <reference no-default-lib="true"/>
 /// <reference lib="dom" />
 /// <reference lib="deno.ns" />
 
-import { useState } from 'https://esm.sh/preact@10.6.6/hooks'
-import { meetingTypes } from '../../meeting-types.ts'
+import { useState } from 'preact/hooks'
+import { meetingTypes } from '../../webreg-scraping/meeting-types.ts'
 import { RoomMeeting } from '../from-file.ts'
 import { Now } from '../now.ts'
 
diff --git a/classrooms/dev.sh b/classrooms/dev.sh
diff --git a/classrooms/dist/index.html b/classrooms/dist/index.html
diff --git a/classrooms/dist/map.webp b/classrooms/dist/map.webp
diff --git a/classrooms/dist/material-arrow-drop-down-black.svg b/classrooms/dist/material-arrow-drop-down-black.svg
diff --git a/classrooms/dist/material-arrow-drop-down-white.svg b/classrooms/dist/material-arrow-drop-down-white.svg
diff --git a/classrooms/dist/open-graph.png b/classrooms/dist/open-graph.png
diff --git a/classrooms/dist/styles.css b/classrooms/dist/styles.css
diff --git a/classrooms/from-file.ts b/classrooms/from-file.ts
@@ -1,10 +1,10 @@
 import {
-  Course,
-  Exam,
   Meeting,
+  Exam,
   MeetingTime,
+  Course,
   Section
-} from '../../scheduleofclasses/group-sections.ts'
+} from '../scheduleofclasses/group-sections.ts'
 import { Time } from '../util/time.ts'
 
 class StringTaker {
diff --git a/classrooms/index.tsx b/classrooms/index.tsx
@@ -1,12 +1,12 @@
-/** @jsxImportSource https://esm.sh/preact@10.6.6 */
+/** @jsxImportSource preact */
 /// <reference no-default-lib="true"/>
 /// <reference lib="dom" />
 /// <reference lib="deno.ns" />
 
-import { render } from 'https://esm.sh/preact@10.6.6'
-import { useEffect, useState } from 'https://esm.sh/preact@10.6.6/hooks'
-import { Day } from '../../terms/day.ts'
-import { getTerm, termCode } from '../../terms/index.ts'
+import { render } from 'preact'
+import { useEffect, useState } from 'preact/hooks'
+import { Day } from '../terms/day.ts'
+import { getTerm, termCode } from '../terms/index.ts'
 import {
   northeast,
   southwest,
diff --git a/classrooms/now.ts b/classrooms/now.ts
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'https://esm.sh/preact@10.6.6/hooks'
+import { useEffect, useState } from 'preact/hooks'
 import { Time } from '../util/time.ts'
 import { RoomMeeting } from './from-file.ts'
 
diff --git a/classrooms/to-file.ts b/classrooms/to-file.ts
@@ -1,11 +1,8 @@
 // deno run --allow-read classrooms/to-file.ts WI23 > classrooms/dist/classrooms-WI23.txt
 
-import { writeAll } from 'https://deno.land/std@0.126.0/streams/conversion.ts'
-import {
-  groupSections,
-  Meeting
-} from '../../scheduleofclasses/group-sections.ts'
-import { readCourses } from '../../scheduleofclasses/scrape.ts'
+import { writeAll } from 'std/streams/write_all.ts'
+import { groupSections, Meeting } from '../scheduleofclasses/group-sections.ts'
+import { readCourses } from '../scheduleofclasses/scrape.ts'
 
 const encoder = new TextEncoder()
 async function print (content: string) {
diff --git a/deno.jsonc b/deno.jsonc
@@ -0,0 +1,13 @@
+{
+  "imports": {
+    "deno_dom/": "https://deno.land/x/deno_dom@v0.1.36-alpha/",
+    "preact": "https://esm.sh/preact@10.13.1",
+    "preact/": "https://esm.sh/preact@10.13.1/",
+    "std/": "https://deno.land/std@0.180.0/"
+  },
+  "tasks": {
+    "bookmarklet:build": "deno bundle webreg-scraping/bookmarklet/index.tsx | terser --module > webreg-scraping/bookmarklet/dist/bookmarklet.min.js",
+    "classrooms:build": "deno bundle classrooms/index.tsx | terser --module > classrooms/dist/index.min.js",
+    "classrooms:watch": "http-server dist/ -c-1 -s & deno bundle --watch classrooms/index.tsx classrooms/dist/index.min.js"
+  }
+}
diff --git a/dependencies/scrape.ts b/dependencies/scrape.ts
@@ -1,12 +1,8 @@
 // deno run --allow-all dependencies/scrape.ts
 
-import { ensureDir } from 'https://deno.land/std@0.119.0/fs/ensure_dir.ts'
-import { dirname, fromFileUrl } from 'https://deno.land/std@0.119.0/path/mod.ts'
-import {
-  DOMParser,
-  Element,
-  HTMLDocument
-} from 'https://deno.land/x/deno_dom@v0.1.19-alpha/deno-dom-wasm.ts'
+import { ensureDir } from 'std/fs/ensure_dir.ts'
+import { dirname, fromFileUrl } from 'std/path/mod.ts'
+import { DOMParser, Element, HTMLDocument } from 'deno_dom/deno-dom-wasm.ts'
 import { stringify } from './util.ts'
 
 const HOST = 'https://catalog.ucsd.edu/'
diff --git a/scheduleofclasses/group-sections.ts b/scheduleofclasses/group-sections.ts
@@ -1,4 +1,4 @@
-import { assert } from 'https://deno.land/std@0.178.0/testing/asserts.ts'
+import { assert } from 'std/testing/asserts.ts'
 import { Course as ScrapedCourse, readCourses } from './scrape.ts'
 
 export type MeetingTime<Time = number> = {
diff --git a/scheduleofclasses/print-all.ts b/scheduleofclasses/print-all.ts
@@ -9,7 +9,7 @@ import {
   magenta,
   red,
   yellow
-} from 'https://deno.land/std@0.177.0/fmt/colors.ts'
+} from 'std/fmt/colors.ts'
 import { DAYS, getCourseIterator } from './scrape.ts'
 
 const TERM = 'SP23'
diff --git a/scheduleofclasses/scrape.ts b/scheduleofclasses/scrape.ts
@@ -1,10 +1,7 @@
 // deno run --allow-net scheduleofclasses/scrape.ts SP23 > scheduleofclasses/terms/SP23.json
 
-import { writeAll } from 'https://deno.land/std@0.177.0/streams/write_all.ts'
-import {
-  DOMParser,
-  Element
-} from 'https://deno.land/x/deno_dom@v0.1.36-alpha/deno-dom-wasm.ts'
+import { writeAll } from 'std/streams/write_all.ts'
+import { DOMParser, Element } from 'deno_dom/deno-dom-wasm.ts'
 
 // S for Saturday, SP23 BIPN 100
 // Sun for Sunday, SP23 MGT 404
diff --git a/scheduleofclasses/validate-analysis.ts b/scheduleofclasses/validate-analysis.ts
@@ -1,6 +1,6 @@
 // deno run --allow-read scheduleofclasses/validate-analysis.ts
 
-import { red } from 'https://deno.land/std@0.177.0/fmt/colors.ts'
+import { red } from 'std/fmt/colors.ts'
 import { readCourses } from './scrape.ts'
 
 const term = 'SP23'
diff --git a/terms/test.ts b/terms/test.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from 'https://deno.land/std@0.154.0/testing/asserts.ts'
+import { assertEquals } from 'std/testing/asserts.ts'
 import { Day } from './day.ts'
 import { getTerm, getTermDays } from './index.ts'
 import { data } from './test-data.ts'
diff --git a/util/display-progress.ts b/util/display-progress.ts
@@ -1,4 +1,4 @@
-import { writeAll } from 'https://deno.land/std@0.125.0/streams/conversion.ts'
+import { writeAll } from 'std/streams/conversion.ts'
 
 const LINE_LENGTH = 80
 const BAR_LENGTH = 50
diff --git a/util/time.ts b/util/time.ts
diff --git a/webreg-scraping/bookmarklet/.gitignore b/webreg-scraping/bookmarklet/.gitignore
@@ -1,2 +1 @@
-!dist
 bookmarklet.min.js
diff --git a/webreg-scraping/bookmarklet/build.sh b/webreg-scraping/bookmarklet/build.sh
diff --git a/webreg-scraping/bookmarklet/index.tsx b/webreg-scraping/bookmarklet/index.tsx
@@ -1,13 +1,13 @@
-/** @jsxImportSource https://esm.sh/preact@10.6.4 */
+/** @jsxImportSource preact */
 /// <reference no-default-lib="true"/>
 /// <reference lib="dom" />
 /// <reference lib="dom.asynciterable" />
 /// <reference lib="deno.ns" />
 
-import { ComponentChildren, render } from 'https://esm.sh/preact@10.6.4'
-import { useEffect, useState } from 'https://esm.sh/preact@10.6.4/hooks'
+import { ComponentChildren, render } from 'preact'
+import { useEffect, useState } from 'preact/hooks'
 import { Course, Group, Scraper } from '../scrape.ts'
-import { Period } from '../util/time.ts'
+import { Period } from '../../util/time.ts'
 
 const params = new URL(window.location.href).searchParams
 const term = params.get('p1')
diff --git a/webreg-scraping/classrooms.ts b/webreg-scraping/classrooms.ts
@@ -1,7 +1,7 @@
 // deno run --allow-read classrooms.ts
 
 import { Scraper } from './scrape.ts'
-import { displayProgress } from './util/display-progress.ts'
+import { displayProgress } from '../util/display-progress.ts'
 
 export async function main (quarter: string, cachePath: string) {
   const getter = new Scraper(quarter, { cachePath })
diff --git a/webreg-scraping/classrooms/build.sh b/webreg-scraping/classrooms/build.sh
diff --git a/webreg-scraping/scrape.ts b/webreg-scraping/scrape.ts
@@ -1,8 +1,8 @@
 // deno run --allow-all scrape.ts <UqZBpD3n> <jlinksessionidx> <quarter>
 
-import { join as joinPath } from 'https://deno.land/std@0.125.0/path/mod.ts'
+import { join as joinPath } from 'std/path/mod.ts'
 import { ExamCodes, InstructionCodes } from './meeting-types.ts'
-import { Period, Time } from './util/time.ts'
+import { Period, Time } from '../util/time.ts'
 
 export type RawSearchLoadSubjectResult = {
   LONG_DESC: string
diff --git a/webreg-scraping/scrape_test.ts b/webreg-scraping/scrape_test.ts
@@ -8,7 +8,7 @@ import {
   assertEquals,
   assertMatch,
   assertStringIncludes
-} from 'https://deno.land/std@0.125.0/testing/asserts.ts'
+} from 'std/testing/asserts.ts'
 import { exams, instructionTypes } from './meeting-types.ts'
 
 /**
diff --git a/webreg-scraping/track-classes.ts b/webreg-scraping/track-classes.ts
@@ -1,11 +1,11 @@
 // Create a Git-friendly set of files summarizing WebReg data
 // deno run --allow-all track-classes.ts <UqZBpD3n> <jlinksessionidx>
 
-import { ensureDir } from 'https://deno.land/std@0.125.0/fs/ensure_dir.ts'
-import { writeAll } from 'https://deno.land/std@0.125.0/streams/conversion.ts'
+import { ensureDir } from 'std/fs/ensure_dir.ts'
+import { writeAll } from 'std/streams/conversion.ts'
 import { exams, instructionTypes } from './meeting-types.ts'
 import { Scraper } from './scrape.ts'
-import { displayProgress } from './util/display-progress.ts'
+import { displayProgress } from '../util/display-progress.ts'
 
 await ensureDir('./webreg-data2/courses/')
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`"deno.enable": true,`
`3`	`3`	`"deno.lint": false,`
`4`	`4`	`"deno.unstable": false,`
	`5`	`+ "deno.config": "./deno.jsonc",`
`5`	`6`	`"deno.suggest.imports.hosts": {`
`6`	`7`	`"https://deno.land": true`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-!dist`
`2`	`1`	`dist/index.min.js`
`3`	`2`	`dist/classrooms-*.txt`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/** @jsxImportSource https://esm.sh/preact@10.6.6 */`
	`1`	`+/** @jsxImportSource preact */`
`2`	`2`
`3`	`3`	`/** The Material Design Arrow Back icon. */`
`4`	`4`	`export function BackIcon () {`