diff --git a/gulp/bundle-loader.js b/gulp/bundle-loader.js index a64b6b97..16db26fa 100644 --- a/gulp/bundle-loader.js +++ b/gulp/bundle-loader.js @@ -108,13 +108,8 @@ callbackDone = true; }; - // var scriptEs6 = makeJsTag(bundleSrc, bundleIntegrity); - // scriptEs6.addEventListener("error", loadFallbackJs); - // scriptEs6.addEventListener("load", onJsLoaded); - // document.head.appendChild(scriptEs6); - - var scriptTransp = makeJsTag(bundleSrcTranspiled, bundleIntegrityTranspiled); - scriptTransp.addEventListener("error", scriptFail); - scriptTransp.addEventListener("load", onJsLoaded); - document.head.appendChild(scriptTransp); + var scriptEs6 = makeJsTag(bundleSrc, bundleIntegrity); + scriptEs6.addEventListener("error", loadFallbackJs); + scriptEs6.addEventListener("load", onJsLoaded); + document.head.appendChild(scriptEs6); })(); diff --git a/gulp/html.js b/gulp/html.js index ceb38dfa..be638f43 100644 --- a/gulp/html.js +++ b/gulp/html.js @@ -167,16 +167,16 @@ function gulptasksHTML($, gulp, buildFolder) { const loadJs = document.createElement("script"); loadJs.type = "text/javascript"; let scriptContent = ""; - // scriptContent += `var bundleSrc = '${cachebust("bundle.js")}';\n`; + scriptContent += `var bundleSrc = '${cachebust("bundle.js")}';\n`; scriptContent += `var bundleSrcTranspiled = '${cachebust( "bundle-transpiled.js" )}';\n`; if (integrity) { - // scriptContent += - // "var bundleIntegrity = '" + - // computeIntegrityHash(path.join(buildFolder, "bundle.js")) + - // "';\n"; + scriptContent += + "var bundleIntegrity = '" + + computeIntegrityHash(path.join(buildFolder, "bundle.js")) + + "';\n"; scriptContent += "var bundleIntegrityTranspiled = '" + computeIntegrityHash(path.join(buildFolder, "bundle-transpiled.js")) + diff --git a/gulp/js.js b/gulp/js.js index 39b286e1..085a9d74 100644 --- a/gulp/js.js +++ b/gulp/js.js @@ -86,9 +86,9 @@ function gulptasksJS($, gulp, buildFolder, browserSync) { gulp.task( "js." + variant + ".prod", - // ES6 Currently not used + // transpiled currently not used // gulp.parallel("js." + variant + ".prod.transpiled", "js." + variant + ".prod.es6") - gulp.parallel("js." + variant + ".prod.transpiled") + gulp.parallel("js." + variant + ".prod.es6") ); } else { // STANDALONE