Merge branch 'release-2.15.1' into release

processing · Nov 5, 2024 · 6a632a2 · 6a632a2
2 parents 511f83e + 2726cc5
commit 6a632a2
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",

diff --git a/server/domain-objects/createDefaultFiles.js b/server/domain-objects/createDefaultFiles.js
@@ -9,8 +9,8 @@ function draw() {
 export const defaultHTML = `<!DOCTYPE html>
 <html lang="en">
   <head>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.11.0/p5.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.11.0/addons/p5.sound.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.11.1/p5.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.11.1/addons/p5.sound.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css">
     <meta charset="utf-8" />
 

diff --git a/server/migrations/emailConsolidation.js b/server/migrations/emailConsolidation.js
@@ -14,7 +14,10 @@ const mongoConnectionString = process.env.MONGO_URL;
 const { ObjectId } = mongoose.Types;
 // Connect to MongoDB
 mongoose.Promise = global.Promise;
-mongoose.connect(mongoConnectionString);
+mongoose.connect(mongoConnectionString, {
+  useNewUrlParser: true,
+  useUnifiedTopology: true
+});
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

diff --git a/server/previewServer.js b/server/previewServer.js
@@ -22,6 +22,8 @@ const connectToMongoDB = async () => {
     mongoose.set('strictQuery', true);
 
     await mongoose.connect(mongoConnectionString, {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
       serverSelectionTimeoutMS: 30000, // 30 seconds timeout
       socketTimeoutMS: 45000 // 45 seconds timeout
     });

diff --git a/server/scripts/examples-gg-latest.js b/server/scripts/examples-gg-latest.js
@@ -59,7 +59,10 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };
 
 const mongoConnectionString = process.env.MONGO_URL;
 
-mongoose.connect(mongoConnectionString);
+mongoose.connect(mongoConnectionString, {
+  useNewUrlParser: true,
+  useUnifiedTopology: true
+});
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

diff --git a/server/scripts/examples.js b/server/scripts/examples.js
@@ -14,7 +14,10 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };
 
 const mongoConnectionString = process.env.MONGO_URL;
 
-mongoose.connect(mongoConnectionString);
+mongoose.connect(mongoConnectionString, {
+  useNewUrlParser: true,
+  useUnifiedTopology: true
+});
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(

diff --git a/server/server.js b/server/server.js
@@ -76,19 +76,14 @@ app.use(cookieParser());
 
 mongoose.set('strictQuery', true);
 
-async function connectToMongoDB() {
-  try {
-    const mongooseConnection = await mongoose.connect(mongoConnectionString, {
-      serverSelectionTimeoutMS: 30000, // 30 seconds timeout
-      socketTimeoutMS: 45000 // 45 seconds timeout
-    });
-    return mongooseConnection.connection.getClient();
-  } catch (err) {
-    throw new Error('MongoDB connection failed', err);
-  }
-}
-
-const clientInstancePromise = connectToMongoDB();
+const clientPromise = mongoose
+  .connect(mongoConnectionString, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    serverSelectionTimeoutMS: 30000, // 30 seconds timeout
+    socketTimeoutMS: 45000 // 45 seconds timeout
+  })
+  .then((m) => m.connection.getClient());
 
 app.use(
   session({
@@ -102,7 +97,8 @@ app.use(
       secure: false
     },
     store: new MongoStore({
-      clientPromise: clientInstancePromise
+      clientPromise,
+      autoReconnect: true
     })
   })
 );