erudit 4.3.3-dev.1 → 4.3.4-dev.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "erudit",
-  "version": "4.3.3-dev.1",
+  "version": "4.3.4-dev.2",
   "type": "module",
   "description": "🤓 CMS for perfect educational sites.",
   "license": "MIT",
@@ -24,9 +24,9 @@
     }
   },
   "dependencies": {
-    "@erudit-js/cli": "4.3.3-dev.1",
-    "@erudit-js/core": "4.3.3-dev.1",
-    "@erudit-js/prose": "4.3.3-dev.1",
+    "@erudit-js/cli": "4.3.4-dev.2",
+    "@erudit-js/core": "4.3.4-dev.2",
+    "@erudit-js/prose": "4.3.4-dev.2",
     "@floating-ui/vue": "^1.1.11",
     "@resvg/resvg-js": "^2.6.2",
     "@tailwindcss/vite": "^4.2.1",

package/server/erudit/build.ts

@@ -61,6 +61,14 @@ export async function buildServerErudit() {
 // Watcher
 //
 
+const watchedProjectDirs = [
+  'content',
+  'contributors',
+  'cameos',
+  'sponsors',
+  'news',
+] as const;
+
 export async function tryServerWatchProject() {
   if (ERUDIT.mode === 'static') {
     return;
@@ -93,39 +101,14 @@ export async function tryServerWatchProject() {
     }
   }, 300);
 
-  function isWatched(path: string) {
-    if (path.startsWith(ERUDIT.paths.project('content') + '/')) {
-      return true;
-    }
-
-    if (path.startsWith(ERUDIT.paths.project('contributors') + '/')) {
-      return true;
-    }
-
-    if (path.startsWith(ERUDIT.paths.project('cameos') + '/')) {
-      return true;
-    }
-
-    if (path.startsWith(ERUDIT.paths.project('sponsors') + '/')) {
-      return true;
-    }
-
-    if (path.startsWith(ERUDIT.paths.project('news') + '/')) {
-      return true;
-    }
-  }
-
-  const watcher = chokidar.watch(ERUDIT.paths.project(), {
-    ignoreInitial: true,
-  });
+  const watcher = chokidar.watch(
+    watchedProjectDirs.map((dir) => ERUDIT.paths.project(dir)),
+    { ignoreInitial: true },
+  );
 
   watcher.on('all', (_, path) => {
     path = sn(path);
 
-    if (!isWatched(path)) {
-      return;
-    }
-
     if (pendingRebuild) {
       return;
     }

package/server/erudit/db/repository/pushProblemScript.ts

@@ -23,8 +23,11 @@ export async function pushProblemScript(
     relativePath = problemScriptSrc;
   }
 
-  await ERUDIT.db.insert(ERUDIT.db.schema.problemScripts).values({
-    problemScriptSrc: relativePath,
-    contentFullId,
-  });
+  await ERUDIT.db
+    .insert(ERUDIT.db.schema.problemScripts)
+    .values({
+      problemScriptSrc: relativePath,
+      contentFullId,
+    })
+    .onConflictDoNothing();
 }