r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Merge in master

This commit is contained in:
Cassie Tarakajian 2020-01-28 17:31:44 -05:00
parent 40f1bcf309 dc9e8cbdb8
commit bc4a9f58d2
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/modules/IDE/reducers/files.js
View File

@ -11,7 +11,7 @@ function draw() {
const defaultHTML =
`<!DOCTYPE html>
<html>
<html lang="en">
<head>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/p5.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/addons/p5.sound.min.js"></script>

4
package.json
View File

@ -92,8 +92,8 @@
"webpack-node-externals": "^1.7.2"
},
"engines": {
"node": "12.14.1",
"npm": "6.13.4"
"node": "11.15.0",
"npm": "6.7.0"
},
"dependencies": {
"@babel/core": "^7.4.5",

2
server/scripts/examples-gg-latest.js
View File

@ -19,7 +19,7 @@ const clientSecret = process.env.GITHUB_SECRET;
const defaultHTML =
`<!DOCTYPE html>
<html>
<html lang="en">
<head>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.7.3/p5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.7.3/addons/p5.dom.min.js"></script>

2
server/scripts/examples.js
View File

@ -9,7 +9,7 @@ import Project from '../models/project';
const defaultHTML =
`<!DOCTYPE html>
<html>
<html lang="en">
<head>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/p5.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/addons/p5.sound.min.js"></script>

2
server/views/404Page.js
View File

@ -127,7 +127,7 @@ export function get404Sketch(callback) {
});
} else {
callback(insertErrorMessage(`<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8" />
</head>

4
server/views/index.js
View File

@ -2,7 +2,7 @@ export function renderIndex() {
const assetsManifest = process.env.webpackAssets && JSON.parse(process.env.webpackAssets);
return `
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -12,7 +12,7 @@ export function renderIndex() {
${process.env.NODE_ENV === 'production' ? `<link rel='stylesheet' href='${assetsManifest['/app.css']}' />` : ''}
<link href='https://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
<link rel='shortcut icon' href='https://raw.githubusercontent.com/processing/p5.js-website-OLD/master/favicon.ico' type='image/x-icon'/ >
<link rel='shortcut icon' href='https://raw.githubusercontent.com/processing/p5.js-website-OLD/master/favicon.ico' type='image/x-icon' / >
<script>
if (!window.process) {
window.process = {};