Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ yarn-error.log*
**/runner-results
parallel-weights.json

**/src/tempcodes
**/src/tempcodes
# Generated from apps/app/scripts/copy-vendor-assets.mjs during install/build.
apps/app/public/vendor/
2 changes: 1 addition & 1 deletion apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"main": "dist/src/index.js",
"scripts": {
"build:assets": "npx tsx scripts/copy-assets-to-dist.ts",
"build": "tsc --build && npm run build:assets",
"build": "tsc --build tsconfig.build.json && npm run build:assets",
"dev": "tsx watch src/index.ts",
"lint": "eslint --fix",
"lint:check": "eslint",
Expand Down
12 changes: 12 additions & 0 deletions apps/api/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"tsBuildInfoFile": "../../.tsbuildinfo/apps/api.build.tsbuildinfo"
},
"references": [
{
"path": "../../packages/shared"
}
],
"exclude": ["src/**/*.test.ts", "src/**/*.test.tsx"]
}
5 changes: 5 additions & 0 deletions apps/app/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import { createBaseConfig, reactConfig } from "@doenet-tools/eslint-config";
export default tseslint.config(
...createBaseConfig(import.meta.dirname),
...reactConfig,
{
// Vendor files are copied from node_modules for runtime use, so they
// should not be linted as part of the app source tree.
ignores: ["public/vendor/**"],
},
{
rules: {
"@typescript-eslint/triple-slash-reference": "off",
Expand Down
7 changes: 4 additions & 3 deletions apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
"./src/types": "./src/types.ts"
},
"scripts": {
"build:assets": "vite build",
"build": "tsc --build && npm run build:assets",
"dev": "cross-env NODE_ENV=production vite",
"prepare:vendor": "node scripts/copy-vendor-assets.mjs",
"build:assets": "npm run prepare:vendor && vite build",
"build": "tsc --build tsconfig.build.json && npm run build:assets",
"dev": "npm run prepare:vendor && cross-env NODE_ENV=production vite",
"lint": "eslint --fix",
"lint:check": "eslint",
"test": "cypress open",
Expand Down
25 changes: 25 additions & 0 deletions apps/app/scripts/copy-vendor-assets.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { cp, mkdir, readdir, rm } from "fs/promises";
import { dirname, join } from "path";
import { fileURLToPath } from "url";

const scriptDir = dirname(fileURLToPath(import.meta.url));
const appDir = dirname(scriptDir);
const repoRoot = dirname(dirname(appDir));

// The v0.6 -> v0.7 syntax upgrader is only used from editor settings, but its
// published bundle includes a large worker. Copying the runtime files into
// public/vendor keeps that code out of Vite's main app bundle.
const sourceDir = join(repoRoot, "node_modules", "@doenet", "v06-to-v07");
const targetDir = join(appDir, "public", "vendor", "doenet", "v06-to-v07");

await rm(targetDir, { recursive: true, force: true });
await mkdir(targetDir, { recursive: true });

const files = await readdir(sourceDir);
for (const file of files) {
// The package entrypoint dynamically imports the hashed worker file, so ship
// both files together and let the browser load them on demand at runtime.
if (file === "index.js" || /^lib_doenetml_worker_bg-.*\.js$/.test(file)) {
await cp(join(sourceDir, file), join(targetDir, file));
}
}
119 changes: 64 additions & 55 deletions apps/app/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,15 @@ import {
loader as sharedActivitiesLoader,
SharedActivities,
} from "./paths/SharedActivities";
import {
loader as activityViewerLoader,
ActivityViewer,
} from "./paths/ActivityViewer";
import { loader as assignedLoader, Assigned } from "./paths/Assigned";
import {
loader as assignmentResponseOverviewLoader,
AssignmentData as AssignmentResponseOverview,
} from "./paths/AssignmentResponseOverview";
import {
loader as assignmentResponseStudentLoader,
AssignmentResponseStudent,
} from "./paths/AssignmentResponseStudent";
import {
action as enterClassCodeAction,
EnterClassCode,
} from "./paths/EnterClassCode";
import {
loader as assignmentViewerLoader,
action as assignmentViewerAction,
AssignmentViewer,
} from "./paths/AssignmentViewer";
import { loader as studentsLoader, Students } from "./paths/Students";
import {
loader as studentAssignmentScoresLoader,
Expand All @@ -63,12 +50,6 @@ import {
loader as editorHeaderLoader,
EditorHeader,
} from "./paths/editor/EditorHeader";
import {
DoenetMLComparison,
loader as doenetMLComparisonLoader,
action as doenetMLComparisonAction,
} from "./paths/DoenetMLComparison";
import { mathjaxConfig } from "@doenet/doenetml-iframe";
import { SignIn, action as signInAction } from "./paths/SignIn";
import {
ConfirmSignIn,
Expand All @@ -83,14 +64,6 @@ import {
LibraryActivities,
loader as libraryActivitiesLoader,
} from "./paths/LibraryActivities";
import {
DocEditorViewMode,
loader as docEditorViewModeLoader,
} from "./paths/editor/DocEditorViewMode";
import {
loader as docEditorEditModeLoader,
DocEditorEditMode,
} from "./paths/editor/DocEditorEditMode";
import {
CompoundEditorViewMode,
loader as compoundEditorViewModeLoader,
Expand All @@ -105,10 +78,6 @@ import {
} from "./paths/editor/EditorSettingsMode";
import axios, { AxiosError } from "axios";
import { loadShareStatus } from "./popups/ShareMyContentModal";
import {
DocEditorHistoryMode,
loader as docEditorHistoryModeLoader,
} from "./paths/editor/DocEditorHistoryMode";
import {
DocEditorRemixMode,
loader as docEditorRemixModeLoader,
Expand All @@ -122,12 +91,64 @@ import {
loader as sharedWithMeLoader,
} from "./paths/SharedWithMe";
import { editorUrl } from "./utils/url";
import { ScratchPad, loader as scratchPadLoader } from "./paths/ScratchPad";
import { About } from "./paths/About";
import { RawViewer, loader as rawViewerLoader } from "./paths/RawViewer";
import { GetInvolved } from "./paths/GetInvolved";
import { Events } from "./paths/Events";
import { QuickLinks } from "./paths/QuickLinks";
import { mathjaxConfig } from "./utils/mathjaxConfig";

async function loadActivityViewerRoute() {
const route = await import("./paths/ActivityViewer");
return { loader: route.loader, Component: route.ActivityViewer };
}

async function loadAssignmentResponseStudentRoute() {
const route = await import("./paths/AssignmentResponseStudent");
return { loader: route.loader, Component: route.AssignmentResponseStudent };
}

async function loadAssignmentViewerRoute() {
const route = await import("./paths/AssignmentViewer");
return {
loader: route.loader,
action: route.action,
Component: route.AssignmentViewer,
};
}

async function loadDoenetMLComparisonRoute() {
const route = await import("./paths/DoenetMLComparison");
return {
loader: route.loader,
action: route.action,
Component: route.DoenetMLComparison,
};
}

async function loadDocEditorEditModeRoute() {
const route = await import("./paths/editor/DocEditorEditMode");
return { loader: route.loader, Component: route.DocEditorEditMode };
}

async function loadDocEditorViewModeRoute() {
const route = await import("./paths/editor/DocEditorViewMode");
return { loader: route.loader, Component: route.DocEditorViewMode };
}

async function loadDocEditorHistoryModeRoute() {
const route = await import("./paths/editor/DocEditorHistoryMode");
return { loader: route.loader, Component: route.DocEditorHistoryMode };
}

async function loadScratchPadRoute() {
const route = await import("./paths/ScratchPad");
return { loader: route.loader, Component: route.ScratchPad };
}

async function loadRawViewerRoute() {
const route = await import("./paths/RawViewer");
return { loader: route.loader, Component: route.RawViewer };
}

const router = createBrowserRouter([
{
Expand Down Expand Up @@ -243,10 +264,9 @@ const router = createBrowserRouter([
},
{
path: "activityViewer/:contentId",
loader: activityViewerLoader,
lazy: loadActivityViewerRoute,
action: genericAction,
errorElement: <ErrorPage />,
element: <ActivityViewer />,
},
{
path: "documentEditor/:contentId",
Expand All @@ -257,14 +277,12 @@ const router = createBrowserRouter([
children: [
{
path: "edit",
loader: docEditorEditModeLoader,
element: <DocEditorEditMode />,
lazy: loadDocEditorEditModeRoute,
errorElement: <ErrorPage />,
},
{
path: "view",
loader: docEditorViewModeLoader,
element: <DocEditorViewMode />,
lazy: loadDocEditorViewModeRoute,
errorElement: <ErrorPage />,
},
{
Expand All @@ -276,9 +294,8 @@ const router = createBrowserRouter([
},
{
path: "history",
loader: docEditorHistoryModeLoader,
lazy: loadDocEditorHistoryModeRoute,
action: genericAction,
element: <DocEditorHistoryMode />,
errorElement: <ErrorPage />,
},
{
Expand Down Expand Up @@ -335,9 +352,7 @@ const router = createBrowserRouter([
},
{
path: "activityCompare/:contentId/:compareId",
loader: doenetMLComparisonLoader,
action: doenetMLComparisonAction,
element: <DoenetMLComparison />,
lazy: loadDoenetMLComparisonRoute,
errorElement: <ErrorPage />,
},
{
Expand All @@ -355,8 +370,7 @@ const router = createBrowserRouter([
},
{
path: "assignedData/:contentId",
loader: assignmentResponseStudentLoader,
element: <AssignmentResponseStudent />,
lazy: loadAssignmentResponseStudentRoute,
errorElement: <ErrorPage />,
},
{
Expand All @@ -368,8 +382,7 @@ const router = createBrowserRouter([
},
{
path: "assignmentData/:contentId/:studentUserId",
loader: assignmentResponseStudentLoader,
element: <AssignmentResponseStudent />,
lazy: loadAssignmentResponseStudentRoute,
errorElement: <ErrorPage />,
},
{
Expand All @@ -386,9 +399,7 @@ const router = createBrowserRouter([
},
{
path: "code/:classCode",
loader: assignmentViewerLoader,
action: assignmentViewerAction,
element: <AssignmentViewer />,
lazy: loadAssignmentViewerRoute,
errorElement: <ErrorPage />,
},
{
Expand Down Expand Up @@ -417,17 +428,15 @@ const router = createBrowserRouter([
},
{
path: "scratchPad",
loader: scratchPadLoader,
lazy: loadScratchPadRoute,
action: genericAction,
errorElement: <ErrorPage />,
element: <ScratchPad />,
},
],
},
{
path: "/embed/:viewId",
element: <RawViewer />,
loader: rawViewerLoader,
lazy: loadRawViewerRoute,
errorElement: (
<ChakraProvider theme={theme}>
<ErrorPage />
Expand Down
3 changes: 1 addition & 2 deletions apps/app/src/paths/AssignmentResponseOverview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,13 @@ import {
DoenetmlVersion,
UserInfoWithEmail,
} from "../types";
import { isActivitySource } from "@doenet/assignment-viewer";
import {
compileActivityFromContent,
contentTypeToName,
getIconInfo,
} from "../utils/activity";
import { BiDownArrowAlt, BiUpArrowAlt } from "react-icons/bi";
import { ActivitySource } from "@doenet-tools/shared";
import { ActivitySource, isActivitySource } from "@doenet-tools/shared";
import { EditAssignmentSettings } from "../widgets/editor/EditAssignmentSettings";
import { DateTime } from "luxon";
import { NameBar } from "../widgets/NameBar";
Expand Down
4 changes: 3 additions & 1 deletion apps/app/src/paths/editor/DoenetMLVersionComponents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import { DoenetmlVersion } from "../../types";
import axios from "axios";
import { optimistic } from "../../utils/optimistic_ui";
import { updateSyntaxFromV06toV07 } from "@doenet/v06-to-v07";
import { updateSyntaxFromV06toV07 } from "../../utils/v06ToV07";

/**
* Renders a DoenetML version selector.
Expand Down Expand Up @@ -159,6 +159,8 @@ async function performSyntaxUpgrade(

const source: string = data.source;

// This upgrade helper is loaded from public/vendor on demand so the large
// converter bundle doesn't inflate the default app asset build.
const update = await updateSyntaxFromV06toV07(source);
const upgraded = update.xml;

Expand Down
18 changes: 18 additions & 0 deletions apps/app/src/utils/mathjaxConfig.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
export const mathjaxConfig = {
tex: {
tags: "ams",
macros: {
lt: "<",
gt: ">",
amp: "&",
var: ["\\mathrm{#1}", 1],
csch: "\\operatorname{csch}",
sech: "\\operatorname{sech}",
erf: "\\operatorname{erf}",
},
displayMath: [["\\[", "\\]"]],
},
output: {
displayOverflow: "linebreak",
},
};
Loading
Loading