Merge branch 'develop' into update-node-version

raclim · raclim · commit 6b4f7155ad89 · 2024-10-30T20:13:26.000-04:00
diff --git a/client/modules/IDE/components/About.jsx b/client/modules/IDE/components/About.jsx
@@ -63,7 +63,7 @@ function About(props) {
         </p>
         <p className="about__content-column-list">
           <a
-            href="https://p5js.org/learn/"
+            href="https://p5js.org/tutorials/"
             target="_blank"
             rel="noopener noreferrer"
           >
@@ -164,7 +164,7 @@ function About(props) {
         </p>
         <p className="about__content-column-list">
           <a
-            href="https://p5js.org/download/support.html"
+            href="https://p5js.org/donate/"
             target="_blank"
             rel="noopener noreferrer"
           >
diff --git a/client/modules/Preview/previewIndex.jsx b/client/modules/Preview/previewIndex.jsx
@@ -55,7 +55,7 @@ const App = () => {
   function addCacheBustingToAssets(files) {
     const timestamp = new Date().getTime();
     return files.map((file) => {
-      if (file.url) {
+      if (file.url && !file.url.endsWith('obj') && !file.url.endsWith('stl')) {
         return {
           ...file,
           url: `${file.url}?v=${timestamp}`
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.14.7",
+  "version": "2.15.0",
   "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.10.0/p5.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.10.0/addons/p5.sound.min.js"></script>
+    <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>
     <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,10 +14,7 @@ const mongoConnectionString = process.env.MONGO_URL;
 const { ObjectId } = mongoose.Types;
 // Connect to MongoDB
 mongoose.Promise = global.Promise;
-mongoose.connect(mongoConnectionString, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true
-});
+mongoose.connect(mongoConnectionString);
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(
diff --git a/server/previewServer.js b/server/previewServer.js
@@ -22,8 +22,6 @@ 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,10 +59,7 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };
 
 const mongoConnectionString = process.env.MONGO_URL;
 
-mongoose.connect(mongoConnectionString, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true
-});
+mongoose.connect(mongoConnectionString);
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(
diff --git a/server/scripts/examples.js b/server/scripts/examples.js
@@ -14,10 +14,7 @@ const headers = { 'User-Agent': 'p5js-web-editor/0.0.1' };
 
 const mongoConnectionString = process.env.MONGO_URL;
 
-mongoose.connect(mongoConnectionString, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true
-});
+mongoose.connect(mongoConnectionString);
 mongoose.set('strictQuery', true);
 mongoose.connection.on('error', () => {
   console.error(
diff --git a/server/server.js b/server/server.js
@@ -76,14 +76,19 @@ app.use(cookieParser());
 
 mongoose.set('strictQuery', true);
 
-const clientPromise = mongoose
-  .connect(mongoConnectionString, {
-    useNewUrlParser: true,
-    useUnifiedTopology: true,
-    serverSelectionTimeoutMS: 30000, // 30 seconds timeout
-    socketTimeoutMS: 45000 // 45 seconds timeout
-  })
-  .then((m) => m.connection.getClient());
+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();
 
 app.use(
   session({
@@ -97,8 +102,7 @@ app.use(
       secure: false
     },
     store: new MongoStore({
-      clientPromise,
-      autoReconnect: true
+      clientPromise: clientInstancePromise
     })
   })
 );

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "p5.js-web-editor",`
`3`		`- "version": "2.14.7",`
	`3`	`+ "version": "2.15.0",`
`4`	`4`	`"description": "The web editor for p5.js.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"clean": "rimraf dist",`