Merge pull request #13879 from ahocevar/examples

Codesandbox and bundler improvements for examples

examples/webpack/example-builder.js

@@ -13,7 +13,7 @@ const baseDir = dirname(fileURLToPath(import.meta.url));
 
 const isCssRegEx = /\.css(\?.*)?$/;
 const isJsRegEx = /\.js(\?.*)?$/;
-const importRegEx = /(?:^|\n)import .* from '(.*)';(?:\n|$)/g;
+const importRegEx = /\s?import .*? from '([^']+)'/g;
 const isTemplateJs =
   /\/(jquery(-\d+\.\d+\.\d+)?|(bootstrap(\.bundle)?))(\.min)?\.js(\?.*)?$/;
 const isTemplateCss = /\/bootstrap(\.min)?\.css(\?.*)?$/;
@@ -146,6 +146,8 @@ function getDependencies(jsSource, pkg) {
       const dep = imp.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
       if (dep in pkg.devDependencies) {
         dependencies[dep] = pkg.devDependencies[dep];
+      } else if (dep in pkg.dependencies) {
+        dependencies[dep] = pkg.dependencies[dep];
       }
     }
   }
@@ -343,11 +345,11 @@ export default class ExampleBuilder {
         name: data.name,
         dependencies: getDependencies(jsSources, pkg),
         devDependencies: {
-          parcel: '^2.0.0',
+          vite: '^3.0.3',
         },
         scripts: {
-          start: 'parcel index.html',
-          build: 'parcel build --public-url . index.html',
+          start: 'vite',
+          build: 'vite build',
         },
       },
       null,

package-lock.json

@@ -11,7 +11,7 @@
       "dependencies": {
         "earcut": "^2.2.3",
         "geotiff": "2.0.4",
-        "ol-mapbox-style": "^8.0.5",
+        "ol-mapbox-style": "8.2.0",
         "pbf": "3.2.1",
         "rbush": "^3.0.1"
       },
@@ -55,7 +55,7 @@
         "mocha": "10.0.0",
         "pixelmatch": "^5.1.0",
         "pngjs": "^6.0.0",
-        "proj4": "^2.7.5",
+        "proj4": "2.8.0",
         "puppeteer": "15.4.0",
         "regenerator-runtime": "^0.13.9",
         "rollup": "^2.42.3",
@@ -7353,9 +7353,9 @@
       "dev": true
     },
     "node_modules/ol-mapbox-style": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-8.1.2.tgz",
-      "integrity": "sha512-Ay1zHi84Phqpu+EnzuDSIrjo2GdtOw3u9t8M34JM/RNKzaRlbGKpJW1c3hmkM2ZnMUFHecTXnd3ytrB+lrMs5A==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-8.2.0.tgz",
+      "integrity": "sha512-WyCiNUj5DiD3+MvgqXvxSf0mDUvagtlq9JQ97mHwDD1FliHt5G1333Lvqskg8psBfxijHSEWNHwqzBGnEUo1bw==",
       "dependencies": {
         "@mapbox/mapbox-gl-style-spec": "^13.23.1",
         "mapbox-to-css-font": "^2.4.1"
@@ -15841,9 +15841,9 @@
       "dev": true
     },
     "ol-mapbox-style": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-8.1.2.tgz",
-      "integrity": "sha512-Ay1zHi84Phqpu+EnzuDSIrjo2GdtOw3u9t8M34JM/RNKzaRlbGKpJW1c3hmkM2ZnMUFHecTXnd3ytrB+lrMs5A==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-8.2.0.tgz",
+      "integrity": "sha512-WyCiNUj5DiD3+MvgqXvxSf0mDUvagtlq9JQ97mHwDD1FliHt5G1333Lvqskg8psBfxijHSEWNHwqzBGnEUo1bw==",
       "requires": {
         "@mapbox/mapbox-gl-style-spec": "^13.23.1",
         "mapbox-to-css-font": "^2.4.1"

package.json

@@ -47,7 +47,7 @@
   "dependencies": {
     "earcut": "^2.2.3",
     "geotiff": "2.0.4",
-    "ol-mapbox-style": "^8.0.5",
+    "ol-mapbox-style": "8.2.0",
     "pbf": "3.2.1",
     "rbush": "^3.0.1"
   },
@@ -91,7 +91,7 @@
     "mocha": "10.0.0",
     "pixelmatch": "^5.1.0",
     "pngjs": "^6.0.0",
-    "proj4": "^2.7.5",
+    "proj4": "2.8.0",
     "puppeteer": "15.4.0",
     "regenerator-runtime": "^0.13.9",
     "rollup": "^2.42.3",