chore: updated peakfinder build process

Akylas · Oct 25, 2024 · 1d20496 · 1d20496
1 parent eac3c92
commit 1d20496
Show file tree

Hide file tree

Showing 6 changed files with 182 additions and 356 deletions.
diff --git a/app.webpack.config.js b/app.webpack.config.js
@@ -33,6 +33,7 @@ module.exports = (env, params = {}) => {
         env = Object.assign(
             {},
             {
+                buildpeakfinder: true,
                 production: env.production !== false,
                 sentry: true,
                 uploadSentry: true,
@@ -946,7 +947,7 @@ module.exports = (env, params = {}) => {
         })
     ];
     if (buildpeakfinder) {
-        return [require('./peakfinder.webpack.config.js')(env, params), config];
+        return [require('./peakfinder/webpack.config.js')(env, params), config];
     } else {
         return config;
     }

diff --git a/app/assets/peakfinder/index.html b/app/assets/peakfinder/index.html
@@ -1 +1 @@
-<html><head><meta name="viewport" content="initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script defer="defer" src="webapp.js"></script><link href="main.css" rel="stylesheet"></head><body><video id="video" autoplay playsinline></video><canvas id="canvas" class="canvas"></canvas><canvas id="canvas4" class="canvas"></canvas><div id="compass" onclick="webapp.stopEventPropagation(event);webapp.setAzimuth(0)"><div id="compass_slice"></div></div><div id="camera_button" onclick="webapp.stopEventPropagation(event);webapp.toggleCamera()" style="visibility:hidden"></div></body></html>
+<!doctype html><html><head><meta charset="UTF-8"/><meta name="viewport" content="initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/><script defer="defer" src="webapp.js"></script><link href="main.css" rel="stylesheet"></head><body><video id="video" autoplay playsinline></video><canvas id="canvas" class="canvas"></canvas><canvas id="canvas4" class="canvas"></canvas><div id="compass" onclick="webapp.stopEventPropagation(event);webapp.setAzimuth(0)"><div id="compass_slice"></div></div><div id="camera_button" onclick="webapp.stopEventPropagation(event);webapp.toggleCamera()" style="visibility:hidden;"></div></body></html>
diff --git a/peakfinder.webpack.config.js b/peakfinder.webpack.config.js
diff --git a/peakfinder/package.json b/peakfinder/package.json
@@ -5,26 +5,26 @@
         "start": "webpack serve --mode development"
     },
     "dependencies": {
-        "@babel/core": "^7.24.9",
-        "@babel/plugin-transform-optional-chaining": "^7.24.8",
-        "@babel/preset-env": "^7.24.8",
-        "babel-loader": "^9.1.3",
+        "@babel/core": "^7.26.0",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9",
+        "@babel/preset-env": "^7.26.0",
+        "babel-loader": "^9.2.1",
         "leaflet": "1.9.4",
-        "maplibre-gl": "^4.5.0",
+        "maplibre-gl": "^4.7.1",
         "svelte-range-slider-pips": "^2.3.1"
     },
     "devDependencies": {
-        "@types/babel__core": "^7",
+        "@types/babel__core": "^7.20.5",
         "@types/babel__preset-env": "^7.9.7",
-        "@types/leaflet": "1.9.12",
+        "@types/leaflet": "1.9.14",
         "@types/svelte-range-slider-pips": "^2.0.4",
         "css-minimizer-webpack-plugin": "^7.0.0",
-        "html-webpack-plugin": "^5.6.0",
+        "html-webpack-plugin": "^5.6.3",
         "mini-css-extract-plugin": "^2.9.0",
-        "svelte": "4.2.18",
+        "svelte": "4.2.19",
         "tsconfig-paths-webpack-plugin": "^4.1.0",
-        "webpack": "5.93.0",
+        "webpack": "5.95.0",
         "webpack-cli": "5.1.4",
-        "webpack-dev-server": "5.0.4"
+        "webpack-dev-server": "5.1.0"
     }
 }
diff --git a/peakfinder/webpack.config.js b/peakfinder/webpack.config.js
@@ -25,6 +25,7 @@ module.exports = (env = {}, params = {}) => {
     const mode = production !== undefined ? (!!production ? 'production' : 'development') : process.env.NODE_ENV || 'development';
     const platform = env && ((env.android && 'android') || (env.ios && 'ios'));
     const prod = mode === 'production';
+    console.log('buildpeakfinder', prod);
     return {
         mode,
         target: 'web',
@@ -33,7 +34,7 @@ module.exports = (env = {}, params = {}) => {
         resolve: {
             exportsFields: [],
             conditionNames: ['svelte'],
-            modules: [resolve(__dirname, '..', 'node_modules'), resolve(__dirname, '..', 'geo-three', 'node_modules') ],
+            modules: [resolve(__dirname, '..', 'node_modules'), resolve(__dirname, '..', 'geo-three', 'node_modules')],
             alias: {
                 './LocalHeightProvider': resolve(__dirname, '..', 'peakfinder/LocalHeightProvider'),
                 './TestMapProvider': resolve(__dirname, '..', 'peakfinder/RasterMapProvider')
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<html><head><meta name="viewport" content="initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"><script defer="defer" src="webapp.js"></script><link href="main.css" rel="stylesheet"></head><body><video id="video" autoplay playsinline></video><canvas id="canvas" class="canvas"></canvas><canvas id="canvas4" class="canvas"></canvas><div id="compass" onclick="webapp.stopEventPropagation(event);webapp.setAzimuth(0)"><div id="compass_slice"></div></div><div id="camera_button" onclick="webapp.stopEventPropagation(event);webapp.toggleCamera()" style="visibility:hidden"></div></body></html>
		<!doctype html><html><head><meta charset="UTF-8"/><meta name="viewport" content="initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/><script defer="defer" src="webapp.js"></script><link href="main.css" rel="stylesheet"></head><body><video id="video" autoplay playsinline></video><canvas id="canvas" class="canvas"></canvas><canvas id="canvas4" class="canvas"></canvas><div id="compass" onclick="webapp.stopEventPropagation(event);webapp.setAzimuth(0)"><div id="compass_slice"></div></div><div id="camera_button" onclick="webapp.stopEventPropagation(event);webapp.toggleCamera()" style="visibility:hidden;"></div></body></html>