Tidy up and always use bundle in built site for now

Just to be safe
This commit is contained in:
ines 2017-11-03 11:29:21 +01:00
parent d0f88af5b6
commit a62b0727d8

View File

@ -13,7 +13,6 @@ script(src="/assets/js/vendor/prism.min.js")
if SECTION == "models" if SECTION == "models"
script(src="/assets/js/vendor/chart.min.js") script(src="/assets/js/vendor/chart.min.js")
script(src="/assets/js/models.js?v#{V_JS}" type="module")
script script
if quickstart if quickstart
@ -24,15 +23,15 @@ script
| (ga.q=ga.q||[]).push(arguments)}; ga.l=+new Date; | (ga.q=ga.q||[]).push(arguments)}; ga.l=+new Date;
| ga('create', '#{ANALYTICS}', 'auto'); ga('send', 'pageview'); | ga('create', '#{ANALYTICS}', 'auto'); ga('send', 'pageview');
if IS_PAGE
if IS_PAGE
script
| ((window.gitter = {}).chat = {}).options = { | ((window.gitter = {}).chat = {}).options = {
| useStyles: false, | useStyles: false,
| activationElement: '.js-gitter-button', | activationElement: '.js-gitter-button',
| targetElement: '.js-gitter', | targetElement: '.js-gitter',
| room: '!{SOCIAL.gitter}' | room: '!{SOCIAL.gitter}'
| }; | };
if IS_PAGE
script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer) script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
@ -48,39 +47,36 @@ if IS_PAGE
- ModelLoader = "new ModelLoader('" + MODELS_REPO + "'," + JSON.stringify(CURRENT_MODELS) + "," + JSON.stringify(MODEL_LICENSES) + "," + JSON.stringify(MODEL_BENCHMARKS) + ");" - ModelLoader = "new ModelLoader('" + MODELS_REPO + "'," + JSON.stringify(CURRENT_MODELS) + "," + JSON.stringify(MODEL_LICENSES) + "," + JSON.stringify(MODEL_BENCHMARKS) + ");"
- ModelComparer = "new ModelComparer('" + MODELS_REPO + "'," + JSON.stringify(MODEL_LICENSES) + "," + JSON.stringify(MODEL_BENCHMARKS) + "," + JSON.stringify(LANGUAGES) + "," + JSON.stringify(MODEL_META) + "," + JSON.stringify(default_models || false) + ");" - ModelComparer = "new ModelComparer('" + MODELS_REPO + "'," + JSON.stringify(MODEL_LICENSES) + "," + JSON.stringify(MODEL_BENCHMARKS) + "," + JSON.stringify(LANGUAGES) + "," + JSON.stringify(MODEL_META) + "," + JSON.stringify(default_models || false) + ");"
//- Browsers with JS module support. if environment == "deploy"
Will be ignored otherwise. //- DEPLOY: use compiled rollup.js and instantiate classes directly
script(src="/assets/js/rollup.js")
script(type="module") script
| import ProgressBar from '/assets/js/progress.js'; !=ProgressBar
!=ProgressBar if changelog
if changelog !=Changelog
| import Changelog from '/assets/js/changelog.js'; if IS_PAGE
!=Changelog !=NavHighlighter
if IS_PAGE !=GitHubEmbed
| import NavHighlighter from '/assets/js/nav-highlighter.js'; if HAS_MODELS
!=NavHighlighter !=ModeLoader
| import GitHubEmbed from '/assets/js/github-embed.js'; if compare_models
!=GitHubEmbed !=ModelComparer
if HAS_MODELS else
| import { ModelLoader } from '/assets/js/models.js'; //- DEVELOPMENT: Use ES6 modules
!=ModelLoader script(type="module")
if compare_models | import ProgressBar from '/assets/js/progress.js';
| import { ModelComparer } from '/assets/js/models.js'; !=ProgressBar
!=ModelComparer if changelog
| import Changelog from '/assets/js/changelog.js';
//- Browsers with no JS module support. !=Changelog
Won't be fetched or interpreted otherwise. if IS_PAGE
| import NavHighlighter from '/assets/js/nav-highlighter.js';
script(nomodule src="/assets/js/rollup.js") !=NavHighlighter
script(nomodule) | import GitHubEmbed from '/assets/js/github-embed.js';
!=ProgressBar !=GitHubEmbed
if changelog if HAS_MODELS
!=Changelog | import { ModelLoader } from '/assets/js/models.js';
if IS_PAGE !=ModelLoader
!=NavHighlighter if compare_models
!=GitHubEmbed | import { ModelComparer } from '/assets/js/models.js';
if HAS_MODELS !=ModelComparer
!=ModeLoader
if compare_models
!=ModelComparer