Skip to content

Commit 1ab6818

Browse files
authored
Merge branch 'develop' into bugfix/indhiraraj/sharedArrayBuffer
2 parents 6ebbeea + 5a2f0bd commit 1ab6818

File tree

4 files changed

+3
-24
lines changed

4 files changed

+3
-24
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,3 @@ Hosting and technical support has come from:
4646
<a href="https://releasehub.com/" target="_blank"><img width="100" src="https://assets.website-files.com/603dd147c5b0a480611bd348/603dd147c5b0a469bc1bd451_logo--dark.svg" /></a>
4747
<br />
4848
<a href="https://www.browserstack.com/" target="_blank"><img width="100" src="https://user-images.githubusercontent.com/6063380/46976166-ab280a80-d096-11e8-983b-18dd38c8cc9b.png" /></a>
49-
<br />
50-
<a href="https://www.fastly.com/" target="_blank"><img width="100" src="https://cdn-assets-us.frontify.com/s3/frontify-enterprise-files-us/eyJwYXRoIjoiZmFzdGx5XC9hY2NvdW50c1wvYzJcLzQwMDEwMjNcL3Byb2plY3RzXC8xMVwvYXNzZXRzXC80ZVwvNzc0XC9lZTZmYzlkOWYzNWE1NjBkNjUzNjFkNGI0NGQ2MTNmZi0xNjIxNTIyODg4LnBuZyJ9:fastly:nVuY3PxyFqQMI6elJsMzxAGLH3IFlmiuMdacHAGRMkE?width=2400" /></a>

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "p5.js-web-editor",
3-
"version": "2.15.5",
3+
"version": "2.15.6",
44
"description": "The web editor for p5.js.",
55
"scripts": {
66
"clean": "rimraf dist",

server/server.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -145,25 +145,6 @@ if (process.env.BASIC_USERNAME && process.env.BASIC_PASSWORD) {
145145
);
146146
}
147147

148-
// routing to serve files in .well-known with specific content type
149-
// temporary addition for the apple pay integration with donorbox
150-
app.use(
151-
'/.well-known/apple-developer-merchantid-domain-association',
152-
(req, res, next) => {
153-
const rootPath = path.resolve(__dirname, '../public/.well-known');
154-
const fileName = 'apple-developer-merchantid-domain-association';
155-
156-
res.setHeader('Content-Type', 'text/plain');
157-
158-
res.sendFile(fileName, { root: rootPath }, (err) => {
159-
if (err) {
160-
console.error('Error serving file:', err);
161-
next(err);
162-
}
163-
});
164-
}
165-
);
166-
167148
// Body parser, cookie parser, sessions, serve public assets
168149
app.use(
169150
'/locales',

0 commit comments

Comments
 (0)