liftie 4.0.0 → 4.0.2

package/Makefile

@@ -10,11 +10,14 @@ LINT_SRC = app.js bin/generate lib test
 
 PLUGINS = lifts weather webcams snow
 
+ESBUILD_FORMAT = esm
+
 ESBUILD_OPTS += \
 	--bundle \
 	--log-level=warning \
 	--color=false \
 	--tree-shaking=true \
+    --format=${ESBUILD_FORMAT} \
 	--target=es2018
 
 ESBUILD_MIN_OPTS += \
@@ -57,6 +60,7 @@ all: lint test build
 		--use postcss-cachify \
 		--postcss-cachify.baseUrl /stylesheets \
 		--postcss-cachify.basePath public \
+		--postcss-cachify.format name \
 		--output $@ $@
 
 %.min.css: %.css
@@ -94,9 +98,11 @@ $(BUILD_DIR)/$(PROJECT).js: lib/client/boot/index.js $(SRC) node_modules | $(BUI
 $(BUILD_DIR)/$(PROJECT).min.js: lib/client/boot/index.js $(SRC) node_modules | $(BUILD_DIR)
 	$(RUN_ESBUILD_MIN)
 
+$(BUILD_DIR)/$(PROJECT)-embed.js: ESBUILD_FORMAT=iife
 $(BUILD_DIR)/$(PROJECT)-embed.js: lib/embed/index.js | $(BUILD_DIR)
 	$(RUN_ESBUILD)
 
+$(BUILD_DIR)/$(PROJECT)-embed.min.js: ESBUILD_FORMAT=iife
 $(BUILD_DIR)/$(PROJECT)-embed.min.js: lib/embed/index.js | $(BUILD_DIR)
 	$(RUN_ESBUILD_MIN)
 

package/app.js

@@ -28,7 +28,7 @@ process.env.NODE_ENV ??= 'development';
 const root = path.join(path.dirname(new URL(import.meta.url).pathname), 'public');
 const { SITE_URL: siteUrl, LIFTIE_STATIC_HOST: staticHost = '' } = process.env;
 
-const cachify = cachifyStatic(root);
+const cachify = cachifyStatic(root, { format: 'name' });
 
 app.locals = {
   min: '.min',

package/lib/cli/fetch.js

@@ -3,22 +3,21 @@ import { program } from 'commander';
 import curl from './curl.js';
 import { descriptorPath } from './dirs.js';
 
-let done;
-
 async function fetchExample(resortId) {
   try {
     const resort = JSON.parse(readFileSync(descriptorPath(resortId), 'utf8'));
-    done = true;
     await curl(resort.dataUrl || resort.api || resort.url, resortId);
-  } catch (e) {
-    console.error(resortId, 'is not a valid resort ID', e);
+  } catch {
+    console.error(`"${resortId}" is not a valid resort ID`);
     process.exit(1);
   }
 }
 
-program.arguments('<resort-id>').action(fetchExample).parse(process.argv);
-
-if (!done) {
-  program.outputHelp();
-  process.exit(1);
-}
+program
+  .arguments('<resort-id>')
+  .action(fetchExample)
+  .parseAsync()
+  .catch(e => {
+    console.error(e);
+    process.exit(1);
+  });

package/lib/cli/for-each-resort.js

@@ -1,14 +1,8 @@
-import { readdir } from 'node:fs';
+import { readdirSync } from 'node:fs';
 import { lib } from './dirs.js';
 export default forEachResort;
 
 function forEachResort(fn) {
   console.log('Reading:', lib);
-  readdir(lib, { withFileTypes: true }, (err, dirents) => {
-    if (err) {
-      console.error(err);
-      process.exit(1);
-    }
-    dirents.filter(dirent => dirent.isDirectory()).forEach(({ name }) => fn(name));
-  });
+  readdirSync(lib, { withFileTypes: true }).forEach(dirent => dirent.isDirectory() && fn(dirent.name));
 }

package/lib/cli/generate.js

@@ -52,7 +52,7 @@ const schema = [
   }
 ];
 
-program.option('-j, --json <file>', 'JSON file with resort data', String).parse(process.argv);
+program.option('-j, --json <file>', 'JSON file with resort data', String).parse();
 
 if (program.json) {
   fname = path.resolve(program.json);

package/lib/cli/noaa.js

@@ -1,10 +1,8 @@
-import { readFileSync, writeFileSync } from 'node:fs';
+import { readFile, writeFile } from 'node:fs/promises';
 import { program } from 'commander';
 import { descriptorPath } from './dirs.js';
 import forEachResort from './for-each-resort.js';
 
-let done = false;
-
 const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
 
 function points([lon, lat]) {
@@ -16,49 +14,47 @@ function points([lon, lat]) {
 }
 
 function fetchNoaa(resortId, options) {
-  done = true;
-
   if (resortId) {
     noaaForResort(resortId, options);
   } else {
-    forEachResort(resortId => noaaForResort(resortId, options));
+    forEachResort(resortId => noaaForResort(resortId, options).catch(e => console.error(resortId, e)));
   }
 }
 
-function noaaForResort(resortId, { overwrite }) {
-  const descriptor = readDescriptor(resortId);
+async function noaaForResort(resortId, { overwrite }) {
+  const descriptor = await readDescriptor(resortId);
 
   const { ll } = descriptor;
-  fetch(`https://api.weather.gov/points/${points(ll)}`, {
+  const res = await fetch(`https://api.weather.gov/points/${points(ll)}`, {
     headers: {
       'User-Agent': userAgent,
       Accept: 'application/geo+json'
     }
-  })
-    .then(res => res.json())
-    .then(body => {
-      const {
-        properties: { gridId, gridX, gridY }
-      } = body;
-      const noaa = `${gridId}/${gridX},${gridY}`;
-      if (overwrite) {
-        descriptor.noaa = noaa;
-        writeDescriptor(resortId, descriptor);
-      }
-      console.log(resortId, noaa);
-    })
-    .catch(e => console.error('Cannot find NOAA station for:', resortId, e));
+  });
+  if (res.status !== 200) {
+    console.error('Cannot find NOAA station for:', resortId);
+    return;
+  }
+  const {
+    properties: { gridId, gridX, gridY }
+  } = await res.json();
+  const noaa = `${gridId}/${gridX},${gridY}`;
+  if (overwrite) {
+    descriptor.noaa = noaa;
+    await writeDescriptor(resortId, descriptor);
+  }
+  console.log(resortId, noaa);
 }
 
 function writeDescriptor(resortId, descriptor) {
   const filename = descriptorPath(resortId);
-  writeFileSync(filename, `${JSON.stringify(descriptor, null, 2)}\n`);
+  return writeFile(filename, `${JSON.stringify(descriptor, null, 2)}\n`);
 }
 
-function readDescriptor(resortId) {
+async function readDescriptor(resortId) {
   try {
     const filename = descriptorPath(resortId);
-    return JSON.parse(readFileSync(filename, 'utf8'));
+    return JSON.parse(await readFile(filename, 'utf8'));
   } catch {
     console.error(resortId, 'is not a valid resort ID');
     process.exit(1);
@@ -69,9 +65,4 @@ program
   .option('--overwrite', 'overwrite resort descriptor with new value')
   .arguments('[resort-id]')
   .action(fetchNoaa)
-  .parse(process.argv);
-
-if (!done) {
-  program.outputHelp();
-  process.exit(1);
-}
+  .parse();

package/lib/resorts/alyeska/resort.json

@@ -13,5 +13,5 @@
   ],
   "twitter": "resortalyeska",
   "opening": "2017-12-15",
-  "noaa": "AER/139,227"
+  "noaa": "AER/157,227"
 }

package/lib/resorts/attitash/resort.json

@@ -15,5 +15,5 @@
     44.077778
   ],
   "opening": "2017-12-15",
-  "noaa": "GYX/39,72"
+  "noaa": "GYX/35,71"
 }

package/lib/resorts/brettonwoods/resort.json

@@ -14,5 +14,5 @@
     44.077122
   ],
   "twitter": "bretton_woods",
-  "noaa": "GYX/37,71"
+  "noaa": "GYX/33,70"
 }

package/lib/resorts/cannon/resort.json

@@ -14,5 +14,5 @@
     44.156452
   ],
   "twitter": "cannonmountain",
