Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/deps'
Browse files Browse the repository at this point in the history
  • Loading branch information
pirxpilot committed Mar 9, 2024
2 parents 9411d3b + 4db6087 commit 153e08b
Show file tree
Hide file tree
Showing 22 changed files with 236 additions and 215 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v3
with:
version: 8
run_install: false
Expand Down
4 changes: 2 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const express = require('express');
const cachifyStatic = require('connect-cachify-static');
const gzip = require('connect-gzip-static');
const http = require('http');
const path = require('path');
const http = require('node:http');
const path = require('node:path');
const loaders = require('./lib/loaders');
const plugins = require('./lib/plugins');

Expand Down
4 changes: 2 additions & 2 deletions lib/cli/curl.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const path = require('path');
const fs = require('fs');
const path = require('node:path');
const fs = require('node:fs');
const request = require('../lifts/request');
const dirs = require('./dirs');

Expand Down
2 changes: 1 addition & 1 deletion lib/cli/dirs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const path = require('path');
const path = require('node:path');

module.exports = {
templates: path.resolve(__dirname, '../../templates'),
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/for-each-resort.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { readdir } = require('fs');
const { readdir } = require('node:fs');
const { lib } = require('./dirs');

module.exports = forEachResort;
Expand Down
8 changes: 4 additions & 4 deletions lib/cli/generate.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const program = require('commander');
const prompt = require('prompt');
const url = require('url');
const fs = require('fs');
const path = require('path');
const url = require('node:url');
const fs = require('node:fs');
const path = require('node:path');
const template = require('lodash').template;
const curl = require('./curl');
const dirs = require('./dirs');
Expand Down Expand Up @@ -143,7 +143,7 @@ function execute(conf) {
const resortUrl = url.parse(conf.host + conf.pathname);

conf.tags = conf.tags.split(/\s*,\s*/);
conf.coordinates = conf.coordinates.split(/\s*,\s*/).map(parseFloat);
conf.coordinates = conf.coordinates.split(/\s*,\s*/).map(Number.parseFloat);
conf.host = [resortUrl.protocol, resortUrl.host].join('//');
conf.pathname = [resortUrl.pathname, resortUrl.search, resortUrl.hash].join('');
process.stdin.destroy();
Expand Down
4 changes: 2 additions & 2 deletions lib/cli/noaa.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const program = require('commander');
const { writeFileSync } = require('fs');
const { resolve } = require('path');
const { writeFileSync } = require('node:fs');
const { resolve } = require('node:path');
const superagent = require('superagent');

const forEachResort = require('./for-each-resort');
Expand Down
2 changes: 1 addition & 1 deletion lib/resorts/alta/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const vm = require('vm');
const vm = require('node:vm');
const debug = require('debug')('liftie:resort:alta');

const select = require('../../select');
Expand Down
2 changes: 1 addition & 1 deletion lib/resorts/kitzbuehel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
child: 0,
attribute: 'class',
regex: /(\d)$/,
fn: s => states[parseInt(s, 10)]
fn: s => states[Number.parseInt(s, 10)]
}
}
};
2 changes: 1 addition & 1 deletion lib/resorts/sunshine-village/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const lifts = [

function parse({ liftstatus }) {
const ls = Object.entries(liftstatus).reduce((ls, [index, status]) => {
const i = parseInt(index, 10) - 1;
const i = Number.parseInt(index, 10) - 1;
if (i >= 0 && i < lifts.length) {
const name = lifts[i];
ls[name] = coerce(status);
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/cache.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { readFile, writeFile, rename } = require('fs').promises;
const { readFile, writeFile, rename } = require('node:fs').promises;
const debug = require('debug')('liftie:cache');

module.exports = cache;
Expand Down
4 changes: 2 additions & 2 deletions lib/routes/database.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const path = require('path');
const path = require('node:path');
const plugins = require('../plugins');
const dbCache = require('./cache');

module.exports = database;

const dbFileName = path.resolve(process.env.LOG_DIR || require('os').tmpdir(), 'liftie.db.json');
const dbFileName = path.resolve(process.env.LOG_DIR || require('node:os').tmpdir(), 'liftie.db.json');

// persistent storage status for each resort
function database(cache) {
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/headers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const crypto = require('crypto');
const crypto = require('node:crypto');

module.exports = [
csp,
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/service-worker.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const esbuild = require('esbuild');
const fs = require('fs');
const fs = require('node:fs');

module.exports = renderServiceWorker;

Expand Down
2 changes: 1 addition & 1 deletion lib/tools/domutil.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function child(node, path) {
case '.':
return node;
default: {
index = parseInt(index, 10);
index = Number.parseInt(index, 10);
if (Number.isNaN(index)) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/tools/vail.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const vm = require('vm');
const vm = require('node:vm');
const debug = require('debug')('liftie:resort:vail');

const domutil = require('./domutil');
Expand Down
2 changes: 1 addition & 1 deletion lib/weather/icons.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const url = require('url');
const url = require('node:url');

module.exports = {
iconsFromUrl,
Expand Down
2 changes: 1 addition & 1 deletion lib/weather/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { hour } = require('../tools/millis');
module.exports = fetch;
module.exports.interval = {
active: 2 * hour, // once every 2 hours for active resorts
inactive: Infinity // don't fetch on inactive
inactive: Number.POSITIVE_INFINITY // don't fetch on inactive
};

// see: https://openweathermap.org/forecast5
Expand Down
2 changes: 1 addition & 1 deletion lib/webcams.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const userAgent = 'Mozilla/5.0 (compatible; Liftie/1.0; +https://liftie.info)';
module.exports = fetch;
module.exports.interval = {
active: 8.5 * minute, // v3 API images are only valid for 10 minutes
inactive: Infinity
inactive: Number.POSITIVE_INFINITY
};

const limit = limiter(12, 'minute'); // 12 times a minute
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
"dynload": "^1.0.2",
"el-component": "^1.0.1",
"errorhandler": "^1.5.0",
"esbuild": "^0.19.5",
"esbuild": "^0.20.1",
"express": "^4.16.2",
"htmlparser2": "~9.0.0",
"htmlparser2": "~9",
"js-cookie": "^3.0.5",
"limiter": "~2.1.0",
"lodash": "^4.16.6",
Expand All @@ -71,9 +71,9 @@
"postcss-cachify": "^4.0.0",
"postcss-cli-simple": "~4.0.0",
"prompt": "~1",
"stylus": "^0.62.0"
"stylus": "^0.63.0"
},
"engines": {
"node": ">= 20.1.0"
}
}
}
Loading

0 comments on commit 153e08b

Please sign in to comment.