From cbdddae71e6611fb350ff8305176d1a7a244f723 Mon Sep 17 00:00:00 2001
From: Claire Peng
Date: Fri, 5 Sep 2025 20:48:54 +0100
Subject: [PATCH 01/19] Wip setup
---
client/tsconfig.json | 2 ++
server/tsconfig.json | 11 +++++++++++
tsconfig.json | 4 ++--
3 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 server/tsconfig.json
diff --git a/client/tsconfig.json b/client/tsconfig.json
index 0bc03b38de..9e63548a60 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -6,4 +6,6 @@
"lib": ["DOM", "ESNext"],
"jsx": "react",
},
+ "include": ["./**/*"],
+ "exclude": ["../node_modules", "../server"]
}
\ No newline at end of file
diff --git a/server/tsconfig.json b/server/tsconfig.json
new file mode 100644
index 0000000000..b2b0814a4b
--- /dev/null
+++ b/server/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../tsconfig.base.json",
+ "compilerOptions": {
+ "target": "ES2022",
+ "module": "commonjs",
+ "lib": ["ES2022"],
+ "types": ["node"],
+ },
+ "include": ["./**/*"],
+ "exclude": ["../node_modules", "../client"]
+}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index bcb601b012..97fe81b722 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
{
"files": [],
"references": [
- { "path": "client" },
- // { "path": "server" }
+ { "path": "./client" },
+ { "path": "./server" }
],
}
\ No newline at end of file
From 75bbf09af79eea212f406067b0bcbdd7136d5ee6 Mon Sep 17 00:00:00 2001
From: Claire Peng
Date: Fri, 5 Sep 2025 20:55:28 +0100
Subject: [PATCH 02/19] package.json: add typecheck command for server
---
package.json | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index f21f1c3c12..989ef2a75c 100644
--- a/package.json
+++ b/package.json
@@ -27,8 +27,9 @@
"storybook:build:css": "sass client/styles/main.scss client/styles/storybook.css",
"storybook": "npm run storybook:build:css && storybook dev -p 6006",
"build-storybook": "storybook build",
- "typecheck": "npm run typecheck:client",
- "typecheck:client": "npx tsc --noEmit -p ./client/tsconfig.json"
+ "typecheck": "npm run typecheck:client && npm run typecheck:server",
+ "typecheck:client": "npx tsc --noEmit -p ./client/tsconfig.json",
+ "typecheck:server": "npx tsc --noEmit -p ./server/tsconfig.json"
},
"husky": {
"hooks": {
From b4dac8c0ddf12ebf64749a8308e0db5c597de2ab Mon Sep 17 00:00:00 2001
From: Claire Peng
Date: Fri, 5 Sep 2025 21:05:30 +0100
Subject: [PATCH 03/19] 404Page: update to ts, no-verify
---
server/views/{404Page.js => 404Page.ts} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename server/views/{404Page.js => 404Page.ts} (100%)
diff --git a/server/views/404Page.js b/server/views/404Page.ts
similarity index 100%
rename from server/views/404Page.js
rename to server/views/404Page.ts
From 9895ed358e0d78b8cbf93ed0b8e520ab998fcbe8 Mon Sep 17 00:00:00 2001
From: Claire Peng
Date: Fri, 5 Sep 2025 21:13:19 +0100
Subject: [PATCH 04/19] server/types: create ProjectFile interface
---
server/types/project.type.ts | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 server/types/project.type.ts
diff --git a/server/types/project.type.ts b/server/types/project.type.ts
new file mode 100644
index 0000000000..c7e855594a
--- /dev/null
+++ b/server/types/project.type.ts
@@ -0,0 +1,8 @@
+export interface ProjectFile {
+ name: string;
+ content: string;
+ url: string;
+ children: string[];
+ fileType: string;
+ isSelectedFile: boolean;
+}
From 71a60dcfc748eae8a71c45fc8c76905ee973d19f Mon Sep 17 00:00:00 2001
From: Claire Peng
Date: Fri, 5 Sep 2025 21:14:43 +0100
Subject: [PATCH 05/19] 404Page: update to named export and add type for
project file
---
server/views/404Page.ts | 31 +++++++-----
server/views/index.js | 102 ++++++++++++++++++++++++++++++----------
2 files changed, 96 insertions(+), 37 deletions(-)
diff --git a/server/views/404Page.ts b/server/views/404Page.ts
index 7c864f4009..66cc117dc2 100644
--- a/server/views/404Page.ts
+++ b/server/views/404Page.ts
@@ -1,7 +1,8 @@
import User from '../models/user';
import Project from '../models/project';
+import { ProjectFile } from '../types/project.type';
-const insertErrorMessage = (htmlFile) => {
+const insertErrorMessage = (htmlFile: string) => {
const html = htmlFile.split('');
const metaDescription = 'A web editor for p5.js, a JavaScript library with the goal of making coding accessible to artists, designers, educators, and beginners.'; // eslint-disable-line
html[0] = `
@@ -84,7 +85,10 @@ export const get404Sketch = async () => {
return errorMessage;
}
- const projects = await Project.find({ user: p5User._id }).exec();
+ const projects = await Project.find({
+ // eslint-disable-next-line no-underscore-dangle
+ user: p5User._id
+ }).exec();
if (!projects.length) {
return errorMessage;
@@ -94,33 +98,36 @@ export const get404Sketch = async () => {
const sketch = projects[randomIndex];
// Get sketch files
- let htmlFile = sketch.files.find((file) => file.name.match(/.*\.html$/i))
- .content;
- const jsFiles = sketch.files.filter((file) => file.name.match(/.*\.js$/i));
- const cssFiles = sketch.files.filter((file) =>
+ let htmlFile = sketch.files.find((file: ProjectFile) =>
+ file.name.match(/.*\.html$/i)
+ ).content;
+ const jsFiles = sketch.files.filter((file: ProjectFile) =>
+ file.name.match(/.*\.js$/i)
+ );
+ const cssFiles = sketch.files.filter((file: ProjectFile) =>
file.name.match(/.*\.css$/i)
);
- const linkedFiles = sketch.files.filter((file) => file.url);
+ const linkedFiles = sketch.files.filter((file: ProjectFile) => file.url);
const instanceMode = jsFiles
- .find((file) => file.name === 'sketch.js')
+ .find((file: ProjectFile) => file.name === 'sketch.js')
.content.includes('Instance Mode');
- jsFiles.forEach((file) => {
+ jsFiles.forEach((file: ProjectFile) => {
// Add js files as script tags
const html = htmlFile.split(' ');
html[0] = `${html[0]}`;
htmlFile = html.join('');
});
- cssFiles.forEach((file) => {
+ cssFiles.forEach((file: ProjectFile) => {
// Add css files as style tags
const html = htmlFile.split('');
html[0] = `${html[0]}`;
htmlFile = html.join('');
});
- linkedFiles.forEach((file) => {
+ linkedFiles.forEach((file: ProjectFile) => {
// Add linked files as link tags
const html = htmlFile.split('