Merge pull request #9 from mwood77/migrate-to-gh-pages

Migrate to gh pages
mwood77 · Feb 24, 2025 · 962b3a1 · 962b3a1
2 parents 14d1b71 + da4120c
commit 962b3a1
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 7 deletions.
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/resources/data.min.js b/docs/resources/data.min.js
diff --git a/docs/resources/vendor.min.js b/docs/resources/vendor.min.js
diff --git a/docs/resources/ws.min.js b/docs/resources/ws.min.js
diff --git a/gulp/build-gh-pages.mjs b/gulp/build-gh-pages.mjs
@@ -2,6 +2,7 @@
 import {
 	src, dest, series, parallel,
 } from 'gulp';
+import terser from 'gulp-terser';
 import concat from 'gulp-concat';
 import ejs from 'gulp-ejs';
 import rename from 'gulp-rename';
@@ -13,6 +14,38 @@ import { readFile } from 'fs/promises';
 
 const clean = () => deleteAsync(['./docs']);
 
+const jsSourcesData = [
+	'server/scripts/data/travelcities.js',
+	'server/scripts/data/regionalcities.js',
+	'server/scripts/data/stations.js',
+];
+
+const jsVendorSources = [
+	'server/scripts/vendor/auto/jquery.js',
+	'server/scripts/vendor/jquery.autocomplete.min.js',
+	'server/scripts/vendor/auto/nosleep.js',
+	'server/scripts/vendor/auto/swiped-events.js',
+	'server/scripts/vendor/auto/suncalc.js',
+];
+
+const mjsSources = [
+	'server/scripts/modules/currentweatherscroll.mjs',
+	'server/scripts/modules/hazards.mjs',
+	'server/scripts/modules/currentweather.mjs',
+	'server/scripts/modules/almanac.mjs',
+	'server/scripts/modules/icons.mjs',
+	'server/scripts/modules/extendedforecast.mjs',
+	'server/scripts/modules/hourly.mjs',
+	'server/scripts/modules/hourly-graph.mjs',
+	'server/scripts/modules/latestobservations.mjs',
+	'server/scripts/modules/localforecast.mjs',
+	'server/scripts/modules/radar.mjs',
+	'server/scripts/modules/regionalforecast.mjs',
+	'server/scripts/modules/travelforecast.mjs',
+	'server/scripts/modules/progress.mjs',
+	'server/scripts/index.mjs',
+];
+
 const BUILD_PATH = './docs/resources';
 
 const webpackOptions = {
@@ -24,7 +57,21 @@ const webpackOptions = {
 	},
 };
 
-const buildJs = () => src(['server/scripts/index.mjs'])
+const compressJsData = () => src(jsSourcesData)
+	.pipe(concat('data.min.js'))
+	.pipe(terser())
+	.pipe(dest(BUILD_PATH));
+
+const compressJsVendor = () => src(jsVendorSources)
+	.pipe(concat('vendor.min.js'))
+	.pipe(terser())
+	.pipe(dest(BUILD_PATH));
+
+// const buildJs = () => src(['server/scripts/index.mjs'])
+// 	.pipe(webpack(webpackOptions))
+// 	.pipe(dest(BUILD_PATH));
+
+const buildJs = () => src(mjsSources)
 	.pipe(webpack(webpackOptions))
 	.pipe(dest(BUILD_PATH));
 
@@ -52,6 +99,6 @@ const compressHtml = async () => {
 const copyOtherFiles = () => src(['server/robots.txt', 'server/manifest.json'], { base: 'server/' })
 	.pipe(dest('./docs'));
 
-const build = series(clean, parallel(buildJs, copyCss, compressHtml, copyOtherFiles, copyAssets));
+const build = series(clean, parallel(buildJs, copyCss, compressHtml, copyOtherFiles, copyAssets, compressJsData, compressJsVendor));
 
 export default build;
diff --git a/views/index.ejs b/views/index.ejs
@@ -20,7 +20,7 @@
   <script type="text/javascript" src="resources/data.min.js?_=<%=production%>"></script>
   <script type="text/javascript" src="resources/vendor.min.js?_=<%=production%>"></script>
   <script type="text/javascript" src="resources/ws.min.js?_=<%=production%>"></script>
-  <script type="text/javascript" src="scripts/custom.js?_=<%=production%>"></script>
+  <!-- <script type="text/javascript" src="scripts/custom.js?_=<%=production%>"></script> -->
   <% } else { %>
   <link rel="stylesheet" type="text/css" href="styles/main.css" />
   <script type="text/javascript" src="scripts/vendor/auto/jquery.js"></script>
@@ -45,13 +45,13 @@
   <script type="module" src="scripts/modules/radar.mjs"></script>
   <script type="module" src="scripts/modules/settings.mjs"></script>
 	<script type="module" src="scripts/index.mjs"></script>
-	<script type="text/javascript" src="scripts/custom.js"></script>
+	<!-- <script type="text/javascript" src="scripts/custom.js"></script> -->
   <!-- data -->
   <script type="text/javascript" src="scripts/data/travelcities.js"></script>
   <script type="text/javascript" src="scripts/data/regionalcities.js"></script>
   <script type="text/javascript" src="scripts/data/stations.js"></script>
 
-  <script type="text/javascript" src="scripts/custom.js"></script>
+  <!-- <script type="text/javascript" src="scripts/custom.js"></script> -->
 
   <% } %>