From ca9fc92f70715125b7c455d37a0f94d51b173547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= <maxi_kroeg@web.de>
Date: Mon, 1 Nov 2021 23:34:44 +0100
Subject: [PATCH] Example builder code cleanup

Add function for transforming js source and cloaking
Use  to parse source for import statements
Use now released parcel 2.0.0
---
 examples/webpack/example-builder.js | 92 ++++++++++++-----------------
 1 file changed, 38 insertions(+), 54 deletions(-)

diff --git a/examples/webpack/example-builder.js b/examples/webpack/example-builder.js
index 8f41398982..c8efc6370a 100644
--- a/examples/webpack/example-builder.js
+++ b/examples/webpack/example-builder.js
@@ -13,7 +13,7 @@ const baseDir = dirname(fileURLToPath(import.meta.url));
 
 const isCssRegEx = /\.css(\?.*)?$/;
 const isJsRegEx = /\.js(\?.*)?$/;
-const importRegEx = /^import .* from '(.*)';$/;
+const importRegEx = /(?:^|\n)import .* from '(.*)';(?:\n|$)/g;
 const isTemplateJs =
   /\/(jquery(-\d+\.\d+\.\d+)?|(bootstrap(\.bundle)?))(\.min)?\.js(\?.*)?$/;
 const isTemplateCss = /\/bootstrap(\.min)?\.css(\?.*)?$/;
@@ -134,26 +134,18 @@ function createWordIndex(exampleData) {
  * @return {Object<string, string>} dependencies
  */
 function getDependencies(jsSource, pkg) {
-  const lines = jsSource.split('\n');
   const dependencies = {
     ol: pkg.version,
   };
-  for (let i = 0, ii = lines.length; i < ii; ++i) {
-    const line = lines[i];
-    const importMatch = line.match(importRegEx);
-    if (importMatch) {
-      const imp = importMatch[1];
-      if (!imp.startsWith('ol/') && imp != 'ol') {
-        const parts = imp.split('/');
-        let dep;
-        if (imp.startsWith('@')) {
-          dep = parts.slice(0, 2).join('/');
-        } else {
-          dep = parts[0];
-        }
-        if (dep in pkg.devDependencies) {
-          dependencies[dep] = pkg.devDependencies[dep];
-        }
+
+  let importMatch;
+  while ((importMatch = importRegEx.exec(jsSource))) {
+    const imp = importMatch[1];
+    if (!imp.startsWith('ol/') && imp != 'ol') {
+      const parts = imp.split('/');
+      const dep = imp.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
+      if (dep in pkg.devDependencies) {
+        dependencies[dep] = pkg.devDependencies[dep];
       }
     }
   }
@@ -279,39 +271,40 @@ export default class ExampleBuilder {
     data.jsSource = jsSource;
 
     // process tags
-    if (data.tags) {
-      data.tags = data.tags.replace(/[\s"]+/g, '').split(',');
-    } else {
-      data.tags = [];
-    }
+    data.tags = data.tags ? data.tags.replace(/[\s"]+/g, '').split(',') : [];
     return data;
   }
 
+  transformJsSource(source) {
+    return (
+      source
+        // remove "../src/" prefix and ".js" to have the same import syntax as the documentation
+        .replace(/'\.\.\/src\//g, "'")
+        .replace(/\.js';/g, "';")
+        // Remove worker loader import and modify `new Worker()` to add source
+        .replace(/import Worker from 'worker-loader![^\n]*\n/g, '')
+        .replace('new Worker()', "new Worker('./worker.js', {type: 'module'})")
+    );
+  }
+
+  cloakSource(source, cloak) {
+    if (cloak) {
+      for (const entry of cloak) {
+        source = source.replace(new RegExp(entry.key, 'g'), entry.value);
+      }
+    }
+    return source;
+  }
+
   async render(data) {
     const assets = {};
     const readOptions = {encoding: 'utf8'};
 
     // add in script tag
     const jsName = `${data.name}.js`;
-
-    // remove "../src/" prefix and ".js" to have the same import syntax as the documentation
-    let jsSource = data.jsSource.replace(/'\.\.\/src\//g, "'");
-    jsSource = jsSource.replace(/\.js';/g, "';");
-    if (data.cloak) {
-      for (const entry of data.cloak) {
-        jsSource = jsSource.replace(new RegExp(entry.key, 'g'), entry.value);
-      }
-    }
-    // Remove worker loader import and modify `new Worker()` to add source
-    jsSource = jsSource.replace(
-      /import Worker from 'worker-loader![^\n]*\n/g,
-      ''
+    const jsSource = this.transformJsSource(
+      this.cloakSource(data.jsSource, data.cloak)
     );
-    jsSource = jsSource.replace(
-      'new Worker()',
-      "new Worker('./worker.js', {type: 'module'})"
-    );
-
     data.js = {
       tag: `<script src="${this.common}.js"></script>
         <script src="${jsName}"></script>`,
@@ -328,17 +321,9 @@ export default class ExampleBuilder {
       // pass
     }
     if (workerSource) {
-      // remove "../src/" prefix and ".js" to have the same import syntax as the documentation
-      workerSource = workerSource.replace(/'\.\.\/src\//g, "'");
-      workerSource = workerSource.replace(/\.js';/g, "';");
-      if (data.cloak) {
-        for (const entry of data.cloak) {
-          workerSource = workerSource.replace(
-            new RegExp(entry.key, 'g'),
-            entry.value
-          );
-        }
-      }
+      workerSource = this.transformJsSource(
+        this.cloakSource(workerSource, data.cloak)
+      );
       data.worker = {
         source: workerSource,
       };
@@ -346,7 +331,6 @@ export default class ExampleBuilder {
     }
 
     const pkg = await getPackageInfo();
-
     data.pkgJson = JSON.stringify(
       {
         name: data.name,
@@ -355,7 +339,7 @@ export default class ExampleBuilder {
           pkg
         ),
         devDependencies: {
-          parcel: '^2.0.0-beta.1',
+          parcel: '^2.0.0',
         },
         scripts: {
           start: 'parcel index.html',