use live-editor@v1.2.0

greggman · greggman · commit fd6107f07849 · 2021-12-21T16:47:56.000-08:00
diff --git a/package.json b/package.json
@@ -3,10 +3,9 @@
   "version": "0.0.0",
   "description": "Some WebGL Tutorials designed for real WebGL and not 20yr old OpenGL",
   "main": "index.js",
-  "dependencies": {},
   "devDependencies": {
     "@gfxfundamentals/lesson-builder": "git+https://github.com/gfxfundamentals/lesson-builder.git#v1.8.2",
-    "@gfxfundamentals/live-editor": "git+https://github.com/gfxfundamentals/live-editor.git#v1.0.19",
+    "@gfxfundamentals/live-editor": "git+https://github.com/gfxfundamentals/live-editor.git#v1.2.0",
     "eslint-plugin-google-camelcase": "0.0.2",
     "eslint-plugin-html": "6.1.1",
     "eslint-plugin-one-variable-per-var": "0.0.3",
@@ -19,7 +18,7 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-eslint": "23.0.0",
     "grunt-jsdoc": "2.4.1",
-    "ld-check-dependencies": "1.1.1",
+    "ld-check-dependencies": "1.2.1",
     "load-grunt-tasks": "5.1.0",
     "minami": "1.2.3",
     "servez": "1.11.0"
diff --git a/webgl/resources/editor-settings.js b/webgl/resources/editor-settings.js
@@ -12,6 +12,15 @@ function getPrefix(url) {
   return prefix;
 }
 
+const lessonHelperScriptRE = /<script src="[^"]+lessons-helper\.js"><\/script>/;
+const webglDebugHelperScriptRE = /<script src="[^"]+webgl-debug-helper\.js"><\/script>/;
+
+function fixHTMLForCodeSite(html) {
+  html = html.replace(lessonHelperScriptRE, '');
+  html = html.replace(webglDebugHelperScriptRE, '');
+  return html;
+}
+
 /**
  * Fix any local URLs into fully qualified urls.
  *
@@ -141,14 +150,36 @@ function requestCORSIfNotSameOrigin(img, url) {
   return js;
 }
 
+function prepHTML(source, prefix) {
+  source = source.replace('<head>', `<head>
+  <link rel="stylesheet" href="${prefix}/resources/lesson-helper.css" type="text/css">
+  <script match="false">self.lessonSettings = ${JSON.stringify(lessonSettings)}</script>`);
+
+  source = source.replace('</head>', `<script src="${prefix}/resources/webgl-debug-helper.js"></script>
+<script src="${prefix}/resources/lessons-helper.js"></script>
+  </head>`);
+  return source;
+}
+
+function getWorkerPreamble(scriptInfo) {
+  return `self.lessonSettings = ${JSON.stringify(lessonSettings)};
+import '${dirname(scriptInfo.fqURL)}/resources/webgl-debug-helper.js';
+import '${dirname(scriptInfo.fqURL)}/resources/lessons-worker-helper.js';`;
+}
+
+const lessonSettings = {
+  glDebug: true,
+};
+
 window.lessonEditorSettings = {
   extraHTMLParsing,
   fixSourceLinks,
   fixJSForCodeSite,
+  fixHTMLForCodeSite,
   runOnResize: true,
-  lessonSettings: {
-    glDebug: true,
-  },
+  lessonSettings,
+  prepHTML,
+  getWorkerPreamble,
   tags: ['webgl', 'webglfundamentals.org'],
   name: 'WebGLFundamentals',
   icon: '/webgl/lessons/resources/webglfundamentals-icon-256.png',