-  "noaa": "GYX/25,73"
+  "noaa": "GYX/21,72"
 }

package/lib/resorts/cranmore-mountain/resort.json

@@ -14,5 +14,5 @@
   ],
   "twitter": "CranmoreMtn",
   "opening": "2017-12-02",
-  "noaa": "GYX/45,72"
+  "noaa": "GYX/41,71"
 }

package/lib/resorts/gunstock/resort.json

@@ -14,5 +14,5 @@
   ],
   "twitter": "Gunstockmtn",
   "opening": "2017-12-01",
-  "noaa": "GYX/41,47"
+  "noaa": "GYX/37,46"
 }

package/lib/resorts/king-pine/resort.json

@@ -18,5 +18,5 @@
   ],
   "twitter": "KingPineSkiarea",
   "opening": "2017-12-15",
-  "noaa": "GYX/47,63"
+  "noaa": "GYX/43,62"
 }

package/lib/resorts/loon/resort.json

@@ -18,5 +18,5 @@
   ],
   "twitter": "loonmtn",
   "opening": "2017-11-22",
-  "noaa": "GYX/28,69"
+  "noaa": "GYX/24,68"
 }

package/lib/resorts/mount-sunapee/resort.json

@@ -14,5 +14,5 @@
     43.341194
   ],
   "opening": "2017-12-05",
