From 3be9435a7088087fa48b00a9370e4f1433e3701e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= <maxi_kroeg@web.de>
Date: Mon, 27 Jul 2020 21:49:18 +0200
Subject: [PATCH] Remove unused codepen resources, duplicate bootstrap / jquery
 js

Use push instead of setting by index, gets rid of some empty lines generated by sparse
resource array
---
 examples/webpack/example-builder.js | 47 +++++++++++++----------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/examples/webpack/example-builder.js b/examples/webpack/example-builder.js
index 038eaf5289..93ae36cb88 100644
--- a/examples/webpack/example-builder.js
+++ b/examples/webpack/example-builder.js
@@ -9,9 +9,11 @@ const promisify = require('util').promisify;
 const RawSource = require('webpack-sources').RawSource;
 
 const readFile = promisify(fs.readFile);
-const isCssRegEx = /\.css$/;
+const isCssRegEx = /\.css(\?.*)?$/;
 const isJsRegEx = /\.js(\?.*)?$/;
 const importRegEx = /^import .* from '(.*)';$/;
+const isTemplateJs = /\/(jquery(-\d+\.\d+\.\d+)?|(bootstrap(\.bundle)?))(\.min)?\.js(\?.*)?$/;
+const isTemplateCss = /\/bootstrap(\.min)?\.css(\?.*)?$/;
 
 handlebars.registerHelper(
   'md',
@@ -361,41 +363,34 @@ class ExampleBuilder {
 
     // add additional resources
     if (data.resources) {
-      const resources = [];
+      const localResources = [];
       const remoteResources = [];
-      const codePenResources = [];
-      for (let i = 0, ii = data.resources.length; i < ii; ++i) {
-        const resource = data.resources[i];
-        const remoteResource =
-          resource.indexOf('//') === -1
-            ? `https://openlayers.org/en/v${pkg.version}/examples/${resource}`
-            : resource;
-        codePenResources[i] = remoteResource;
+      data.resources.forEach((resource) => {
+        const remoteResource = /^https?:\/\//.test(resource)
+          ? resource
+          : `https://openlayers.org/en/v${pkg.version}/examples/${resource}`;
         if (isJsRegEx.test(resource)) {
-          resources[i] = `<script src="${resource}"></script>`;
-          remoteResources[i] = `<script src="${remoteResource}"></script>`;
-        } else if (isCssRegEx.test(resource)) {
-          if (resource.indexOf('bootstrap.min.css') === -1) {
-            resources[i] = '<link rel="stylesheet" href="' + resource + '">';
+          if (!isTemplateJs.test(resource)) {
+            localResources.push(`<script src="${resource}"></script>`);
           }
-          remoteResources[i] =
-            '<link rel="stylesheet" href="' + remoteResource + '">';
+          remoteResources.push(`<script src="${remoteResource}"></script>`);
+        } else if (isCssRegEx.test(resource)) {
+          if (!isTemplateCss.test(resource)) {
+            localResources.push(`<link rel="stylesheet" href="${resource}">`);
+          }
+          remoteResources.push(
+            `<link rel="stylesheet" href="${remoteResource}">`
+          );
         } else {
           throw new Error(
-            'Invalid value for resource: ' +
-              resource +
-              ' is not .js or .css: ' +
-              data.filename
+            `Invalid resource: '${resource}' is not .js or .css: ${data.filename}`
           );
         }
-      }
+      });
       data.extraHead = {
-        local: resources.join('\n'),
+        local: localResources.join('\n'),
         remote: remoteResources.join('\n'),
       };
-      data.extraResources = data.resources.length
-        ? ',' + codePenResources.join(',')
-        : '';
     }
 
     const templatePath = path.join(this.templates, data.layout);