From 392ca5706d292ecc4d56897bb39f14063112922a Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 26 Jul 2022 18:28:06 +0200 Subject: [PATCH 1/4] More forgiving import regex --- examples/webpack/example-builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/webpack/example-builder.js b/examples/webpack/example-builder.js index 5b2df9b9e7..700dd7c748 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 = /(?:^|\n)import .* from '(.*)';(?:\n|$)/g; +const importRegEx = /\simport .* from '([^']+)';\s/g; const isTemplateJs = /\/(jquery(-\d+\.\d+\.\d+)?|(bootstrap(\.bundle)?))(\.min)?\.js(\?.*)?$/; const isTemplateCss = /\/bootstrap(\.min)?\.css(\?.*)?$/; From db77f7d4a2847038d0fd68ed5e20fd5d197aec4c Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 26 Jul 2022 18:28:44 +0200 Subject: [PATCH 2/4] Use explicit versions for example dependencies --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index bccfcedc49..e56e96ad34 100644 --- a/package-lock.json +++ b/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" diff --git a/package.json b/package.json index 991811cea4..56b3cef9a5 100644 --- a/package.json +++ b/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", From b5afd06edfab65f43f5a1ae725cfb8d847312bb3 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 26 Jul 2022 18:29:16 +0200 Subject: [PATCH 3/4] Also look for example dependencies in dependencies --- examples/webpack/example-builder.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/webpack/example-builder.js b/examples/webpack/example-builder.js index 700dd7c748..65f8c64cbc 100644 --- a/examples/webpack/example-builder.js +++ b/examples/webpack/example-builder.js @@ -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]; } } } From 1e15daa3544f3fd7c98438ceb7579aebc41ee33d Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Tue, 26 Jul 2022 18:29:30 +0200 Subject: [PATCH 4/4] Use vite instead of parcel --- examples/webpack/example-builder.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/webpack/example-builder.js b/examples/webpack/example-builder.js index 65f8c64cbc..218c012db3 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 = /\simport .* from '([^']+)';\s/g; +const importRegEx = /\s?import .*? from '([^']+)'/g; const isTemplateJs = /\/(jquery(-\d+\.\d+\.\d+)?|(bootstrap(\.bundle)?))(\.min)?\.js(\?.*)?$/; const isTemplateCss = /\/bootstrap(\.min)?\.css(\?.*)?$/; @@ -345,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,