-  "noaa": "GYX/19,34"
+  "noaa": "GYX/15,33"
 }

package/lib/resorts/pats-peak/resort.json

@@ -18,5 +18,5 @@
   ],
   "twitter": "patspeak",
   "opening": "2017-12-09",
-  "noaa": "GYX/28,28"
+  "noaa": "GYX/24,27"
 }

package/lib/resorts/pleasant-mountain/resort.json

@@ -18,5 +18,5 @@
   ],
   "twitter": "pleasantmtnme",
   "opening": "2022-09-02",
-  "noaa": "GYX/55,73"
+  "noaa": "GYX/51,72"
 }

package/lib/resorts/ragged-mountain/resort.json

@@ -14,5 +14,5 @@
   ],
   "twitter": "raggedmtnNH",
   "opening": "2017-12-07",
-  "noaa": "GYX/25,42"
+  "noaa": "GYX/21,41"
 }

package/lib/resorts/saddleback/resort.json

@@ -13,5 +13,5 @@
     44.983387
   ],
   "twitter": "SaddlebackMaine",
-  "noaa": "GYX/53,117"
+  "noaa": "GYX/49,116"
 }

package/lib/resorts/sugarloaf/resort.json

@@ -18,5 +18,5 @@
   ],
   "twitter": "SugarloafMaine",
   "opening": "2017-11-23",
-  "noaa": "GYX/63,123"
+  "noaa": "GYX/59,122"
 }

package/lib/resorts/sunday-river/resort.json

@@ -18,5 +18,5 @@
   ],
   "twitter": "sundayriver",
   "opening": "2017-11-22",
-  "noaa": "GYX/48,96"
+  "noaa": "GYX/44,95"
 }

package/lib/resorts/waterville/resort.json

@@ -18,5 +18,5 @@
     43.961613
   ],
   "twitter": "waterville",
-  "noaa": "GYX/32,65"
+  "noaa": "GYX/28,64"
 }

package/lib/resorts/wildcat/resort.json

@@ -15,5 +15,5 @@
   ],
   "twitter": "skiwildcat",
   "opening": "2017-11-25",
-  "noaa": "GYX/39,81"
+  "noaa": "GYX/35,80"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "liftie",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Clean, simple, easy to read, fast ski resort lift status",
   "type": "module",
   "keywords": [
@@ -60,9 +60,9 @@
   "devDependencies": {
     "@biomejs/biome": "2.2.6",
     "@pirxpilot/stylus": "^1.2.0",
-    "commander": "~13",
+    "commander": "~14",
     "postcss": "~8",
-    "postcss-cachify": "^4.0.0",
+    "postcss-cachify": "^5.0.0",
     "postcss-cli-simple": "~4.0.0",
     "prompt": "~1",
     "undici": "^7.10.0"