Upgrade packages, migrating to discord latest and esbuild latest. Tested on windows by not OSX or Linux.

main
Zed A. Shaw 1 year ago
parent 0c653ac6f4
commit 5651b770ce
  1. 2
      admin/App.svelte
  2. 2
      api/devtools/djenterator.js
  3. 2
      api/devtools/info.js
  4. 2
      client/App.svelte
  5. 2
      commands/api.js
  6. 3
      commands/build.js
  7. 20733
      package-lock.json
  8. 89
      package.json
  9. 6
      queues/discord.js

@ -7,7 +7,7 @@
<Router {routes}/> <Router {routes}/>
{#if process.env.DANGER_ADMIN} {#if process.env.DANGER_ADMIN === "1"}
<Reloader /> <Reloader />
<Bandolier shown={ false }/> <Bandolier shown={ false }/>
{/if} {/if}

@ -5,7 +5,7 @@ import path from "path";
export const get = async (req, res) => { export const get = async (req, res) => {
const api = new API(req, res); const api = new API(req, res);
if(process.env.DANGER_ADMIN) { if(process.env.DANGER_ADMIN === "1") {
const files = glob.sync("./static/djenterator/!(*.vars|*.swp)"); const files = glob.sync("./static/djenterator/!(*.vars|*.swp)");
return api.reply(200, files.map(f => path.basename(f))); return api.reply(200, files.map(f => path.basename(f)));
} else { } else {

@ -2,7 +2,7 @@ import devtools from '../../lib/devtools.js';
import fs from 'fs'; import fs from 'fs';
export const get = async (req, res) => { export const get = async (req, res) => {
if(process.env.DANGER_ADMIN) { if(process.env.DANGER_ADMIN === "1") {
// the devtools module contains all of the errors from the service/api.js for api and sockets // the devtools module contains all of the errors from the service/api.js for api and sockets
// but to get at the svelte errors we have to read debug/errors/svelte.json // but to get at the svelte errors we have to read debug/errors/svelte.json

@ -7,7 +7,7 @@
<Router {routes}/> <Router {routes}/>
{#if process.env.DANGER_ADMIN} {#if process.env.DANGER_ADMIN === "1"}
<Reloader /> <Reloader />
<Bandolier shown={ false }/> <Bandolier shown={ false }/>
{/if} {/if}

@ -30,7 +30,7 @@ export const description = "The API service for bando.";
export const options = [ export const options = [
["--host <ip_addr>", "IP address to listen on.", "0.0.0.0"], ["--host <ip_addr>", "IP address to listen on.", "0.0.0.0"],
["--port <int>", "port to listen on.", "5001"], ["--port <int>", "port to listen on.", "5001"],
["--DANGER_ADMIN", "Enable DANGEROUS development mode.", developer_admin], ["--DANGER_ADMIN", "Enable DANGEROUS development mode.", developer_admin ? "1" : undefined],
["--debug-headers", "Print out HTTP request and response headers"], ["--debug-headers", "Print out HTTP request and response headers"],
["--cookies-suck", "Check various headers/settings that ruin headers"], ["--cookies-suck", "Check various headers/settings that ruin headers"],
["--log-http", "Enable HTTP request logging.", false], ["--log-http", "Enable HTTP request logging.", false],

@ -118,7 +118,8 @@ const devMode = () => ({
setup(build) { setup(build) {
const options = build.initialOptions; const options = build.initialOptions;
options.define = options.define || {}; options.define = options.define || {};
options.define['process.env.DANGER_ADMIN'] = !options.minify; // esbuild 0.16 went insane and now type checks environment variables. What a bunch of idiots.
options.define['process.env.DANGER_ADMIN'] = options.minify ? "1" : "0";
} }
}) })

20733
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -31,18 +31,18 @@
}, },
"devDependencies": { "devDependencies": {
"@jackfranklin/rollup-plugin-markdown": "^0.3.0", "@jackfranklin/rollup-plugin-markdown": "^0.3.0",
"@rollup/plugin-alias": "^3.1.2", "@rollup/plugin-alias": "^3.1.9",
"@rollup/plugin-commonjs": "^17.1.0", "@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-node-resolve": "^11.2.0", "@rollup/plugin-node-resolve": "^11.2.1",
"@rollup/plugin-replace": "^2.4.1", "@rollup/plugin-replace": "^2.4.2",
"acorn": "^8.2.4", "acorn": "^8.8.1",
"commander": "^9.2.0", "commander": "^9.4.1",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-plugin-svelte3": "^3.2.0", "eslint-plugin-svelte3": "^3.4.1",
"html-minifier-terser": "^5.1.1", "html-minifier-terser": "^5.1.1",
"istanbul-lib-coverage": "^3.0.2", "istanbul-lib-coverage": "^3.2.0",
"istanbul-lib-report": "^3.0.0", "istanbul-lib-report": "^3.0.0",
"istanbul-reports": "^3.0.5", "istanbul-reports": "^3.1.5",
"jsdoc": "^4.0.0", "jsdoc": "^4.0.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"neat-csv": "^7.0.0", "neat-csv": "^7.0.0",
@ -51,87 +51,86 @@
"readline-sync": "^1.4.10", "readline-sync": "^1.4.10",
"rollup": "2.42.2", "rollup": "2.42.2",
"rollup-plugin-copy": "^3.4.0", "rollup-plugin-copy": "^3.4.0",
"rollup-plugin-css-chunks": "^2.0.2", "rollup-plugin-css-chunks": "^2.0.3",
"rollup-plugin-css-only": "^3.1.0", "rollup-plugin-css-only": "^3.1.0",
"rollup-plugin-delete": "^2.0.0", "rollup-plugin-delete": "^2.0.0",
"rollup-plugin-glob": "1.0.2", "rollup-plugin-glob": "1.0.2",
"rollup-plugin-multi-input": "^1.2.0", "rollup-plugin-multi-input": "^1.3.1",
"rollup-plugin-node-externals": "^2.2.0", "rollup-plugin-node-externals": "^2.2.0",
"rollup-plugin-svelte": "^7.1.0", "rollup-plugin-svelte": "^7.1.0",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"stylelint": "^13.13.1", "stylelint": "^13.13.1",
"stylelint-config-standard": "^22.0.0", "stylelint-config-standard": "^22.0.0",
"svelte": "^3.32.3", "svelte": "^3.55.0",
"terser": "^5.7.2", "terser": "^5.16.1",
"v8-to-istanbul": "^8.1.0", "v8-to-istanbul": "^8.1.1",
"wait-on": "^5.2.1", "webtorrent": "^1.9.6",
"webtorrent": "^1.8.12",
"wrtc": "^0.4.7" "wrtc": "^0.4.7"
}, },
"dependencies": { "dependencies": {
"@cloudfour/simple-svg-placeholder": "^1.0.2", "@cloudfour/simple-svg-placeholder": "^1.1.0",
"@jamcart/7ty": "^0.1.6", "@jamcart/7ty": "^0.1.6",
"@mapbox/node-pre-gyp": "^1.0.10", "@mapbox/node-pre-gyp": "^1.0.10",
"@paypal/checkout-server-sdk": "^1.0.3", "@paypal/checkout-server-sdk": "^1.0.3",
"@rollup/plugin-json": "^4.1.0", "@rollup/plugin-json": "^4.1.0",
"@vscode/sqlite3": "^5.1.2-vscode", "@vscode/sqlite3": "^5.1.2-vscode",
"ava": "^4.3.1", "ava": "^4.3.3",
"axios": "^0.21.4", "axios": "^0.21.4",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"bittorrent-tracker": "^9.17.4", "bittorrent-tracker": "^9.19.0",
"bull": "^3.22.0", "bull": "^3.29.3",
"chalk": "^5.0.1", "chalk": "^5.2.0",
"ci": "^2.1.1", "ci": "^2.2.0",
"connect-redis": "^5.1.0", "connect-redis": "^5.2.0",
"cookie-parser": "^1.4.5", "cookie-parser": "^1.4.6",
"cors": "^2.8.5", "cors": "^2.8.5",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"date-fns": "^2.22.1", "date-fns": "^2.29.3",
"discord.js": "^13.6.0", "discord.js": "^14.7.1",
"esbuild": "^0.15.13", "esbuild": "^0.16.7",
"esbuild-svelte": "^0.7.1", "esbuild-svelte": "^0.7.3",
"esbuild-visualizer": "^0.3.1", "esbuild-visualizer": "^0.4.0",
"express": "^4.17.1", "express": "^4.18.2",
"express-session": "^1.17.1", "express-session": "^1.17.3",
"faker": "5.5.3", "faker": "5.5.3",
"fast-glob": "^3.2.7", "fast-glob": "^3.2.12",
"feed": "^4.2.2", "feed": "^4.2.2",
"fluent-ffmpeg": "^2.1.2", "fluent-ffmpeg": "^2.1.2",
"http-terminator": "^3.2.0", "http-terminator": "^3.2.0",
"knex": "1.0.1", "knex": "1.0.1",
"knex-paginate": "^2.3.0", "knex-paginate": "^2.3.0",
"memorystore": "^1.6.6", "memorystore": "^1.6.7",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.7",
"nodemailer": "^6.8.0", "nodemailer": "^6.8.0",
"nodemon": "^2.0.15", "nodemon": "^2.0.20",
"npm-watch": "^0.9.0", "npm-watch": "^0.9.0",
"passport": "^0.6.0", "passport": "^0.6.0",
"passport-local": "^1.0.0", "passport-local": "^1.0.0",
"pino": "^6.11.3", "pino": "^6.14.0",
"pino-pretty": "^4.7.1", "pino-pretty": "^4.8.0",
"playwright": "^1.23.3", "playwright": "^1.28.1",
"pm2": "^5.2.0", "pm2": "^5.2.2",
"random": "3.0.6", "random": "3.0.6",
"randomcolor": "^0.6.2", "randomcolor": "^0.6.2",
"redis": "^3.1.2", "redis": "^3.1.2",
"remarkable": "^2.0.1", "remarkable": "^2.0.1",
"sharp": "^0.30.7", "sharp": "^0.30.7",
"sirv-cli": "^1.0.0", "sirv-cli": "^1.0.14",
"slugify": "^1.6.2", "slugify": "^1.6.5",
"snarkdown": "^2.0.0", "snarkdown": "^2.0.0",
"socket.io": "^4.5.4", "socket.io": "^4.5.4",
"socket.io-client": "^4.5.4", "socket.io-client": "^4.5.4",
"sqlite3": "^5.1.2", "sqlite3": "^5.1.4",
"stripe": "^10.11.0", "stripe": "^10.17.0",
"svelte-spa-router": "^3.1.0", "svelte-spa-router": "^3.3.0",
"svgson": "^5.2.1", "svgson": "^5.2.1",
"ua-parser-js": "^1.0.32", "ua-parser-js": "^1.0.32",
"uniqueid": "^1.0.0", "uniqueid": "^1.0.0",
"uuid": "^8.3.2", "uuid": "^8.3.2",
"Validator": "^1.1.2" "Validator": "^1.1.4"
}, },
"optionalDependencies": { "optionalDependencies": {
"utf-8-validate": "^5.0.5" "utf-8-validate": "^5.0.10"
} }
} }

@ -1,6 +1,6 @@
import assert from "assert"; import assert from "assert";
import logging from '../lib/logging.js'; import logging from '../lib/logging.js';
import { Client, Intents } from "discord.js"; import { Client, IntentsBitField, Partials } from "discord.js";
import { User } from "../lib/models.js"; import { User } from "../lib/models.js";
import { company } from '../emails/config.js'; import { company } from '../emails/config.js';
import { discord } from "../lib/config.js"; import { discord } from "../lib/config.js";
@ -10,9 +10,9 @@ const log = logging.create("/queues/mail.js");
const client = new Client({ const client = new Client({
intents: [ intents: [
Intents.FLAGS.GUILD_INVITES, Intents.Flags.GuildInvites,
], ],
partials: [ "GUILD_MEMBER" ], partials: [ Partials.GuildMember ],
}); });
const load_guild_channel = async (client) => { const load_guild_channel = async (client) => {

Loading…
Cancel
Save